From f314ee752908cd3c7ae908b4e02a623006a39c2f Mon Sep 17 00:00:00 2001
From: Hasan <52300558+hasankayra04@users.noreply.github.com>
Date: Wed, 22 Nov 2023 01:32:57 +0300
Subject: [PATCH 1/5] Update bedrock version to show 1.20.50 support (#229)

* Update bedrock version
---
 _data/versions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_data/versions.json b/_data/versions.json
index 38702be..09ca8c2 100644
--- a/_data/versions.json
+++ b/_data/versions.json
@@ -1,4 +1,4 @@
 {
-  "bedrock": "1.20.0-1.20.40",
+  "bedrock": "1.20.0-1.20.50",
   "java": "1.20.2"
 }

From 0ffe0393b7e03c93885a213460b354d0a95da600 Mon Sep 17 00:00:00 2001
From: chris <github@onechris.mozmail.com>
Date: Tue, 28 Nov 2023 18:35:34 +0100
Subject: [PATCH 2/5] Clarify that using Floodgate on Standalone requires the
 platform specific platform downloads (#231)

---
 _includes/setup/instructions/floodgate/standalone.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/_includes/setup/instructions/floodgate/standalone.md b/_includes/setup/instructions/floodgate/standalone.md
index 9f26e3f..3d5514e 100644
--- a/_includes/setup/instructions/floodgate/standalone.md
+++ b/_includes/setup/instructions/floodgate/standalone.md
@@ -1,14 +1,14 @@
 # Floodgate setup with Geyser-Standalone
 
 <div class="alert alert-info" role="alert">
-	To be able to use Floodgate authentication, you need to be able to install Floodgate on the server you are connecting to.
+	To be able to use Floodgate authentication, you need to be able to install Floodgate on the Java server you are connecting to.
 </div>
 
-1. Download Floodgate from the [download page](https://geysermc.org/download).
-2. Install the Floodgate jar - see the platform instructions for detailed info.
-3. Change `auth-type` in Geyser Standalone's config to `floodgate`.
-4. Copy the `key.pem` file in the Floodgate config folder to the same directory as Geyser Standalone. 
-5. Restart Geyser-Standalone.
+1. Download and install the platform-specific Floodgate jar (e.g. floodgate-spigot, or floodgate-fabric) [here](https://geysermc.org/download). 
+See the platform setup instructions for a detailed, platform specific setup guide. Then, continue with the instructions below.
+2. Change `auth-type` in Geyser Standalone's config to `floodgate`.
+3. Copy the `key.pem` file in the Floodgate config folder to the same directory as Geyser Standalone. 
+4. Restart Geyser-Standalone.
 
 <div class="alert alert-warning" role="alert">
 	DO NOT DISTRIBUTE THIS KEY TO ANYBODY! This key is what allows for Bedrock accounts to bypass the Java Edition authentication, and if anyone gets ahold of this, they can wreak havoc on your server.

From 76c967f4abbf0a8e0d4ea270cec7c47b62418dc5 Mon Sep 17 00:00:00 2001
From: chris <github@onechris.mozmail.com>
Date: Mon, 11 Dec 2023 00:19:57 +0100
Subject: [PATCH 3/5] Update shockbyte instructions (#233)

---
 _data/providers.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_data/providers.json b/_data/providers.json
index cbb4d6b..3b33c67 100644
--- a/_data/providers.json
+++ b/_data/providers.json
@@ -348,7 +348,7 @@
     {
       "name": "Shockbyte",
       "url": "https://shockbyte.com/",
-      "description": "Uncomment and set `bedrock address` to the Java server's IP, and `bedrock port` to the Java server' port. Connect with the same IP and port as on Java. For Geyser Standalone installation instructions, see [here](https://shockbyte.com/billing/knowledgebase/173/Introduction-to-GeyserMCorDragonProxy-How-GeyserMC-Works.html)."
+      "description": "The port will be automatically set after you download Geyser and restart the server. Connect with the same IP and port as on Java. For Geyser Standalone installation instructions, see [here](https://shockbyte.com/billing/knowledgebase/173/Introduction-to-GeyserMCorDragonProxy-How-GeyserMC-Works.html)."
     },
     {
       "name": "Skynode.pro",

From 89bdc845f2185dcbd77e6a83f91be2bbb7be634c Mon Sep 17 00:00:00 2001
From: chris <github@onechris.mozmail.com>
Date: Tue, 12 Dec 2023 00:20:35 +0100
Subject: [PATCH 4/5] Documentation for adding custom/modifying Java language
 strings (#232)

* Yeet the translations section from the faq in favor of a dedicated page
Document java language string overrides & additions

* Address review by @Chew

* Update _docs/geyser/translations.md

Co-authored-by: Olivia <chew@chew.pw>

---------

Co-authored-by: Olivia <chew@chew.pw>
---
 _data/faq.yml                | 58 ----------------------------
 _data/toc.yml                |  2 +
 _docs/geyser/translations.md | 74 ++++++++++++++++++++++++++++++++++++
 3 files changed, 76 insertions(+), 58 deletions(-)
 create mode 100644 _docs/geyser/translations.md

diff --git a/_data/faq.yml b/_data/faq.yml
index fd3e2b8..4b4eea5 100644
--- a/_data/faq.yml
+++ b/_data/faq.yml
@@ -194,64 +194,6 @@
 
         **(Please note, if you are using a prefix with Floodgate, Bedrock players will have to enter the prefix.)**
 
-    - title: What languages does Geyser support?
-      content: |  
-        We aim to support any of the bedrock languages; see [here](https://translate.geysermc.org/) for our Crowdin page, and below is a list of all the language codes. We also can add support for more languages, and please request them in the Discord server if you are willing to translate them. (Enabled clientside via [https://www.curseforge.com/minecraft/mc-addons/translations-for-minecraft](https://www.curseforge.com/minecraft/mc-addons/translations-for-minecraft))
-
-        ### Bedrock languages    
-
-        |Name                        |Code |
-        |----------------------------|-----|
-        |Bulgarian                   |bg_bg|
-        |Czech                       |cs_cz|
-        |Danish                      |da_dk|
-        |German                      |de_de|
-        |Greek                       |el_gr|
-        |British English             |en_gb|
-        |American English            |en_us|
-        |Spanish                     |es_es|
-        |Mexican Spanish             |es_mx|
-        |Finnish                     |fi_fi|
-        |Canadian French             |fr_ca|
-        |French                      |fr_fr|
-        |Hungarian                   |hu_hu|
-        |Indonesian                  |id_id|
-        |Italian                     |it_it|
-        |Japanese                    |ja_jp|
-        |Korean                      |ko_kr|
-        |Dutch                       |nl_nl|
-        |Norwegian Bokmål            |nb_no|
-        |Polish                      |pl_pl|
-        |Brazilian Portuguese        |pt_br|
-        |Portuguese                  |pt_pt|
-        |Russian                     |ru_ru|
-        |Slovak                      |sk_sk|
-        |Swedish                     |sv_se|
-        |Turkish                     |tr_tr|
-        |Ukrainian                   |uk_ua|
-        |Chinese Simplified (China)  |zh_cn|
-        |Chinese Traditional (Taiwan)|zh_tw|
-
-        ### Additional languages
-
-        |Name                        |Code |
-        |----------------------------|-----|
-        |Afrikaans                   |af_za|
-        |Belarusian                  |be_by|
-        |Hebrew                      |he_il|
-        |Hindi                       |hi_in|
-
-    - title: Adding custom Geyser translation overrides
-      content: |
-        Please note that you cannot add strings that work in Minecraft formatting - these strings are only for places where Geyser uses them.
-
-        To start, create a `languages` folder in the same directory as the Geyser config file.
-        Inside of it, you'll need to add a file with your desired locale ending in `.properties`. You can see
-        [here](https://github.com/GeyserMC/languages/tree/master/texts) for the locale files that Geyser uses - 
-        you can download these as a starting point, or you can just add the strings you want to overwrite. 
-
-        You must restart Geyser for the changes to apply.
-
 - title: Questions not related to gameplay
   items:
     - title: What is the relationship between CubeCraft and Geyser?
diff --git a/_data/toc.yml b/_data/toc.yml
index 0f4560a..f33740e 100644
--- a/_data/toc.yml
+++ b/_data/toc.yml
@@ -22,6 +22,8 @@
       children:
         - title: Commands
           url: "geyser/commands/"
+        - title: Languages and Translations
+          url: "geyser/translations/"
         - title: Geyser Command Line Arguments and System Properties
           url: "geyser/geyser-command-line-arguments-and-system-properties/"
     - title: FAQ
diff --git a/_docs/geyser/translations.md b/_docs/geyser/translations.md
new file mode 100644
index 0000000..3e86022
--- /dev/null
+++ b/_docs/geyser/translations.md
@@ -0,0 +1,74 @@
+---
+title: Supported languages & translations
+---
+
+Geyser supports a wide variety of languages to offer the best experience for players all over the globe.
+When players join your server, Geyser will automatically detect their locale and provide the appropriate language.
+
+## What languages are supported?
+We aim to support any of the Bedrock languages - below is a list of them and all the language codes. 
+
+|Name                        |Code |
+|----------------------------|-----|
+|Bulgarian                   |bg_bg|
+|Czech                       |cs_cz|
+|Danish                      |da_dk|
+|German                      |de_de|
+|Greek                       |el_gr|
+|British English             |en_gb|
+|American English            |en_us|
+|Spanish                     |es_es|
+|Mexican Spanish             |es_mx|
+|Finnish                     |fi_fi|
+|Canadian French             |fr_ca|
+|French                      |fr_fr|
+|Hungarian                   |hu_hu|
+|Indonesian                  |id_id|
+|Italian                     |it_it|
+|Japanese                    |ja_jp|
+|Korean                      |ko_kr|
+|Dutch                       |nl_nl|
+|Norwegian Bokmål            |nb_no|
+|Polish                      |pl_pl|
+|Brazilian Portuguese        |pt_br|
+|Portuguese                  |pt_pt|
+|Russian                     |ru_ru|
+|Slovak                      |sk_sk|
+|Swedish                     |sv_se|
+|Turkish                     |tr_tr|
+|Ukrainian                   |uk_ua|
+|Chinese Simplified (China)  |zh_cn|
+|Chinese Traditional (Taiwan)|zh_tw|
+
+### Additional languages
+These languages are also supported, and are available in the Bedrock client using [the Translations for Minecraft resource pack](https://www.curseforge.com/minecraft-bedrock/addons/translations-for-minecraft).
+
+|Name                        |Code |
+|----------------------------|-----|
+|Afrikaans                   |af_za|
+|Belarusian                  |be_by|
+|Hebrew                      |he_il|
+|Hindi                       |hi_in|
+
+## How can I help translate Geyser?
+We use [Crowdin](https://crowdin.com/project/geyser) to manage our translations.
+We also can add support for more languages, and please request them in the Discord server if you are willing to translate them.
+(Those can be enabled clientside via [https://www.curseforge.com/minecraft-bedrock/addons/translations-for-minecraft](https://www.curseforge.com/minecraft-bedrock/addons/translations-for-minecraft))
+
+## Adding custom Geyser translation overrides
+These strings are only for places where Geyser uses them. To edit Minecraft Java translations, see the section below.
+
+To start, create a `languages` folder in the same directory as the Geyser config file.
+Inside of it, you'll need to add a file with your desired locale ending in `.properties`. You can see
+[here](https://github.com/GeyserMC/languages/tree/master/texts) for the locale files that Geyser uses - 
+you can download these as a starting point, or you can just add the strings you want to overwrite. 
+
+You must restart Geyser for the changes to apply.
+
+## Modifying/Adding Minecraft Java translations
+Geyser also downloads the Minecraft Java translations from Mojang's servers and sends them to Bedrock clients when needed.
+To modify these, open the `overrides` subfolder in the `locales` folder. Then, place your modified `.json` files in the `overrides` folder.
+You can also add custom Java translation strings to that json file.
+
+Note: You do not need to provide the entire file, only the Java strings you want to change/add. Geyser will only update the strings you provide.
+You must restart Geyser for the changes to apply.

From 7bb65022eebf793d16ac4c1b7af26d971c89ef3d Mon Sep 17 00:00:00 2001
From: Paul Vogel <pavog@users.noreply.github.com>
Date: Fri, 15 Dec 2023 11:43:53 +0100
Subject: [PATCH 5/5] Update versions.json (#234)

---
 _data/versions.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_data/versions.json b/_data/versions.json
index 09ca8c2..3b92ee2 100644
--- a/_data/versions.json
+++ b/_data/versions.json
@@ -1,4 +1,4 @@
 {
-  "bedrock": "1.20.0-1.20.50",
-  "java": "1.20.2"
+  "bedrock": "1.20.40-1.20.51",
+  "java": "1.20.4"
 }