Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update grammar, links, deprecations, etc in various text files #2000

Merged
merged 8 commits into from
Apr 10, 2021

Conversation

Chew
Copy link
Member

@Chew Chew commented Mar 4, 2021

Critical fixes.

Will have to add more later due to a headache. Remind me weekly.

@Chew
Copy link
Member Author

Chew commented Mar 10, 2021

What the heck git

@Camotoy
Copy link
Member

Camotoy commented Mar 10, 2021

git rebase ?

@Chew
Copy link
Member Author

Chew commented Mar 10, 2021

WHAT THE HECK GIT

@Chew Chew reopened this Mar 10, 2021
@7man7LMYT
Copy link
Contributor

daily reminder

@Chew Chew added the Confirmed Bug The bug reported is confirmed and able to be replicated. label Mar 11, 2021
@7man7LMYT
Copy link
Contributor

daily reminder 2 - 3

@Chew Chew added the Missing Implementation This has yet to be implemented. label Mar 12, 2021
@7man7LMYT
Copy link
Contributor

daily reminder 4

@Chew Chew added the Work in Progress The issue is currently being worked on. label Mar 13, 2021
@7man7LMYT
Copy link
Contributor

daily reminder 5

@Chew Chew added the PR: Needs Testing When a PR needs testing but is currently not under review label Mar 14, 2021
@7man7LMYT
Copy link
Contributor

daily reminder 6

@Chew Chew added the PR: Optimization When a PR doesn't necessarily add anything new or fix anything, but improves upon the code label Mar 15, 2021
@7man7LMYT
Copy link
Contributor

daily reminder 7

@7man7LMYT
Copy link
Contributor

daily reminder 8

@Chew Chew added Missing Client Feature When the Bedrock client is missing a feature that Java Edition has PR: On hold When a PR is on hold like if it requires a dependency to be updated first labels Mar 17, 2021
@7man7LMYT
Copy link
Contributor

daily reminder 9

@YHDiamond
Copy link
Contributor

daily reminder for tomorrow so 7man doesnt have to (10)

@7man7LMYT
Copy link
Contributor

diamond it doesn't count, i said mine 5 hours ago, not a day so it doesn't count
so it's still (9)

@Chew
Copy link
Member Author

Chew commented Mar 19, 2021

Nah he was covering you for tomorrow so you can take a break

@7man7LMYT
Copy link
Contributor

No I have my calendar marks specifically for doign this

@7man7LMYT
Copy link
Contributor

i will continue until tjhhis mis merged

@7man7LMYT
Copy link
Contributor

daily reminder 10

@Chew Chew requested a review from Camotoy April 4, 2021 02:04
@Chew Chew self-assigned this Apr 4, 2021
@Camotoy Camotoy removed Confirmed Bug The bug reported is confirmed and able to be replicated. PR: Feature When a PR implements a new feature Feature Request A feature request. Help Wanted If you think you can fix this issue, please feel free to open a PR or respond to this issue! Missing Client Feature When the Bedrock client is missing a feature that Java Edition has Missing Implementation This has yet to be implemented. More Info Needed More information is needed from the OP. PR: Needs Testing When a PR needs testing but is currently not under review PR: On hold When a PR is on hold like if it requires a dependency to be updated first PR: Optimization When a PR doesn't necessarily add anything new or fix anything, but improves upon the code Priority: High Priority: Low Priority: Medium Waiting For Minecraft Update When a PR or issue likely won't be resolved before the next Minecraft update. Work in Progress The issue is currently being worked on. labels Apr 4, 2021
@Chew Chew changed the title Update CONTRIBUTING.md Update spelling and grammar of various files Apr 4, 2021
@YHDiamond
Copy link
Contributor

YHDiamond commented Apr 9, 2021

Luke told me he doesn't want to change our discord links on github to be our vanity URL because we aren't sure if it is permanent yet... (Just noting that this seems to be an I want a free PR moment imo)

@Chew
Copy link
Member Author

Chew commented Apr 9, 2021

Dunno how long ago that was. But, it's permanent, see: discord/discord-open-source#303

@YHDiamond
Copy link
Contributor

He told me it about 2 weeks ago, that pr hasn't been merged yet and he said that the vanity url was just given to us while we wait for the PR to be merged, just mentioning it

@Camotoy
Copy link
Member

Camotoy commented Apr 9, 2021

Just noting that this seems to be an I want a free PR moment imo
Overruled. I'll allow it.

On the vanity invite: yeah, I don't expect it to break. When the open source PR is merged, nothing's going to happen to the vanity invite. We just have it now because it's a pain on that repository to merge new PRs.

@Chew Chew changed the title Update spelling and grammar of various files Update grammar, links, deprecations, etc in various text files Apr 9, 2021
Chew added 2 commits April 9, 2021 19:05
…tch 109 Unstar 2.1k Fork 313 Code Issues 209 Pull requests 29 Actions Projects 2 Wiki Security Insights Edit Open with Update grammar, links, deprecations, etc in various text files GeyserMC#2000  Open Chew wants to merge 7 commits into GeyserMC:master from Chew:update/contributing +18 −18   Conversation 76  Commits 7  Checks 1  Files changed 5  Open Update grammar, links, deprecations, etc in various text files GeyserMC#2000 Changes from all commits  File filter...   Jump to…    0 / 5 files viewed Review changes     6  .github/ISSUE_TEMPLATE/bug_report.yml  Viewed  @@ -1,5 +1,5 @@  name: Bug report		 name: Bug report  about: Create a report to help us improve		 description: Create a report to help us improve  body:		 body:  - type: markdown		 - type: markdown    attributes:		   attributes:  @@ -41,11 +41,11 @@ body:        If you're running a multi-server instance or using Geyser Standalone:		       If you're running a multi-server instance or using Geyser Standalone:        *  Give us the exact output from `/version` on all servers involved. Saying "latest" does not help us at all.		       *  Give us the exact output from `/version` on all servers involved. Saying "latest" does not help us at all.        * Please list all plugins on all servers involved.		       * Please list all plugins on all servers involved.        If this bug occurs on a server you do not control, please full this in to the best of your knowledge.		       If this bug occurs on a server you do not control, please fill this in to the best of your knowledge.  - type: input		 - type: input    attributes:		   attributes:      label: Geyser Dump		     label: Geyser Dump      description: If Geyser starts correctly, please also include the link to a dump by using `/geyser dump`. If you're using the Standalone GUI, the option can be found under `Commands` => `Dump`. This provides us information about your server that we can use to debug your issue.		     description: If Geyser starts correctly, please include the link to a dump using `/geyser dump`. If you're using the Standalone GUI, you can find the option under `Commands` => `Dump`. Doing this provides us information about your server that we can use to debug your issue.  - type: input		 - type: input    attributes:		   attributes:      label: Geyser Version		     label: Geyser Version     2  .github/ISSUE_TEMPLATE/config.yml  Viewed   @@ -5,7 +5,7 @@ contact_links:      about: Check the common issues to see if you are not alone with that issue and see how you can fix them.		     about: Check the common issues to see if you are not alone with that issue and see how you can fix them.    - name: Frequently Asked Questions		   - name: Frequently Asked Questions      url: https://github.com/GeyserMC/Geyser/wiki/FAQ		     url: https://github.com/GeyserMC/Geyser/wiki/FAQ      about: Look at the FAQ page for answers for frequently asked questions.		     about: Look at the FAQ page for answers to frequently asked questions.    - name: Get help on the GeyserMC Discord server		   - name: Get help on the GeyserMC Discord server      url: https://discord.gg/geysermc		     url: https://discord.gg/geysermc      about: If your issue seems like it could possibly be an easy fix due to configuration, please hop on our Discord.		     about: If your issue seems like it could possibly be an easy fix due to configuration, please hop on our Discord.  4  .github/ISSUE_TEMPLATE/feature_request.yml  Viewed  @@ -1,11 +1,11 @@  name: Feature request		 name: Feature request  about: Suggest an idea for this project		 description: Suggest an idea for this project This conversation was marked as resolved by Chew  Show conversation  labels: "Feature Request"		 labels: "Feature Request"  body:		 body:  - type: markdown		 - type: markdown    attributes:		   attributes:      value: |		     value: |        Thanks for taking the time to fill out this feature request for Geyser! Fill out the following form to your best ability to help us understand your feature request and greately improve the change of it getting added.		       Thanks for taking the time to fill out this feature request for Geyser! Please fill out the following form to your best ability to help us understand your feature request and significantly improve the chance of getting added.        For anything else than a feature request, use: [our Discord server](https://discord.gg/geysermc), [the FAQ](https://github.com/GeyserMC/Geyser/wiki/FAQ) or [the Common Issues](https://github.com/GeyserMC/Geyser/wiki/Common-Issues).		       For anything else than a feature request, use: [our Discord server](https://discord.gg/geysermc), [the FAQ](https://github.com/GeyserMC/Geyser/wiki/FAQ) or [the Common Issues](https://github.com/GeyserMC/Geyser/wiki/Common-Issues).  - type: textarea		 - type: textarea    attributes:		   attributes:     10  CONTRIBUTING.md    Viewed  @@ -1,14 +1,14 @@  Thank for for considering a contribution! Generally, Geyser welcomes PRs from everyone. There are some guidelines about what features should go where:		 Thank you for considering a contribution! Generally, Geyser welcomes PRs from everyone. There are some guidelines about what features should go where:          *Pull requests that may not get accepted:* Niche features that apply to a specific group, for example integration with a specific plugin. For now, please create a separate plugin if possible. 		 *Pull requests that may not get accepted:* Niche features that apply to a specific group, for example, integration with a specific plugin. For now, please create a separate plugin if possible.      *Pull requests for Floodgate:* Anything that opens up information within the game for developers to use.		 *Pull requests for Floodgate:* Anything that opens up information within the game for developers to use.      *Pull requests for Geyser:* Anything that fixes compatibility between Java or Bedrock, or improves the quality of play for Bedrock players. The exception is wherever direct server access is required; in this case it may be better for Floodgate.		 *Pull requests for Geyser:* Anything that fixes compatibility between Java or Bedrock or improves the quality of play for Bedrock players. The exception is wherever direct server access is required; in this case, it may be better for Floodgate.          We have some general style guides that should be applied throughout the code:		 We have some general style guides that you should apply throughout the code:    @Camotoy Camotoy 9 days ago  Member Seems silly.    @Chew Chew 9 days ago  Author  Member Well, who's doing the applying? :p    @Camotoy Camotoy 9 days ago  Member Everyone, not just the reader.    @Chew Chew 6 days ago  Author  Member Well the reader is reading these guidelines, right?    @Camotoy Camotoy 9 hours ago  Member We should let them know that we're not just enforcing the guidelines to you, but to everyone! :)    @Chew Chew 4 hours ago  •  edited   Author  Member But you is everyone!! I don't get it. We're not naming names here.    @Camotoy Camotoy 4 hours ago  Member You is only the reader. Commenting code applies to everyone, even if they do not read this document.    @Chew Chew now  Author  Member Suggested change  We have some general style guides that you should apply throughout the code: We have some general style guides that should be applied throughout the code: Commit suggestion  Add suggestion to batch  @Chew	Reply… Resolve conversation      ```java		 ```java  public class LongClassName {		 public class LongClassName {  @@ -48,4 +48,4 @@ Make sure to comment your code where possible.      The nature of our software requires a lot of arrays and maps to be stored - where possible, use Fastutil's specialized maps. For example, if you're storing block state translations, use an `Int2IntMap`.		 The nature of our software requires a lot of arrays and maps to be stored - where possible, use Fastutil's specialized maps. For example, if you're storing block state translations, use an `Int2IntMap`.      We have a rundown of all the tools you need to develop over on our [wiki](https://github.com/GeyserMC/Geyser/wiki/Developer-Guide). If you have any questions, please feel free to reach out to our [Discord](https://discord.geysermc.org)!		 We have a rundown of all the tools you need to develop over on our [wiki](https://github.com/GeyserMC/Geyser/wiki/Developer-Guide). If you have any questions, please feel free to reach out to our [Discord](https://discord.gg/geysermc)!    14  README.md    Viewed  @@ -1,10 +1,10 @@  <img src="https://geysermc.org/img/geyser-1760-860.png" alt="Geyser" width="600"/>		 <img src="https://geysermc.org/img/geyser-1760-860.png" alt="Geyser" width="600"/>      [![forthebadge made-with-java](http://ForTheBadge.com/images/badges/made-with-java.svg)](https://java.com/)		 [![forthebadge made-with-java](https://ForTheBadge.com/images/badges/made-with-java.svg)](https://java.com/)      [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)		 [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)  [![Build Status](https://ci.opencollab.dev/job/Geyser/job/master/badge/icon)](https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/)		 [![Build Status](https://ci.opencollab.dev/job/Geyser/job/master/badge/icon)](https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/)  [![Discord](https://img.shields.io/discord/613163671870242838.svg?color=%237289da&label=discord)](http://discord.geysermc.org/)		 [![Discord](https://img.shields.io/discord/613163671870242838.svg?color=%237289da&label=discord)](https://discord.gg/geysermc/)  [![HitCount](http://hits.dwyl.com/Geyser/GeyserMC.svg)](http://hits.dwyl.com/Geyser/GeyserMC)		 [![HitCount](http://hits.dwyl.com/Geyser/GeyserMC.svg)](http://hits.dwyl.com/Geyser/GeyserMC)  [![Crowdin](https://badges.crowdin.net/geyser/localized.svg)](https://translate.geysermc.org/)		 [![Crowdin](https://badges.crowdin.net/geyser/localized.svg)](https://translate.geysermc.org/)     @@ -16,7 +16,7 @@ Geyser is an open collaboration project by [CubeCraft Games](https://cubecraft.n  Geyser is a proxy, bridging the gap between Minecraft: Bedrock Edition and Minecraft: Java Edition servers.		 Geyser is a proxy, bridging the gap between Minecraft: Bedrock Edition and Minecraft: Java Edition servers.  The ultimate goal of this project is to allow Minecraft: Bedrock Edition users to join Minecraft: Java Edition servers as seamlessly as possible. **Please note, this project is still a work in progress and should not be used on production. Expect bugs!**		 The ultimate goal of this project is to allow Minecraft: Bedrock Edition users to join Minecraft: Java Edition servers as seamlessly as possible. **Please note, this project is still a work in progress and should not be used on production. Expect bugs!**      Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have now joined us here!		 Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have joined us here!      ### Currently supporting Minecraft Bedrock v1.16.100 - v1.16.210 and Minecraft Java v1.16.4 - v1.16.5.		 ### Currently supporting Minecraft Bedrock v1.16.100 - v1.16.210 and Minecraft Java v1.16.4 - v1.16.5.     @@ -28,8 +28,8 @@ Take a look [here](https://github.com/GeyserMC/Geyser/wiki#Setup) for how to set  ## Links:		 ## Links:  - Website: https://geysermc.org		 - Website: https://geysermc.org  - Docs: https://github.com/GeyserMC/Geyser/wiki		 - Docs: https://github.com/GeyserMC/Geyser/wiki  - Download: http://ci.geysermc.org		 - Download: https://ci.geysermc.org  - Discord: http://discord.geysermc.org/		 - Discord: https://discord.gg/geysermc  - ~~Donate: https://patreon.com/GeyserMC~~ Currently disabled.		 - ~~Donate: https://patreon.com/GeyserMC~~ Currently disabled.  - Test Server: `test.geysermc.org` port `25565` for Java and `19132` for Bedrock		 - Test Server: `test.geysermc.org` port `25565` for Java and `19132` for Bedrock     @@ -40,7 +40,7 @@ Take a look [here](https://github.com/GeyserMC/Geyser/wiki#Setup) for how to set  - Structure block UI		 - Structure block UI      ## What can't be fixed		 ## What can't be fixed  The following things can't be fixed because of Bedrock limitations. They might be fixable in the future, but not as of now.		 The following things cannot be fixed without changes to Bedrock. As of now, they are not fixable in Geyser.      - Custom heads in inventories		 - Custom heads in inventories  - Clickable links in chat		 - Clickable links in chat  @@ -50,7 +50,7 @@ The following things can't be fixed because of Bedrock limitations. They might b  ## Compiling		 ## Compiling  1. Clone the repo to your computer		 1. Clone the repo to your computer  2. [Install Maven](https://maven.apache.org/install.html)		 2. [Install Maven](https://maven.apache.org/install.html)  3. Navigate to the Geyser root directory and run `git submodule update --init --recursive`. This downloads all the needed submodules for Geyser and is a crucial step in this process.		 3. Navigate to the Geyser root directory and run `git submodule update --init --recursive`. This command downloads all the needed submodules for Geyser and is a crucial step in this process.  4. Run `mvn clean install` and locate to the `target` folder.		 4. Run `mvn clean install` and locate to the `target` folder.    This conversation was marked as resolved by Chew  Show conversation  ## Contributing		 ## Contributing  ProTip! Use n and p to navigate between commits in a pull request. © 2021 GitHub, Inc. Terms Privacy Security Status Docs Contact GitHub Pricing API Training Blog About Loading complete
@Camotoy Camotoy merged commit a7aa063 into GeyserMC:master Apr 10, 2021
@Chew Chew deleted the update/contributing branch November 12, 2021 05:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.