From 1b56891f6f59a716dc7617368f9f958c4aa25a1c Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Wed, 6 Apr 2022 00:01:02 +0800
Subject: [PATCH 01/20] change: Remove Access Widener

It's no longer needed
---
 build.gradle                                                  | 4 ----
 .../mods/sodiumextra/client/gui/SodiumExtraGameOptions.java   | 2 +-
 src/main/resources/fabric.mod.json                            | 1 -
 src/main/resources/sodium-extra.accesswidener                 | 3 ---
 4 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 src/main/resources/sodium-extra.accesswidener

diff --git a/build.gradle b/build.gradle
index ba94e6cc..d9c5f3aa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,10 +11,6 @@ archivesBaseName = "${project.archives_base_name}-mc${project.minecraft_version}
 version = project.mod_version
 group = project.maven_group
 
-loom {
-    accessWidenerPath = file("src/main/resources/sodium-extra.accesswidener")
-}
-
 repositories {
     maven { url 'https://jitpack.io' }
     maven { 
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java
index 014af96b..1211f1c9 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java
@@ -108,7 +108,7 @@ public AnimationSettings() {
             this.fire = true;
             this.portal = true;
             this.blockAnimations = true;
-            this.sculkSensor = false;
+            this.sculkSensor = true;
         }
     }
 
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 82178733..dcfbd242 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -32,7 +32,6 @@
       }
     }
   },
-  "accessWidener": "sodium-extra.accesswidener",
   "mixins": [
     "sodium-extra.mixins.json"
   ],
diff --git a/src/main/resources/sodium-extra.accesswidener b/src/main/resources/sodium-extra.accesswidener
deleted file mode 100644
index 4a2f381e..00000000
--- a/src/main/resources/sodium-extra.accesswidener
+++ /dev/null
@@ -1,3 +0,0 @@
-accessWidener v1 named
-
-accessible class net/minecraft/client/texture/Sprite$Animation
\ No newline at end of file

From 16c7fbec23e82f478c1139f8cbd13c4751a636ff Mon Sep 17 00:00:00 2001
From: 7777777_4547 <83630775+7777777-4547@users.noreply.github.com>
Date: Wed, 6 Apr 2022 00:02:25 +0800
Subject: [PATCH 02/20] change: Update Simplified Chinese (#179)

* Update zh_cn.json

* Update zh_cn.json

* Update zh_cn.json

* Update zh_cn.json

* Update zh_cn.json
---
 src/main/resources/assets/sodium-extra/lang/zh_cn.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/assets/sodium-extra/lang/zh_cn.json b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
index 1b83f703..ecb0e308 100644
--- a/src/main/resources/assets/sodium-extra/lang/zh_cn.json
+++ b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
@@ -1,7 +1,7 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "开启或关闭火焰动画",
   "sodium-extra.option.animate_lava.tooltip": "开启或关闭岩浆动画",
-  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "开启或关闭潜声传感器动画",
   "sodium-extra.option.animate_portal.tooltip": "开启或关闭传送门动画",
   "sodium-extra.option.animate_water.tooltip": "开启或关闭水面动画",
   "sodium-extra.option.animations": "动画",

From c842b09dee52194a659b942a9169681d029b56ca Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Wed, 6 Apr 2022 23:09:31 +0800
Subject: [PATCH 03/20] new: Add Beacon Beam toggle

Implements #181
---
 .../gui/SodiumExtraGameOptionPages.java       |  9 +++++++++
 .../client/gui/SodiumExtraGameOptions.java    |  2 ++
 .../mixin/SodiumExtraMixinConfigPlugin.java   |  5 ++++-
 .../MixinBeaconBlockEntityRenderer.java       | 20 +++++++++++++++++++
 .../MixinPistonBlockEntityRenderer.java       |  2 +-
 .../entity/MixinGuardianEntityRenderer.java   |  2 +-
 .../entity/MixinItemFrameEntityRenderer.java  |  2 +-
 .../entity/MixinLivingEntityRenderer.java     |  2 +-
 .../entity/MixinPaintingEntityRenderer.java   |  2 +-
 .../assets/sodium-extra/lang/cs_cz.json       |  4 +++-
 .../assets/sodium-extra/lang/de_de.json       |  4 +++-
 .../assets/sodium-extra/lang/en_us.json       |  4 +++-
 .../assets/sodium-extra/lang/es_mx.json       |  4 +++-
 .../assets/sodium-extra/lang/et_ee.json       |  6 ++++--
 .../assets/sodium-extra/lang/fr_fr.json       |  4 +++-
 .../assets/sodium-extra/lang/it_it.json       |  4 +++-
 .../assets/sodium-extra/lang/ko_kr.json       |  6 ++++--
 .../assets/sodium-extra/lang/pl_pl.json       |  4 +++-
 .../assets/sodium-extra/lang/pt_br.json       |  4 +++-
 .../assets/sodium-extra/lang/ru_ru.json       |  6 ++++--
 .../assets/sodium-extra/lang/th_th.json       |  6 ++++--
 .../assets/sodium-extra/lang/tr_TR.json       |  6 ++++--
 .../assets/sodium-extra/lang/zh_cn.json       |  6 ++++--
 src/main/resources/sodium-extra.mixins.json   | 11 +++++-----
 24 files changed, 94 insertions(+), 31 deletions(-)
 create mode 100644 src/main/java/me/flashyreese/mods/sodiumextra/mixin/render/block/entity/MixinBeaconBlockEntityRenderer.java
 rename src/main/java/me/flashyreese/mods/sodiumextra/mixin/{ => render/block}/entity/MixinPistonBlockEntityRenderer.java (94%)
 rename src/main/java/me/flashyreese/mods/sodiumextra/mixin/{ => render}/entity/MixinGuardianEntityRenderer.java (93%)
 rename src/main/java/me/flashyreese/mods/sodiumextra/mixin/{ => render}/entity/MixinItemFrameEntityRenderer.java (95%)
 rename src/main/java/me/flashyreese/mods/sodiumextra/mixin/{ => render}/entity/MixinLivingEntityRenderer.java (96%)
 rename src/main/java/me/flashyreese/mods/sodiumextra/mixin/{ => render}/entity/MixinPaintingEntityRenderer.java (94%)

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java
index 1c65aa3b..177f2fc5 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java
@@ -301,6 +301,15 @@ public static OptionPage render() {
                         .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
                         .build()
                 )
+                .build());
+        groups.add(OptionGroup.createBuilder()
+                .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
+                        .setName(new TranslatableText("sodium-extra.option.beacon_beam"))
+                        .setTooltip(new TranslatableText("sodium-extra.option.beacon_beam.tooltip"))
+                        .setControl(TickBoxControl::new)
+                        .setBinding((opts, value) -> opts.renderSettings.beaconBeam = value, opts -> opts.renderSettings.beaconBeam)
+                        .build()
+                )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
                         .setName(new TranslatableText("block.minecraft.piston"))
                         .setTooltip(new TranslatableText("sodium-extra.option.piston.tooltip"))
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java
index 1211f1c9..f0ada05f 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java
@@ -175,6 +175,7 @@ public static class RenderSettings {
         public boolean armorStand;
         public boolean painting;
         public boolean piston;
+        public boolean beaconBeam;
 
         public RenderSettings() {
             this.fogDistance = 0;
@@ -183,6 +184,7 @@ public RenderSettings() {
             this.armorStand = true;
             this.painting = true;
             this.piston = true;
+            this.beaconBeam = true;
         }
     }
 
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java
index d42810d7..974fb492 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java
@@ -15,7 +15,6 @@ protected CaffeineConfig createConfig() {
                 .addMixinOption("biome_colors", true)
                 .addMixinOption("cloud", true)
                 .addMixinOption("compat", true) // Should not allow users to turn this off
-                .addMixinOption("entity", true)
                 .addMixinOption("fog", true)
                 .addMixinOption("gui", true)
                 .addMixinOption("instant_sneak", true)
@@ -23,6 +22,10 @@ protected CaffeineConfig createConfig() {
                 .addMixinOption("particle", true)
                 .addMixinOption("prevent_shaders", true)
                 .addMixinOption("reduce_resolution_on_mac", true)
+                .addMixinOption("render", true)
+                .addMixinOption("render.block", true)
+                .addMixinOption("render.block.entity", true)
+                .addMixinOption("render.entity", true)
                 .addMixinOption("sky", true)
                 .addMixinOption("sky_colors", true)
                 .addMixinOption("sodium", true)
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/render/block/entity/MixinBeaconBlockEntityRenderer.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/render/block/entity/MixinBeaconBlockEntityRenderer.java
new file mode 100644
index 00000000..a8d1d389
--- /dev/null
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/render/block/entity/MixinBeaconBlockEntityRenderer.java
@@ -0,0 +1,20 @@
+package me.flashyreese.mods.sodiumextra.mixin.render.block.entity;
+
+import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
+import net.minecraft.block.entity.BeaconBlockEntity;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.block.entity.BeaconBlockEntityRenderer;
+import net.minecraft.client.util.math.MatrixStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(BeaconBlockEntityRenderer.class)
+public class MixinBeaconBlockEntityRenderer {
+    @Inject(method = "render(Lnet/minecraft/block/entity/BeaconBlockEntity;FLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;II)V", at = @At(value = "HEAD"), cancellable = true)
+    public void render(BeaconBlockEntity beaconBlockEntity, float f, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, int j, CallbackInfo ci) {
+        if (!SodiumExtraClientMod.options().renderSettings.beaconBeam)
+            ci.cancel();
+    }
+}
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/entity/MixinPistonBlockEntityRenderer.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/render/block/entity/MixinPistonBlockEntityRenderer.java
similarity index 94%
rename from src/main/java/me/flashyreese/mods/sodiumextra/mixin/entity/MixinPistonBlockEntityRenderer.java
rename to src/main/java/me/flashyreese/mods/sodiumextra/mixin/render/block/entity/MixinPistonBlockEntityRenderer.java
index 6519ec13..a78ef856 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/entity/MixinPistonBlockEntityRenderer.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/render/block/entity/MixinPistonBlockEntityRenderer.java
@@ -1,4 +1,4 @@
-package me.flashyreese.mods.sodiumextra.mixin.entity;
+package me.flashyreese.mods.sodiumextra.mixin.render.block.entity;
 
 import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
 import net.minecraft.block.entity.PistonBlockEntity;
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/entity/MixinGuardianEntityRenderer.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/render/entity/MixinGuardianEntityRenderer.java
similarity index 93%
rename from src/main/java/me/flashyreese/mods/sodiumextra/mixin/entity/MixinGuardianEntityRenderer.java
rename to src/main/java/me/flashyreese/mods/sodiumextra/mixin/render/entity/MixinGuardianEntityRenderer.java
index 95bdba2a..adbabc47 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/entity/MixinGuardianEntityRenderer.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/render/entity/MixinGuardianEntityRenderer.java
@@ -1,4 +1,4 @@
-package me.flashyreese.mods.sodiumextra.mixin.entity;
+package me.flashyreese.mods.sodiumextra.mixin.render.entity;
 
 import net.minecraft.client.render.entity.GuardianEntityRenderer;
 import net.minecraft.world.World;
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/entity/MixinItemFrameEntityRenderer.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/render/entity/MixinItemFrameEntityRenderer.java
similarity index 95%
rename from src/main/java/me/flashyreese/mods/sodiumextra/mixin/entity/MixinItemFrameEntityRenderer.java
rename to src/main/java/me/flashyreese/mods/sodiumextra/mixin/render/entity/MixinItemFrameEntityRenderer.java
index eca558a8..0445388e 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/entity/MixinItemFrameEntityRenderer.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/render/entity/MixinItemFrameEntityRenderer.java
@@ -1,4 +1,4 @@
-package me.flashyreese.mods.sodiumextra.mixin.entity;
+package me.flashyreese.mods.sodiumextra.mixin.render.entity;
 
 import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
 import net.minecraft.client.render.VertexConsumerProvider;
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/entity/MixinLivingEntityRenderer.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/render/entity/MixinLivingEntityRenderer.java
similarity index 96%
rename from src/main/java/me/flashyreese/mods/sodiumextra/mixin/entity/MixinLivingEntityRenderer.java
rename to src/main/java/me/flashyreese/mods/sodiumextra/mixin/render/entity/MixinLivingEntityRenderer.java
index f10c6582..f259a88b 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/entity/MixinLivingEntityRenderer.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/render/entity/MixinLivingEntityRenderer.java
@@ -1,4 +1,4 @@
-package me.flashyreese.mods.sodiumextra.mixin.entity;
+package me.flashyreese.mods.sodiumextra.mixin.render.entity;
 
 import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
 import net.minecraft.client.render.VertexConsumerProvider;
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/entity/MixinPaintingEntityRenderer.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/render/entity/MixinPaintingEntityRenderer.java
similarity index 94%
rename from src/main/java/me/flashyreese/mods/sodiumextra/mixin/entity/MixinPaintingEntityRenderer.java
rename to src/main/java/me/flashyreese/mods/sodiumextra/mixin/render/entity/MixinPaintingEntityRenderer.java
index 3a7dba46..ad621fc8 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/entity/MixinPaintingEntityRenderer.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/render/entity/MixinPaintingEntityRenderer.java
@@ -1,4 +1,4 @@
-package me.flashyreese.mods.sodiumextra.mixin.entity;
+package me.flashyreese.mods.sodiumextra.mixin.render.entity;
 
 import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
 import net.minecraft.client.render.VertexConsumerProvider;
diff --git a/src/main/resources/assets/sodium-extra/lang/cs_cz.json b/src/main/resources/assets/sodium-extra/lang/cs_cz.json
index efcdc2c1..d587d7ca 100644
--- a/src/main/resources/assets/sodium-extra/lang/cs_cz.json
+++ b/src/main/resources/assets/sodium-extra/lang/cs_cz.json
@@ -1,12 +1,14 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "Přepnout animaci ohně",
   "sodium-extra.option.animate_lava.tooltip": "Přepnout animaci lávy",
-  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "Přepnout animaci portálů",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_water.tooltip": "Přepnout animaci vody",
   "sodium-extra.option.animations": "Animaci",
   "sodium-extra.option.animations_all.tooltip": "Přepnout všechny animace",
   "sodium-extra.option.armor_stands.tooltip": "Přepnout vykreslování stojanů na zbroj",
+  "sodium-extra.option.beacon_beam": "Beacon Beam",
+  "sodium-extra.option.beacon_beam.tooltip": "If enabled, beacon beams are processed.",
   "sodium-extra.option.biome_colors": "Barvy biomů",
   "sodium-extra.option.biome_colors.tooltip": "Barvy biomů se mění v závislosti na biomu",
   "sodium-extra.option.block_animations": "Animace bloků",
diff --git a/src/main/resources/assets/sodium-extra/lang/de_de.json b/src/main/resources/assets/sodium-extra/lang/de_de.json
index 1e95cec7..ddc14060 100644
--- a/src/main/resources/assets/sodium-extra/lang/de_de.json
+++ b/src/main/resources/assets/sodium-extra/lang/de_de.json
@@ -1,12 +1,14 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "Feuer-Animationen umschalten",
   "sodium-extra.option.animate_lava.tooltip": "Lava-Animationen umschalten",
-  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "Portal-Animationen umschalten",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_water.tooltip": "Wasser-Animationen umschalten",
   "sodium-extra.option.animations": "Animationen",
   "sodium-extra.option.animations_all.tooltip": "Alle Animationen umschalten",
   "sodium-extra.option.armor_stands.tooltip": "Darstellung von Rüstungsständern umschalten",
+  "sodium-extra.option.beacon_beam": "Beacon Beam",
+  "sodium-extra.option.beacon_beam.tooltip": "If enabled, beacon beams are processed.",
   "sodium-extra.option.biome_colors": "Biom-Farben",
   "sodium-extra.option.biome_colors.tooltip": "Biom-Farben basierend auf dem aktuellen Biom verändern",
   "sodium-extra.option.block_animations": "Block-Animationen",
diff --git a/src/main/resources/assets/sodium-extra/lang/en_us.json b/src/main/resources/assets/sodium-extra/lang/en_us.json
index a0f9bc89..ff66d686 100644
--- a/src/main/resources/assets/sodium-extra/lang/en_us.json
+++ b/src/main/resources/assets/sodium-extra/lang/en_us.json
@@ -1,12 +1,14 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "If enabled, fire animations are processed.",
   "sodium-extra.option.animate_lava.tooltip": "If enabled, lava animations are processed.",
-  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "If enabled, portal animations are processed.",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_water.tooltip": "If enabled, water animations are processed.",
   "sodium-extra.option.animations": "Animations",
   "sodium-extra.option.animations_all.tooltip": "If enabled, animations are processed.",
   "sodium-extra.option.armor_stands.tooltip": "If enabled, armor stands are rendered.",
+  "sodium-extra.option.beacon_beam": "Beacon Beam",
+  "sodium-extra.option.beacon_beam.tooltip": "If enabled, beacon beams are processed.",
   "sodium-extra.option.biome_colors": "Biome Colors",
   "sodium-extra.option.biome_colors.tooltip": "If enabled, biome colors are changed based on the biome.",
   "sodium-extra.option.block_animations": "Block Animations",
diff --git a/src/main/resources/assets/sodium-extra/lang/es_mx.json b/src/main/resources/assets/sodium-extra/lang/es_mx.json
index 05cb575f..7c297bcd 100644
--- a/src/main/resources/assets/sodium-extra/lang/es_mx.json
+++ b/src/main/resources/assets/sodium-extra/lang/es_mx.json
@@ -1,12 +1,14 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "Si está habilitado, se procesan las animaciones de fuego.",
   "sodium-extra.option.animate_lava.tooltip": "Si está habilitado, se procesan las animaciones de lava.",
-  "sodium-extra.option.animate_sculk_sensor.tooltip": "Si está habilitado, se procesan las animaciones del sensor de sculk.",
   "sodium-extra.option.animate_portal.tooltip": "Si está habilitado, se procesan las animaciones del portal.",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "Si está habilitado, se procesan las animaciones del sensor de sculk.",
   "sodium-extra.option.animate_water.tooltip": "Si está habilitado, se procesan las animaciones de agua.",
   "sodium-extra.option.animations": "Animaciones",
   "sodium-extra.option.animations_all.tooltip": "Si está habilitado, se procesan las animaciones.",
   "sodium-extra.option.armor_stands.tooltip": "Si está habilitado, se renderizan los soportes de armadura.",
+  "sodium-extra.option.beacon_beam": "Beacon Beam",
+  "sodium-extra.option.beacon_beam.tooltip": "If enabled, beacon beams are processed.",
   "sodium-extra.option.biome_colors": "Colores del bioma",
   "sodium-extra.option.biome_colors.tooltip": "Si está habilitado, los colores del bioma se cambian según el bioma.",
   "sodium-extra.option.block_animations": "Animaciones de bloques",
diff --git a/src/main/resources/assets/sodium-extra/lang/et_ee.json b/src/main/resources/assets/sodium-extra/lang/et_ee.json
index 55086abd..60c14ac2 100644
--- a/src/main/resources/assets/sodium-extra/lang/et_ee.json
+++ b/src/main/resources/assets/sodium-extra/lang/et_ee.json
@@ -1,12 +1,14 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "Lülita tuleanimatsioon sisse/välja",
   "sodium-extra.option.animate_lava.tooltip": "Lülita laavaanimatsioon sisse/välja",
-  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "Lülita portaalianimatsioon sisse/välja",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_water.tooltip": "Lülita veeanimatsioon sisse/välja",
   "sodium-extra.option.animations": "Animatsioonid",
   "sodium-extra.option.animations_all.tooltip": "Lülita kõiki animatsioone",
   "sodium-extra.option.armor_stands.tooltip": "Lülita rüüaluste renderdus sisse/välja",
+  "sodium-extra.option.beacon_beam": "Beacon Beam",
+  "sodium-extra.option.beacon_beam.tooltip": "If enabled, beacon beams are processed.",
   "sodium-extra.option.biome_colors": "Bioomivärvid",
   "sodium-extra.option.biome_colors.tooltip": "Bioomivärvid muutuvad bioomile vastavalt",
   "sodium-extra.option.block_animations": "Plokianimatsioonid",
@@ -80,4 +82,4 @@
   "sodium-extra.overlay.fps_extended": "(max. %s / kesk. %s / min. %s)",
   "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
   "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/fr_fr.json b/src/main/resources/assets/sodium-extra/lang/fr_fr.json
index e8fa93bd..75e4fa2b 100644
--- a/src/main/resources/assets/sodium-extra/lang/fr_fr.json
+++ b/src/main/resources/assets/sodium-extra/lang/fr_fr.json
@@ -1,12 +1,14 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "Activer l'animation du feu",
   "sodium-extra.option.animate_lava.tooltip": "Activer l'animation de la lave",
-  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "Activer l'animation des portails",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_water.tooltip": "Activer l'animation de l'eau",
   "sodium-extra.option.animations": "Animations",
   "sodium-extra.option.animations_all.tooltip": "Activer les animations",
   "sodium-extra.option.armor_stands.tooltip": "Activer le rendu des porte-armures",
+  "sodium-extra.option.beacon_beam": "Beacon Beam",
+  "sodium-extra.option.beacon_beam.tooltip": "If enabled, beacon beams are processed.",
   "sodium-extra.option.biome_colors": "Couleur des biomes",
   "sodium-extra.option.biome_colors.tooltip": "Changer la couleur des biomes selon le type de biome",
   "sodium-extra.option.block_animations": "Animer les blocs",
diff --git a/src/main/resources/assets/sodium-extra/lang/it_it.json b/src/main/resources/assets/sodium-extra/lang/it_it.json
index 41195e06..641bb10c 100644
--- a/src/main/resources/assets/sodium-extra/lang/it_it.json
+++ b/src/main/resources/assets/sodium-extra/lang/it_it.json
@@ -1,12 +1,14 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "Attiva/disattiva l'animazione del fuoco",
   "sodium-extra.option.animate_lava.tooltip": "Attiva/disattiva l'animazione della lava",
-  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "Attiva/disattiva l'animazione dei portali",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_water.tooltip": "Attiva/disattiva l'animazione dell'acqua",
   "sodium-extra.option.animations": "Animazioni",
   "sodium-extra.option.animations_all.tooltip": "Attiva/disattiva tutte le animazioni",
   "sodium-extra.option.armor_stands.tooltip": "Attiva/disattiva la renderizzazione dei supporti per armature",
+  "sodium-extra.option.beacon_beam": "Beacon Beam",
+  "sodium-extra.option.beacon_beam.tooltip": "If enabled, beacon beams are processed.",
   "sodium-extra.option.biome_colors": "Colori biomi",
   "sodium-extra.option.biome_colors.tooltip": "Cambia i colori del bioma in base al bioma",
   "sodium-extra.option.block_animations": "Animazioni blocchi",
diff --git a/src/main/resources/assets/sodium-extra/lang/ko_kr.json b/src/main/resources/assets/sodium-extra/lang/ko_kr.json
index 50473522..dce70499 100644
--- a/src/main/resources/assets/sodium-extra/lang/ko_kr.json
+++ b/src/main/resources/assets/sodium-extra/lang/ko_kr.json
@@ -1,12 +1,14 @@
 {
     "sodium-extra.option.animate_fire.tooltip": "활성화 하면, 불 애니메이션이 렌더링 됩니다.",
     "sodium-extra.option.animate_lava.tooltip": "활성화 하면, 용암 애니메이션이 렌더링 됩니다.",
-    "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
     "sodium-extra.option.animate_portal.tooltip": "활성화 하면, 차원문 애니메이션이 렌더링 됩니다.",
+    "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
     "sodium-extra.option.animate_water.tooltip": "활성화 하면, 물 애니메이션이 렌더링 됩니다.",
     "sodium-extra.option.animations": "애니메이션",
     "sodium-extra.option.animations_all.tooltip": "비활성화 하면, 모든 애니메이션이 처리되지 않습니다.",
     "sodium-extra.option.armor_stands.tooltip": "활성화 하면, 갑옷 거치대가 렌더링됩니다.",
+    "sodium-extra.option.beacon_beam": "Beacon Beam",
+    "sodium-extra.option.beacon_beam.tooltip": "If enabled, beacon beams are processed.",
     "sodium-extra.option.biome_colors": "생물 군계 색",
     "sodium-extra.option.biome_colors.tooltip": "활성화 하면, 생물 군계 색이 생물 군계를 기준으로 변경됩니다.",
     "sodium-extra.option.block_animations": "블록 애니메이션",
@@ -80,4 +82,4 @@
     "sodium-extra.overlay.fps_extended": "(최대 %s / 평균 %s / 최소 %s)",
     "sodium-extra.suggestRSO.header": "Reese's Sodium Options 모드를 설치하는것을 추천합니다.",
     "sodium-extra.suggestRSO.message": "Sodium Extra와 함께 Reese's Sodium Options 모드를 설치하는것이 좋습니다. 기능의 수가 증가함에 따라 Sodium의 비디오 옵션에서 모두 표시되지 않을 수 있습니다."
-  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/pl_pl.json b/src/main/resources/assets/sodium-extra/lang/pl_pl.json
index 6852ae3a..39610b64 100644
--- a/src/main/resources/assets/sodium-extra/lang/pl_pl.json
+++ b/src/main/resources/assets/sodium-extra/lang/pl_pl.json
@@ -1,12 +1,14 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "Jeśli ta opcja jest włączona, przetwarzane są animacje ognia.",
   "sodium-extra.option.animate_lava.tooltip": "Jeśli ta opcja jest włączona, przetwarzane są animacje lawy.",
-  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "Jeśli ta opcja jest włączona, przetwarzane są animacje portali.",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_water.tooltip": "Jeśli ta opcja jest włączona, przetwarzane są animacje wody.",
   "sodium-extra.option.animations": "Animacje",
   "sodium-extra.option.animations_all.tooltip": "Jeśli ta opcja jest włączona, animacje są przetwarzane.",
   "sodium-extra.option.armor_stands.tooltip": "Jeśli ta opcja jest włączona, stojaki na zbroje są renderowane.",
+  "sodium-extra.option.beacon_beam": "Beacon Beam",
+  "sodium-extra.option.beacon_beam.tooltip": "If enabled, beacon beams are processed.",
   "sodium-extra.option.biome_colors": "Korory biomów",
   "sodium-extra.option.biome_colors.tooltip": "Jeśli ta opcja jest włączona, kolory biomów zmieniają się w zależności od biomu.",
   "sodium-extra.option.block_animations": "Animacje bloków",
diff --git a/src/main/resources/assets/sodium-extra/lang/pt_br.json b/src/main/resources/assets/sodium-extra/lang/pt_br.json
index 0574148f..738e04b0 100644
--- a/src/main/resources/assets/sodium-extra/lang/pt_br.json
+++ b/src/main/resources/assets/sodium-extra/lang/pt_br.json
@@ -1,12 +1,14 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "Alterna a animação do fogo",
   "sodium-extra.option.animate_lava.tooltip": "Alterna a animação da lava",
-  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "Alterna a animação do portal",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_water.tooltip": "Alterna a animação da água",
   "sodium-extra.option.animations": "Animações",
   "sodium-extra.option.animations_all.tooltip": "Todas as animações",
   "sodium-extra.option.armor_stands.tooltip": "Renderizar suportes de armadura",
+  "sodium-extra.option.beacon_beam": "Beacon Beam",
+  "sodium-extra.option.beacon_beam.tooltip": "If enabled, beacon beams are processed.",
   "sodium-extra.option.biome_colors": "Cores de biomas",
   "sodium-extra.option.biome_colors.tooltip": "Cores de biomas mudam conforme você muda de biomas.",
   "sodium-extra.option.block_animations": "Animações dos blocos",
diff --git a/src/main/resources/assets/sodium-extra/lang/ru_ru.json b/src/main/resources/assets/sodium-extra/lang/ru_ru.json
index 564d812d..7e83fbcc 100644
--- a/src/main/resources/assets/sodium-extra/lang/ru_ru.json
+++ b/src/main/resources/assets/sodium-extra/lang/ru_ru.json
@@ -1,12 +1,14 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "Переключение анимации огня",
   "sodium-extra.option.animate_lava.tooltip": "Переключение анимации лавы",
-  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "Переключение анимации портала",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_water.tooltip": "Переключение анимации воды",
   "sodium-extra.option.animations": "Анимация",
   "sodium-extra.option.animations_all.tooltip": "Переключение всех анимаций",
   "sodium-extra.option.armor_stands.tooltip": "Переключение рендеринга стоек для брони",
+  "sodium-extra.option.beacon_beam": "Beacon Beam",
+  "sodium-extra.option.beacon_beam.tooltip": "If enabled, beacon beams are processed.",
   "sodium-extra.option.biome_colors": "Цвета Биомов",
   "sodium-extra.option.biome_colors.tooltip": "Изменение цветов биома в зависимости от биома",
   "sodium-extra.option.block_animations": "Анимации блоков",
@@ -80,4 +82,4 @@
   "sodium-extra.overlay.fps_extended": "(макс. %s / сред. %s / мин. %s)",
   "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
   "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/th_th.json b/src/main/resources/assets/sodium-extra/lang/th_th.json
index 42b5912d..4cd70ae7 100644
--- a/src/main/resources/assets/sodium-extra/lang/th_th.json
+++ b/src/main/resources/assets/sodium-extra/lang/th_th.json
@@ -1,12 +1,14 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "ถ้าเปิดตัวเลือกนี้ ภาพเคลื่อนไหวของไฟจะทำงาน",
   "sodium-extra.option.animate_lava.tooltip": "ถ้าเปิดตัวเลือกนี้ ภาพเคลื่อนไหวของลาวาจะทำงาน",
-  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "ถ้าเปิดตัวเลือกนี้ ภาพเคลื่อนไหวของประตูมิติเนเธอร์จะทำงาน",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_water.tooltip": "ถ้าเปิดตัวเลือกนี้ ภาพเคลื่อนไหวของน้ำจะทำงาน",
   "sodium-extra.option.animations": "ภาพเคลื่อนไหว",
   "sodium-extra.option.animations_all.tooltip": "ถ้าเปิดตัวเลือกนี้ ภาพเคลื่อนไหวจะทำงาน",
   "sodium-extra.option.armor_stands.tooltip": "ถ้าเปิดตัวเลือกนี้ แท่นวางชุดเกราะจะได้รับการเรนเดอร์",
+  "sodium-extra.option.beacon_beam": "Beacon Beam",
+  "sodium-extra.option.beacon_beam.tooltip": "If enabled, beacon beams are processed.",
   "sodium-extra.option.biome_colors": "สีของไบโอม",
   "sodium-extra.option.biome_colors.tooltip": "ถ้าเปิดตัวเลือกนี้ สีของไบโอมจะเปลี่ยนไปตามไบโอมนั้น ๆ",
   "sodium-extra.option.block_animations": "ภาพเคลื่อนไหวของบล็อก",
@@ -80,4 +82,4 @@
   "sodium-extra.overlay.fps_extended": "(สูง %s / กลาง %s / ต่ำ %s)",
   "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
   "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/tr_TR.json b/src/main/resources/assets/sodium-extra/lang/tr_TR.json
index ac8ef715..8bacfeb1 100644
--- a/src/main/resources/assets/sodium-extra/lang/tr_TR.json
+++ b/src/main/resources/assets/sodium-extra/lang/tr_TR.json
@@ -1,12 +1,14 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "Ateş animasyonunu aç/kapa",
   "sodium-extra.option.animate_lava.tooltip": "Lav animasyonunu aç/kapa",
-  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "Portal animasyonunu aç/kapa",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_water.tooltip": "Su animasyonunu aç/kapa",
   "sodium-extra.option.animations": "Animasyonlar",
   "sodium-extra.option.animations_all.tooltip": "Tüm animasyonları aç/kapa",
   "sodium-extra.option.armor_stands.tooltip": "Zırh askılarını işlemeyi aç/kapa",
+  "sodium-extra.option.beacon_beam": "Beacon Beam",
+  "sodium-extra.option.beacon_beam.tooltip": "If enabled, beacon beams are processed.",
   "sodium-extra.option.biome_colors": "Biyom Renkleri",
   "sodium-extra.option.biome_colors.tooltip": "Biyoma göre değişen biyom renkleri",
   "sodium-extra.option.block_animations": "Blok Animasyonları",
@@ -80,4 +82,4 @@
   "sodium-extra.overlay.fps_extended": "(mak. %s / ort. %s / min. %s)",
   "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
   "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/zh_cn.json b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
index ecb0e308..8923bcb7 100644
--- a/src/main/resources/assets/sodium-extra/lang/zh_cn.json
+++ b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
@@ -1,12 +1,14 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "开启或关闭火焰动画",
   "sodium-extra.option.animate_lava.tooltip": "开启或关闭岩浆动画",
-  "sodium-extra.option.animate_sculk_sensor.tooltip": "开启或关闭潜声传感器动画",
   "sodium-extra.option.animate_portal.tooltip": "开启或关闭传送门动画",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "开启或关闭潜声传感器动画",
   "sodium-extra.option.animate_water.tooltip": "开启或关闭水面动画",
   "sodium-extra.option.animations": "动画",
   "sodium-extra.option.animations_all.tooltip": "开启或关闭全部动画",
   "sodium-extra.option.armor_stands.tooltip": "开启或关闭显示盔甲架",
+  "sodium-extra.option.beacon_beam": "Beacon Beam",
+  "sodium-extra.option.beacon_beam.tooltip": "If enabled, beacon beams are processed.",
   "sodium-extra.option.biome_colors": "群系颜色",
   "sodium-extra.option.biome_colors.tooltip": "生物群系颜色根据生物群系变化",
   "sodium-extra.option.block_animations": "方块动画",
@@ -80,4 +82,4 @@
   "sodium-extra.overlay.fps_extended": "(max. %s / avg. %s / min. %s)",
   "sodium-extra.suggestRSO.header": "建议: 安装Reese's Sodium Options",
   "sodium-extra.suggestRSO.message": "强烈建议您在安装Sodium Extra的同时安装Reese's Sodium Options。由于越来越多的功能，它不再适合Sodium的视频设置。"
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/sodium-extra.mixins.json b/src/main/resources/sodium-extra.mixins.json
index 730b05e0..67e339d5 100644
--- a/src/main/resources/sodium-extra.mixins.json
+++ b/src/main/resources/sodium-extra.mixins.json
@@ -10,11 +10,6 @@
     "cloud.MixinWorldRenderer",
     "compat.MixinSodiumOptionsGUI",
     "compat.MixinTitleScreen",
-    "entity.MixinGuardianEntityRenderer",
-    "entity.MixinItemFrameEntityRenderer",
-    "entity.MixinLivingEntityRenderer",
-    "entity.MixinPaintingEntityRenderer",
-    "entity.MixinPistonBlockEntityRenderer",
     "fog.MixinBackgroundRenderer",
     "gui.MinecraftClientAccessor",
     "gui.MixinInGameHud",
@@ -24,6 +19,12 @@
     "particle.MixinWorldRenderer",
     "prevent_shaders.MixinGameRenderer",
     "reduce_resolution_on_mac.MixinWindow",
+    "render.block.entity.MixinBeaconBlockEntityRenderer",
+    "render.block.entity.MixinPistonBlockEntityRenderer",
+    "render.entity.MixinGuardianEntityRenderer",
+    "render.entity.MixinItemFrameEntityRenderer",
+    "render.entity.MixinLivingEntityRenderer",
+    "render.entity.MixinPaintingEntityRenderer",
     "sky.MixinWorldRenderer",
     "sky_colors.MixinBiome",
     "sodium.accessibility.MixinSodiumGameOptionPages",

From 0d44623a706f9e7675afe69816d4149028d02ce7 Mon Sep 17 00:00:00 2001
From: Felix14-v2 <75726196+Felix14-v2@users.noreply.github.com>
Date: Wed, 6 Apr 2022 18:24:01 +0300
Subject: [PATCH 04/20] change: Update ru_ru.json (#183)

* Update ru_ru.json

* Update ru_ru.json

Co-authored-by: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
---
 .../assets/sodium-extra/lang/ru_ru.json        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/assets/sodium-extra/lang/ru_ru.json b/src/main/resources/assets/sodium-extra/lang/ru_ru.json
index 7e83fbcc..574f5804 100644
--- a/src/main/resources/assets/sodium-extra/lang/ru_ru.json
+++ b/src/main/resources/assets/sodium-extra/lang/ru_ru.json
@@ -2,7 +2,7 @@
   "sodium-extra.option.animate_fire.tooltip": "Переключение анимации огня",
   "sodium-extra.option.animate_lava.tooltip": "Переключение анимации лавы",
   "sodium-extra.option.animate_portal.tooltip": "Переключение анимации портала",
-  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "Переключение анимации скалк-сенсора.",
   "sodium-extra.option.animate_water.tooltip": "Переключение анимации воды",
   "sodium-extra.option.animations": "Анимация",
   "sodium-extra.option.animations_all.tooltip": "Переключение всех анимаций",
@@ -28,8 +28,8 @@
   "sodium-extra.option.fireworks.tooltip": "Переключение частиц фейерверка",
   "sodium-extra.option.fog": "Туман",
   "sodium-extra.option.fog.tooltip": "Регулирует дальность тумана на территории. \n0 - обычный ванильный туман\n1-32 - расстояние до тумана в чанках\n33 - максимальное расстояние тумана (по сути, отключает туман)",
-  "sodium-extra.option.gl_debug_verbosity": "OpenGL Debug Output",
-  "sodium-extra.option.gl_debug_verbosity.tooltip": "Debug Output is an OpenGL feature that makes debugging and optimizing OpenGL applications easier. Briefly, this feature provides a method for the driver to provide textual message information back to the application.\nModifying this option will require a game restart.",
+  "sodium-extra.option.gl_debug_verbosity": "Вывод отладки OpenGL",
+  "sodium-extra.option.gl_debug_verbosity.tooltip": "Вывод отладки – это функция OpenGL, упрощающая отладку и оптимизацию приложений OpenGL. В целом, эта функция предоставляет для драйвера способ отправки текстовых сообщений обратно в графическое приложение.\nИзменение этой настройки требует перезапуска игры.",
   "sodium-extra.option.instant_sneak": "Моментальное приседание",
   "sodium-extra.option.instant_sneak.tooltip": "Отключает плавную камеру при приседании",
   "sodium-extra.option.item_frames.tooltip": "Переключение видимости рамок",
@@ -52,7 +52,7 @@
   "sodium-extra.option.rain_splash.tooltip": "Переключение брызг дождя",
   "sodium-extra.option.redstone.tooltip": "Переключение частиц редстоуна",
   "sodium-extra.option.reduce_resolution_on_mac": "Уменьшить разрешение на MacOS",
-  "sodium-extra.option.reduce_resolution_on_mac.tooltip": "Вдвое уменьшает разрешение на дисплеях Retina, значительно повышая производительность на MacOS.\nИзменение этой опции потребует перезапуска игры.",
+  "sodium-extra.option.reduce_resolution_on_mac.tooltip": "Вдвое уменьшает разрешение на дисплеях Retina, значительно повышая производительность на MacOS.\nИзменение этой настройки требует перезапуска игры.",
   "sodium-extra.option.render": "Рендеринг",
   "sodium-extra.option.resolution.tooltip": "Устанавливает разрешение игры",
   "sodium-extra.option.show_coordinates": "Показывать координаты",
@@ -74,12 +74,12 @@
   "sodium-extra.option.toasts": "Уведомления",
   "sodium-extra.option.toasts.tooltip": "Всплывающие уведомления о достижениях и новых рецептах",
   "sodium-extra.option.use_fast_random": "Использовать быстрый рандом",
-  "sodium-extra.option.use_fast_random.tooltip": "Если включено, для рендеринга блоков будет использоваться функция быстрого рандома. Это может повлиять на положение случайно повёрнутых текстур по сравнению с ваниллой.",
-  "sodium-extra.option.villagers.tooltip": "Переключение частиц жителей",
+  "sodium-extra.option.use_fast_random.tooltip": "Если включено, для рендеринга блоков будет использоваться функция быстрого рандома. Это может повлиять на положение случайно повёрнутых текстур по сравнению с ванилью.",
+  "sodium-extra.option.villagers.tooltip": "Переключение частиц крестьян",
   "sodium-extra.option.water.tooltip": "Переключение частиц воды",
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
   "sodium-extra.overlay.fps_extended": "(макс. %s / сред. %s / мин. %s)",
-  "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
-  "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
-}
\ No newline at end of file
+  "sodium-extra.suggestRSO.header": "Совет: установите Reese's Sodium Options",
+  "sodium-extra.suggestRSO.message": "Крайне рекомендуется использовать Reese's Sodium Options совместно с Sodium Extra. Из-за возрастающего количества функций его элементы не умещаются должным образом в обычном окне настроек графики Sodium."
+}

From a3b13bbc78fca13640b62362f4c153f8e1336788 Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Thu, 7 Apr 2022 00:04:49 +0800
Subject: [PATCH 05/20] change: Mark as breaking for `1.4.1` and older version
 of RSO

---
 src/main/resources/fabric.mod.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index dcfbd242..7e8abe83 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -40,6 +40,9 @@
     "fabric-lifecycle-events-v1": "*",
     "sodium": "0.3.x"
   },
+  "breaks": {
+    "reeses-sodium-options": "<1.4.2"
+  },
   "recommends": {
     "reeses-sodium-options": ">=1.4.2"
   }

From 64f5c745058662f2454419350c967cbe4d3da47e Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Tue, 19 Apr 2022 01:55:21 +0800
Subject: [PATCH 06/20] change: Remove OpenGL Debug Output

Iris now has a integrated solution, no reason to keep this.
---
 .../client/gui/SodiumExtraGameOptionPages.java           | 9 ---------
 src/main/resources/assets/sodium-extra/lang/cs_cz.json   | 2 --
 src/main/resources/assets/sodium-extra/lang/de_de.json   | 2 --
 src/main/resources/assets/sodium-extra/lang/en_us.json   | 2 --
 src/main/resources/assets/sodium-extra/lang/es_mx.json   | 2 --
 src/main/resources/assets/sodium-extra/lang/et_ee.json   | 2 --
 src/main/resources/assets/sodium-extra/lang/fr_fr.json   | 2 --
 src/main/resources/assets/sodium-extra/lang/it_it.json   | 2 --
 src/main/resources/assets/sodium-extra/lang/ko_kr.json   | 2 --
 src/main/resources/assets/sodium-extra/lang/pl_pl.json   | 2 --
 src/main/resources/assets/sodium-extra/lang/pt_br.json   | 2 --
 src/main/resources/assets/sodium-extra/lang/ru_ru.json   | 2 --
 src/main/resources/assets/sodium-extra/lang/th_th.json   | 2 --
 src/main/resources/assets/sodium-extra/lang/tr_TR.json   | 2 --
 src/main/resources/assets/sodium-extra/lang/zh_cn.json   | 2 --
 15 files changed, 37 deletions(-)

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java
index 177f2fc5..483e98e3 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java
@@ -9,7 +9,6 @@
 import me.jellysquid.mods.sodium.client.gui.options.control.CyclingControl;
 import me.jellysquid.mods.sodium.client.gui.options.control.SliderControl;
 import me.jellysquid.mods.sodium.client.gui.options.control.TickBoxControl;
-import me.jellysquid.mods.sodium.client.gui.options.storage.MinecraftOptionsStorage;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.TranslatableText;
 
@@ -17,7 +16,6 @@
 import java.util.List;
 
 public class SodiumExtraGameOptionPages {
-    private static final MinecraftOptionsStorage vanillaOpts = new MinecraftOptionsStorage();
     public static final SodiumExtraOptionsStorage sodiumExtraOpts = new SodiumExtraOptionsStorage();
 
     public static OptionPage animation() {
@@ -324,13 +322,6 @@ public static OptionPage render() {
     public static OptionPage extra() {
         List<OptionGroup> groups = new ArrayList<>();
         groups.add(OptionGroup.createBuilder()
-                .add(OptionImpl.createBuilder(boolean.class, vanillaOpts)
-                        .setName(new TranslatableText("sodium-extra.option.gl_debug_verbosity"))
-                        .setTooltip(new TranslatableText("sodium-extra.option.gl_debug_verbosity.tooltip"))
-                        .setControl(TickBoxControl::new)
-                        .setBinding((options, value) -> options.glDebugVerbosity = value ? 1 : 0, options -> options.glDebugVerbosity == 1)
-                        .build()
-                )
                 .add(OptionImpl.createBuilder(boolean.class, SodiumExtraGameOptionPages.sodiumExtraOpts)
                         .setName(new TranslatableText("sodium-extra.option.use_fast_random"))
                         .setTooltip(new TranslatableText("sodium-extra.option.use_fast_random.tooltip"))
diff --git a/src/main/resources/assets/sodium-extra/lang/cs_cz.json b/src/main/resources/assets/sodium-extra/lang/cs_cz.json
index d587d7ca..029f01c1 100644
--- a/src/main/resources/assets/sodium-extra/lang/cs_cz.json
+++ b/src/main/resources/assets/sodium-extra/lang/cs_cz.json
@@ -28,8 +28,6 @@
   "sodium-extra.option.fireworks.tooltip": "Přepnout částice rachejtlí",
   "sodium-extra.option.fog": "Mlha",
   "sodium-extra.option.fog.tooltip": "Upraví vzdálenost efektu mlhy na terénu. \n0 - použít výchozí nastavení mlhy\n1-32 - nastavit vzdálenost mlhy v chuncích\n33 - maximální vzdálenost mlhy (v podstatě vypne mlhu)",
-  "sodium-extra.option.gl_debug_verbosity": "OpenGL Debug Output",
-  "sodium-extra.option.gl_debug_verbosity.tooltip": "Debug Output is an OpenGL feature that makes debugging and optimizing OpenGL applications easier. Briefly, this feature provides a method for the driver to provide textual message information back to the application.\nModifying this option will require a game restart.",
   "sodium-extra.option.instant_sneak": "Instantní plížení",
   "sodium-extra.option.instant_sneak.tooltip": "Neprovádět animaci plížení",
   "sodium-extra.option.item_frames.tooltip": "Přepnout vykreslování rámečků",
diff --git a/src/main/resources/assets/sodium-extra/lang/de_de.json b/src/main/resources/assets/sodium-extra/lang/de_de.json
index ddc14060..c5c17ac2 100644
--- a/src/main/resources/assets/sodium-extra/lang/de_de.json
+++ b/src/main/resources/assets/sodium-extra/lang/de_de.json
@@ -28,8 +28,6 @@
   "sodium-extra.option.fireworks.tooltip": "Feuerwerkspartikel umschalten",
   "sodium-extra.option.fog": "Nebel",
   "sodium-extra.option.fog.tooltip": "Passt die Nebeleffekt-Distanz im Gelände an. \n0 - Vanilla Nebeleinstellungen benutzen\n1-32 - Nebeldistanz in Chunks setzen\n33 - Max. Nebeldistanz (deaktiviert Nebel im Grunde)",
-  "sodium-extra.option.gl_debug_verbosity": "OpenGL Debug Output",
-  "sodium-extra.option.gl_debug_verbosity.tooltip": "Debug Output is an OpenGL feature that makes debugging and optimizing OpenGL applications easier. Briefly, this feature provides a method for the driver to provide textual message information back to the application.\nModifying this option will require a game restart.",
   "sodium-extra.option.instant_sneak": "Sofort-Schleichen",
   "sodium-extra.option.instant_sneak.tooltip": "Kamera zum Schleichen nicht schwenken",
   "sodium-extra.option.item_frames.tooltip": "Darstellung von Rahmen umschalten",
diff --git a/src/main/resources/assets/sodium-extra/lang/en_us.json b/src/main/resources/assets/sodium-extra/lang/en_us.json
index ff66d686..b2f10730 100644
--- a/src/main/resources/assets/sodium-extra/lang/en_us.json
+++ b/src/main/resources/assets/sodium-extra/lang/en_us.json
@@ -28,8 +28,6 @@
   "sodium-extra.option.fireworks.tooltip": "If enabled, fireworks particles are processed.",
   "sodium-extra.option.fog": "Fog",
   "sodium-extra.option.fog.tooltip": "Adjusts the fog effect distance on the terrain. \n0 - use vanilla fog settings\n1-32 - set fog distance in chunks\n33 - max fog distance (essentially disables fog)",
-  "sodium-extra.option.gl_debug_verbosity": "OpenGL Debug Output",
-  "sodium-extra.option.gl_debug_verbosity.tooltip": "Debug Output is an OpenGL feature that makes debugging and optimizing OpenGL applications easier. Briefly, this feature provides a method for the driver to provide textual message information back to the application.\nModifying this option will require a game restart.",
   "sodium-extra.option.instant_sneak": "Instant Sneak",
   "sodium-extra.option.instant_sneak.tooltip": "If enabled, the camera will not lerp upon sneaking.",
   "sodium-extra.option.item_frames.tooltip": "If enabled, item frames are rendered.",
diff --git a/src/main/resources/assets/sodium-extra/lang/es_mx.json b/src/main/resources/assets/sodium-extra/lang/es_mx.json
index 7c297bcd..0bb95400 100644
--- a/src/main/resources/assets/sodium-extra/lang/es_mx.json
+++ b/src/main/resources/assets/sodium-extra/lang/es_mx.json
@@ -28,8 +28,6 @@
   "sodium-extra.option.fireworks.tooltip": "Si está habilitado, se procesan las partículas de fuegos artificiales.",
   "sodium-extra.option.fog": "Niebla",
   "sodium-extra.option.fog.tooltip": "Ajusta la distancia del efecto de niebla en el terreno.\n0 - use la configuración de niebla vainilla\n1-32 - establezca la distancia de niebla en trozos\n33 - distancia máxima de niebla (niebla esencialmente desactivada)",
-  "sodium-extra.option.gl_debug_verbosity": "Salida de depuración de OpenGL",
-  "sodium-extra.option.gl_debug_verbosity.tooltip": "La salida de depuración es una característica de OpenGL que facilita la depuración y optimización de aplicaciones OpenGL. Brevemente, esta función proporciona un método para que el controlador proporcione información de mensajes de texto a la aplicación.\nModificar esta opción requerirá reiniciar el juego.",
   "sodium-extra.option.instant_sneak": "Agachar instantáneo",
   "sodium-extra.option.instant_sneak.tooltip": "Si está habilitada, la cámara no moverá al agacharse.",
   "sodium-extra.option.item_frames.tooltip": "Si está habilitado, se renderizan los marcos.",
diff --git a/src/main/resources/assets/sodium-extra/lang/et_ee.json b/src/main/resources/assets/sodium-extra/lang/et_ee.json
index 60c14ac2..ffde86f4 100644
--- a/src/main/resources/assets/sodium-extra/lang/et_ee.json
+++ b/src/main/resources/assets/sodium-extra/lang/et_ee.json
@@ -28,8 +28,6 @@
   "sodium-extra.option.fireworks.tooltip": "Lülita ilutulestiku osakesed sisse/välja",
   "sodium-extra.option.fog": "Udu",
   "sodium-extra.option.fog.tooltip": "Reguleerib maastikul uduefekti kaugust.\n0 - kasuta vanilli udusätteid\n1-32 - määra udukaugus kamakates\n33 - maksimaalne udukaugus (sisuliselt keelab udu)",
-  "sodium-extra.option.gl_debug_verbosity": "OpenGL Debug Output",
-  "sodium-extra.option.gl_debug_verbosity.tooltip": "Debug Output is an OpenGL feature that makes debugging and optimizing OpenGL applications easier. Briefly, this feature provides a method for the driver to provide textual message information back to the application.\nModifying this option will require a game restart.",
   "sodium-extra.option.instant_sneak": "Kohene hiilimine",
   "sodium-extra.option.instant_sneak.tooltip": "Väldi hiilimisel kaamera hüplemist",
   "sodium-extra.option.item_frames.tooltip": "Lülita esemeraamide renderdamine sisse/välja",
diff --git a/src/main/resources/assets/sodium-extra/lang/fr_fr.json b/src/main/resources/assets/sodium-extra/lang/fr_fr.json
index 75e4fa2b..4b9c81ff 100644
--- a/src/main/resources/assets/sodium-extra/lang/fr_fr.json
+++ b/src/main/resources/assets/sodium-extra/lang/fr_fr.json
@@ -28,8 +28,6 @@
   "sodium-extra.option.fireworks.tooltip": "Activer les particules des feux d'artifice",
   "sodium-extra.option.fog": "Brouillard",
   "sodium-extra.option.fog.tooltip": "Ajuster la distance de l'effet de brouillard sur le terrain. \n0 - Paramètre par défaut du jeu\n1-32 - Défini la distance du brouillard en chunks\n33 - Distance maximum (Désactiver le brouillard entre autres)",
-  "sodium-extra.option.gl_debug_verbosity": "OpenGL Debug Output",
-  "sodium-extra.option.gl_debug_verbosity.tooltip": "Debug Output is an OpenGL feature that makes debugging and optimizing OpenGL applications easier. Briefly, this feature provides a method for the driver to provide textual message information back to the application.\nModifying this option will require a game restart.",
   "sodium-extra.option.instant_sneak": "Accroupissement instantané",
   "sodium-extra.option.instant_sneak.tooltip": "Désactiver l'animation de la caméra lors de l'accroupissement",
   "sodium-extra.option.item_frames.tooltip": "Activer le rendu des cadres",
diff --git a/src/main/resources/assets/sodium-extra/lang/it_it.json b/src/main/resources/assets/sodium-extra/lang/it_it.json
index 641bb10c..4a3a46ca 100644
--- a/src/main/resources/assets/sodium-extra/lang/it_it.json
+++ b/src/main/resources/assets/sodium-extra/lang/it_it.json
@@ -28,8 +28,6 @@
   "sodium-extra.option.fireworks.tooltip": "Attiva/disattiva le particelle dei fuochi d'artificio",
   "sodium-extra.option.fog": "Nebbia",
   "sodium-extra.option.fog.tooltip": "Regola la distanza dell'effetto nebbia sul terreno. \n0 - usa le impostazioni nebbia predefinite\n1-32 - imposta la distanza nebbia in chunk\n33 - distanza nebbia massima (disabilita la nebbia)",
-  "sodium-extra.option.gl_debug_verbosity": "OpenGL Debug Output",
-  "sodium-extra.option.gl_debug_verbosity.tooltip": "Debug Output is an OpenGL feature that makes debugging and optimizing OpenGL applications easier. Briefly, this feature provides a method for the driver to provide textual message information back to the application.\nModifying this option will require a game restart.",
   "sodium-extra.option.instant_sneak": "Accovacciamento istantaneo",
   "sodium-extra.option.instant_sneak.tooltip": "Non animare la telecamera per accovacciarsi",
   "sodium-extra.option.item_frames.tooltip": "Attiva/disattiva il rendering delle cornici",
diff --git a/src/main/resources/assets/sodium-extra/lang/ko_kr.json b/src/main/resources/assets/sodium-extra/lang/ko_kr.json
index dce70499..43ed4e1c 100644
--- a/src/main/resources/assets/sodium-extra/lang/ko_kr.json
+++ b/src/main/resources/assets/sodium-extra/lang/ko_kr.json
@@ -28,8 +28,6 @@
     "sodium-extra.option.fireworks.tooltip": "활성화 하면, 폭죽 입자가 렌더링 됩니다.",
     "sodium-extra.option.fog": "안개",
     "sodium-extra.option.fog.tooltip": "안개 효과의 거리를 조절합니다.\n0 - 바닐라 설정 사용\n1-32 - 청크 단위로 안개 거리 제어\n33 - 최대 안개 거리 (보통 안개를 제거함)",
-    "sodium-extra.option.gl_debug_verbosity": "OpenGL 디버그 출력",
-    "sodium-extra.option.gl_debug_verbosity.tooltip": "디버그 출력은 OpenGL 응용 프로그램의 디버깅과 최적화를 쉽게 하는 OpenGL의 기능입니다. 간단히 말해, 이 기능은 드라이버가 텍스트 메시지 정보를 응용 프로그램에 제공하는 방법을 제공합니다.\n이 옵션을 변경 사항을 적용하려면 게임을 재시작해야 합니다.",
     "sodium-extra.option.instant_sneak": "즉시 웅크리기",
     "sodium-extra.option.instant_sneak.tooltip": "활성화 하면, 카메라가 웅크릴때 선형보강법을 사용하지 않습니다.",
     "sodium-extra.option.item_frames.tooltip": "활성화 하면, 아이템 액자가 렌더링됩니다.",
diff --git a/src/main/resources/assets/sodium-extra/lang/pl_pl.json b/src/main/resources/assets/sodium-extra/lang/pl_pl.json
index 39610b64..7a3b7c72 100644
--- a/src/main/resources/assets/sodium-extra/lang/pl_pl.json
+++ b/src/main/resources/assets/sodium-extra/lang/pl_pl.json
@@ -28,8 +28,6 @@
   "sodium-extra.option.fireworks.tooltip": "Jeśli ta opcja jest włączona, cząstki fajerwerków są przetwarzane.",
   "sodium-extra.option.fog": "Mgła",
   "sodium-extra.option.fog.tooltip": "Dostosowuje odległość efektu mgły na terenie. \n0 - użyj ustawień domyślnej mgły\n1-32 - ustaw odległość mgły w chunkach\n33 - maksymalna odległość mgły (zasadniczo wyłącza mgłę)",
-  "sodium-extra.option.gl_debug_verbosity": "Wyjście debugowania OpenGL",
-  "sodium-extra.option.gl_debug_verbosity.tooltip": "Wyjście debugowania to funkcja OpenGL, która ułatwia debugowanie i optymalizację aplikacji OpenGL. Krótko mówiąc, ta funkcja umożliwia sterownikowi dostarczenie informacji tekstowych z powrotem do aplikacji.\nZmiana tej opcji będzie wymagać ponownego uruchomienia gry.",
   "sodium-extra.option.instant_sneak": "Natychmiastowe skradanie się",
   "sodium-extra.option.instant_sneak.tooltip": "Jeśli ta opcja jest włączona, kamera nie będzie się płynnie obniżać przy skradaniu.",
   "sodium-extra.option.item_frames.tooltip": "Jeśli ta opcja jest włączona, przedmioty są renderowane.",
diff --git a/src/main/resources/assets/sodium-extra/lang/pt_br.json b/src/main/resources/assets/sodium-extra/lang/pt_br.json
index 738e04b0..012bb66d 100644
--- a/src/main/resources/assets/sodium-extra/lang/pt_br.json
+++ b/src/main/resources/assets/sodium-extra/lang/pt_br.json
@@ -28,8 +28,6 @@
   "sodium-extra.option.fireworks.tooltip": "Alterna as partículas de fogos de artifício",
   "sodium-extra.option.fog": "Neblina",
   "sodium-extra.option.fog.tooltip": "Ajusta a distância do efeito de neblina no terreno. \n0 - utiliza os valores padrões.\n1-32 - determina o valor em 'Chunks' da distância.\n33 - Distância máxima da neblina (basicamente a desabilita)",
-  "sodium-extra.option.gl_debug_verbosity": "OpenGL Debug Output",
-  "sodium-extra.option.gl_debug_verbosity.tooltip": "Debug Output is an OpenGL feature that makes debugging and optimizing OpenGL applications easier. Briefly, this feature provides a method for the driver to provide textual message information back to the application.\nModifying this option will require a game restart.",
   "sodium-extra.option.instant_sneak": "Agachamento instantâneo",
   "sodium-extra.option.instant_sneak.tooltip": "A câmera não é suavisada ao agachar-se",
   "sodium-extra.option.item_frames.tooltip": "Renderizar molduras",
diff --git a/src/main/resources/assets/sodium-extra/lang/ru_ru.json b/src/main/resources/assets/sodium-extra/lang/ru_ru.json
index 574f5804..0b506ea3 100644
--- a/src/main/resources/assets/sodium-extra/lang/ru_ru.json
+++ b/src/main/resources/assets/sodium-extra/lang/ru_ru.json
@@ -28,8 +28,6 @@
   "sodium-extra.option.fireworks.tooltip": "Переключение частиц фейерверка",
   "sodium-extra.option.fog": "Туман",
   "sodium-extra.option.fog.tooltip": "Регулирует дальность тумана на территории. \n0 - обычный ванильный туман\n1-32 - расстояние до тумана в чанках\n33 - максимальное расстояние тумана (по сути, отключает туман)",
-  "sodium-extra.option.gl_debug_verbosity": "Вывод отладки OpenGL",
-  "sodium-extra.option.gl_debug_verbosity.tooltip": "Вывод отладки – это функция OpenGL, упрощающая отладку и оптимизацию приложений OpenGL. В целом, эта функция предоставляет для драйвера способ отправки текстовых сообщений обратно в графическое приложение.\nИзменение этой настройки требует перезапуска игры.",
   "sodium-extra.option.instant_sneak": "Моментальное приседание",
   "sodium-extra.option.instant_sneak.tooltip": "Отключает плавную камеру при приседании",
   "sodium-extra.option.item_frames.tooltip": "Переключение видимости рамок",
diff --git a/src/main/resources/assets/sodium-extra/lang/th_th.json b/src/main/resources/assets/sodium-extra/lang/th_th.json
index 4cd70ae7..32d416cb 100644
--- a/src/main/resources/assets/sodium-extra/lang/th_th.json
+++ b/src/main/resources/assets/sodium-extra/lang/th_th.json
@@ -28,8 +28,6 @@
   "sodium-extra.option.fireworks.tooltip": "ถ้าเปิดตัวเลือกนี้ อนุภาคจากดอกไม้ไฟจะทำงาน",
   "sodium-extra.option.fog": "หมอก",
   "sodium-extra.option.fog.tooltip": "ปรับระยะห่างของเอฟเฟกต์หมอกในภูมิประเทศ \n0 - ใช้ค่าของหมอกจากวานิลลาดั้งเดิม \n1-32 - กำหนดระยะห่างของหมอก นับเป็นชังก์ \n33 - ระยะห่างของหมอกสูงสุด (หลัก ๆ แล้ว จะเป็นการปิดหมอก)",
-  "sodium-extra.option.gl_debug_verbosity": "OpenGL Debug Output",
-  "sodium-extra.option.gl_debug_verbosity.tooltip": "Debug Output is an OpenGL feature that makes debugging and optimizing OpenGL applications easier. Briefly, this feature provides a method for the driver to provide textual message information back to the application.\nModifying this option will require a game restart.",
   "sodium-extra.option.instant_sneak": "ย่อแบบทันที",
   "sodium-extra.option.instant_sneak.tooltip": "ถ้าเปิดตัวเลือกนี้ ตัวกล้องจะไม่เลื่อนลงแบบช้า ๆ เมื่อย่อลงไป",
   "sodium-extra.option.item_frames.tooltip": "ถ้าเปิดตัวเลือกนี้ กรอบไอเท็มจะได้รับการเรนเดอร์",
diff --git a/src/main/resources/assets/sodium-extra/lang/tr_TR.json b/src/main/resources/assets/sodium-extra/lang/tr_TR.json
index 8bacfeb1..a0bec88e 100644
--- a/src/main/resources/assets/sodium-extra/lang/tr_TR.json
+++ b/src/main/resources/assets/sodium-extra/lang/tr_TR.json
@@ -28,8 +28,6 @@
   "sodium-extra.option.fireworks.tooltip": "Havai fişek parçacıklarını aç/kapa",
   "sodium-extra.option.fog": "Sis",
   "sodium-extra.option.fog.tooltip": "Arazideki sis efekt menzilini ayarlar. \n0 - varsayılan sis ayarlarını kullan\n1-32 - yığın (chunk) olarak sis menzili ayarla\n33 - maksimum sis menzili (bir bakıma sisi devre dışı bırakır)",
-  "sodium-extra.option.gl_debug_verbosity": "OpenGL Hata Ayıklama Çıktısı",
-  "sodium-extra.option.gl_debug_verbosity.tooltip": "Hata Ayıklama Çıktısı, OpenGL uygulamalarında hata ayıklamayı ve optimize etmeyi kolaylaştıran bir OpenGL özelliğidir. Kısaca, bu özellik, sürücünün uygulamaya metinsel mesaj bilgilerini geri sağlaması için bir yöntem sağlar.\nBu seçeneğin değiştirilmesi, oyunun yeniden başlatılmasını gerektirir.",
   "sodium-extra.option.instant_sneak": "Hızlı Eğilme",
   "sodium-extra.option.instant_sneak.tooltip": "Eğilirken kameraya lineer enterpolasyon yapma",
   "sodium-extra.option.item_frames.tooltip": "Eşya çerçevelerini işlemeyi aç/kapa",
diff --git a/src/main/resources/assets/sodium-extra/lang/zh_cn.json b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
index 8923bcb7..111099ce 100644
--- a/src/main/resources/assets/sodium-extra/lang/zh_cn.json
+++ b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
@@ -28,8 +28,6 @@
   "sodium-extra.option.fireworks.tooltip": "开启或关闭烟花粒子效果",
   "sodium-extra.option.fog": "迷雾",
   "sodium-extra.option.fog.tooltip": "设置地形开始显示迷雾效果的距离。\n0 - 使用原版的迷雾设置\n1-32 - 以方块为单位设置迷雾距离\n33 - 最大迷雾距离(基本上禁用迷雾)",
-  "sodium-extra.option.gl_debug_verbosity": "OpenGL调试输出",
-  "sodium-extra.option.gl_debug_verbosity.tooltip": "调试输出是OpenGL的一个功能，它使得调试和优化OpenGL应用程序更加容易。简而言之，该功能为驱动程序提供了一种将文本信息返回给应用程序的方法。\n修改此选项需要重新启动游戏。",
   "sodium-extra.option.instant_sneak": "直接潜行",
   "sodium-extra.option.instant_sneak.tooltip": "潜行时视角直接下移而不是缓慢地",
   "sodium-extra.option.item_frames.tooltip": "开启或关闭显示物品展示框",

From c58bebdc6bc296ea5f2e70db44cfb6a17bf1b26d Mon Sep 17 00:00:00 2001
From: Madis Otenurm <Madis0@users.noreply.github.com>
Date: Sun, 1 May 2022 03:19:31 +0300
Subject: [PATCH 07/20] new: Add overlay when light updates are disabled (#194)

* Overlay when light updates are disabled

* Add missing strings

Co-authored-by: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
---
 .../sodiumextra/mixin/gui/MixinInGameHud.java | 30 +++++++++++++++++++
 .../assets/sodium-extra/lang/cs_cz.json       |  1 +
 .../assets/sodium-extra/lang/de_de.json       |  1 +
 .../assets/sodium-extra/lang/en_us.json       |  1 +
 .../assets/sodium-extra/lang/es_mx.json       |  1 +
 .../assets/sodium-extra/lang/et_ee.json       |  1 +
 .../assets/sodium-extra/lang/fr_fr.json       |  1 +
 .../assets/sodium-extra/lang/it_it.json       |  1 +
 .../assets/sodium-extra/lang/ko_kr.json       |  1 +
 .../assets/sodium-extra/lang/pl_pl.json       |  1 +
 .../assets/sodium-extra/lang/pt_br.json       |  1 +
 .../assets/sodium-extra/lang/ru_ru.json       |  1 +
 .../assets/sodium-extra/lang/th_th.json       |  1 +
 .../assets/sodium-extra/lang/tr_TR.json       |  1 +
 .../assets/sodium-extra/lang/zh_cn.json       |  1 +
 15 files changed, 44 insertions(+)

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/gui/MixinInGameHud.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/gui/MixinInGameHud.java
index 2eb0cec5..571f9ec5 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/gui/MixinInGameHud.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/gui/MixinInGameHud.java
@@ -39,6 +39,9 @@ public void render(MatrixStack matrices, float tickDelta, CallbackInfo callbackI
             } else if (SodiumExtraClientMod.options().extraSettings.showCoords) {
                 this.renderCoords(matrices);
             }
+            if (!SodiumExtraClientMod.options().renderSettings.lightUpdates){
+                this.renderLightUpdatesWarning(matrices);
+            }
         }
     }
 
@@ -105,4 +108,31 @@ private void renderCoords(MatrixStack matrices) {
 
         this.client.textRenderer.draw(matrices, text, x, y, 0xffffffff);
     }
+
+    private void renderLightUpdatesWarning(MatrixStack matrices){
+        Text text = new TranslatableText("sodium-extra.overlay.light_updates");
+
+        int x, y;
+        switch (SodiumExtraClientMod.options().extraSettings.overlayCorner) {
+            case TOP_LEFT -> {
+                x = 2;
+                y = 22;
+            }
+            case TOP_RIGHT -> {
+                x = this.scaledWidth - this.client.textRenderer.getWidth(text) - 2;
+                y = 22;
+            }
+            case BOTTOM_LEFT -> {
+                x = 2;
+                y = this.scaledHeight - this.client.textRenderer.fontHeight - 22;
+            }
+            case BOTTOM_RIGHT -> {
+                x = this.scaledWidth - this.client.textRenderer.getWidth(text) - 2;
+                y = this.scaledHeight - this.client.textRenderer.fontHeight - 22;
+            }
+            default -> throw new IllegalStateException("Unexpected value: " + SodiumExtraClientMod.options().extraSettings.overlayCorner);
+        }
+
+        this.client.textRenderer.draw(matrices, text, x, y, 0xffffffff);
+    }
 }
diff --git a/src/main/resources/assets/sodium-extra/lang/cs_cz.json b/src/main/resources/assets/sodium-extra/lang/cs_cz.json
index 029f01c1..d573f566 100644
--- a/src/main/resources/assets/sodium-extra/lang/cs_cz.json
+++ b/src/main/resources/assets/sodium-extra/lang/cs_cz.json
@@ -78,6 +78,7 @@
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
   "sodium-extra.overlay.fps_extended": "(max. %s / prům. %s / min. %s)",
+  "sodium-extra.overlay.light_updates": "Light updates disabled",
   "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
   "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/de_de.json b/src/main/resources/assets/sodium-extra/lang/de_de.json
index c5c17ac2..b6bac5f7 100644
--- a/src/main/resources/assets/sodium-extra/lang/de_de.json
+++ b/src/main/resources/assets/sodium-extra/lang/de_de.json
@@ -78,6 +78,7 @@
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
   "sodium-extra.overlay.fps_extended": "(max. %s / avg. %s / min. %s)",
+  "sodium-extra.overlay.light_updates": "Light updates disabled",
   "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
   "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/en_us.json b/src/main/resources/assets/sodium-extra/lang/en_us.json
index b2f10730..97529fe3 100644
--- a/src/main/resources/assets/sodium-extra/lang/en_us.json
+++ b/src/main/resources/assets/sodium-extra/lang/en_us.json
@@ -78,6 +78,7 @@
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
   "sodium-extra.overlay.fps_extended": "(max. %s / avg. %s / min. %s)",
+  "sodium-extra.overlay.light_updates": "Light updates disabled",
   "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
   "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/es_mx.json b/src/main/resources/assets/sodium-extra/lang/es_mx.json
index 0bb95400..ce073fcb 100644
--- a/src/main/resources/assets/sodium-extra/lang/es_mx.json
+++ b/src/main/resources/assets/sodium-extra/lang/es_mx.json
@@ -78,6 +78,7 @@
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
   "sodium-extra.overlay.fps_extended": "(max. %s / prom. %s / min. %s)",
+  "sodium-extra.overlay.light_updates": "Actualizaciones de iluminación deshabilitado",
   "sodium-extra.suggestRSO.header": "Sugerencia: Instale Reese's Sodium Options",
   "sodium-extra.suggestRSO.message": "Se recomienda enfáticamente que instale Reese's Sodium Options junto con Sodium Extra. Debido a la creciente cantidad de funciones, ya no encaja correctamente en las opciones de video de Sodium."
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/et_ee.json b/src/main/resources/assets/sodium-extra/lang/et_ee.json
index ffde86f4..1a06d23b 100644
--- a/src/main/resources/assets/sodium-extra/lang/et_ee.json
+++ b/src/main/resources/assets/sodium-extra/lang/et_ee.json
@@ -78,6 +78,7 @@
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s k/s",
   "sodium-extra.overlay.fps_extended": "(max. %s / kesk. %s / min. %s)",
+  "sodium-extra.overlay.light_updates": "Valguse uuendused keelatud",
   "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
   "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/fr_fr.json b/src/main/resources/assets/sodium-extra/lang/fr_fr.json
index 4b9c81ff..e9126043 100644
--- a/src/main/resources/assets/sodium-extra/lang/fr_fr.json
+++ b/src/main/resources/assets/sodium-extra/lang/fr_fr.json
@@ -78,6 +78,7 @@
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
   "sodium-extra.overlay.fps_extended": "(max. %s / moy. %s / min. %s)",
+  "sodium-extra.overlay.light_updates": "Light updates disabled",
   "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
   "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/it_it.json b/src/main/resources/assets/sodium-extra/lang/it_it.json
index 4a3a46ca..e9794e1f 100644
--- a/src/main/resources/assets/sodium-extra/lang/it_it.json
+++ b/src/main/resources/assets/sodium-extra/lang/it_it.json
@@ -78,6 +78,7 @@
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
   "sodium-extra.overlay.fps_extended": "(max. %s / med. %s / min. %s)",
+  "sodium-extra.overlay.light_updates": "Light updates disabled",
   "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
   "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/ko_kr.json b/src/main/resources/assets/sodium-extra/lang/ko_kr.json
index 43ed4e1c..fcb6ea90 100644
--- a/src/main/resources/assets/sodium-extra/lang/ko_kr.json
+++ b/src/main/resources/assets/sodium-extra/lang/ko_kr.json
@@ -78,6 +78,7 @@
     "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
     "sodium-extra.overlay.fps": "%s FPS",
     "sodium-extra.overlay.fps_extended": "(최대 %s / 평균 %s / 최소 %s)",
+    "sodium-extra.overlay.light_updates": "Light updates disabled",
     "sodium-extra.suggestRSO.header": "Reese's Sodium Options 모드를 설치하는것을 추천합니다.",
     "sodium-extra.suggestRSO.message": "Sodium Extra와 함께 Reese's Sodium Options 모드를 설치하는것이 좋습니다. 기능의 수가 증가함에 따라 Sodium의 비디오 옵션에서 모두 표시되지 않을 수 있습니다."
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/pl_pl.json b/src/main/resources/assets/sodium-extra/lang/pl_pl.json
index 7a3b7c72..80fefcc1 100644
--- a/src/main/resources/assets/sodium-extra/lang/pl_pl.json
+++ b/src/main/resources/assets/sodium-extra/lang/pl_pl.json
@@ -78,6 +78,7 @@
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
   "sodium-extra.overlay.fps_extended": "(maks. %s / śr. %s / min. %s)",
+  "sodium-extra.overlay.light_updates": "Light updates disabled",
   "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
   "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/pt_br.json b/src/main/resources/assets/sodium-extra/lang/pt_br.json
index 012bb66d..af98cea7 100644
--- a/src/main/resources/assets/sodium-extra/lang/pt_br.json
+++ b/src/main/resources/assets/sodium-extra/lang/pt_br.json
@@ -78,6 +78,7 @@
   "sodium-extra.overlay.coordinates": "%s  %s  %s",
   "sodium-extra.overlay.fps": "Taxa de quadros: %s",
   "sodium-extra.overlay.fps_extended": "(max. %s / avg. %s / min. %s)",
+  "sodium-extra.overlay.light_updates": "Light updates disabled",
   "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
   "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/ru_ru.json b/src/main/resources/assets/sodium-extra/lang/ru_ru.json
index 0b506ea3..a07e5eae 100644
--- a/src/main/resources/assets/sodium-extra/lang/ru_ru.json
+++ b/src/main/resources/assets/sodium-extra/lang/ru_ru.json
@@ -78,6 +78,7 @@
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
   "sodium-extra.overlay.fps_extended": "(макс. %s / сред. %s / мин. %s)",
+  "sodium-extra.overlay.light_updates": "Light updates disabled",
   "sodium-extra.suggestRSO.header": "Совет: установите Reese's Sodium Options",
   "sodium-extra.suggestRSO.message": "Крайне рекомендуется использовать Reese's Sodium Options совместно с Sodium Extra. Из-за возрастающего количества функций его элементы не умещаются должным образом в обычном окне настроек графики Sodium."
 }
diff --git a/src/main/resources/assets/sodium-extra/lang/th_th.json b/src/main/resources/assets/sodium-extra/lang/th_th.json
index 32d416cb..89be72de 100644
--- a/src/main/resources/assets/sodium-extra/lang/th_th.json
+++ b/src/main/resources/assets/sodium-extra/lang/th_th.json
@@ -78,6 +78,7 @@
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
   "sodium-extra.overlay.fps_extended": "(สูง %s / กลาง %s / ต่ำ %s)",
+  "sodium-extra.overlay.light_updates": "Light updates disabled",
   "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
   "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/tr_TR.json b/src/main/resources/assets/sodium-extra/lang/tr_TR.json
index a0bec88e..f13f3c76 100644
--- a/src/main/resources/assets/sodium-extra/lang/tr_TR.json
+++ b/src/main/resources/assets/sodium-extra/lang/tr_TR.json
@@ -78,6 +78,7 @@
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
   "sodium-extra.overlay.fps_extended": "(mak. %s / ort. %s / min. %s)",
+  "sodium-extra.overlay.light_updates": "Light updates disabled",
   "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
   "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/zh_cn.json b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
index 111099ce..a4278539 100644
--- a/src/main/resources/assets/sodium-extra/lang/zh_cn.json
+++ b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
@@ -78,6 +78,7 @@
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
   "sodium-extra.overlay.fps_extended": "(max. %s / avg. %s / min. %s)",
+  "sodium-extra.overlay.light_updates": "Light updates disabled",
   "sodium-extra.suggestRSO.header": "建议: 安装Reese's Sodium Options",
   "sodium-extra.suggestRSO.message": "强烈建议您在安装Sodium Extra的同时安装Reese's Sodium Options。由于越来越多的功能，它不再适合Sodium的视频设置。"
 }
\ No newline at end of file

From d3b414e1545f5e44a15890b8fc7ba827e90e51fa Mon Sep 17 00:00:00 2001
From: Madis Otenurm <Madis0@users.noreply.github.com>
Date: Sun, 1 May 2022 03:25:06 +0300
Subject: [PATCH 08/20] Update et_ee.json (#195)

Co-authored-by: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
---
 .../assets/sodium-extra/lang/et_ee.json       | 164 +++++++++---------
 1 file changed, 82 insertions(+), 82 deletions(-)

diff --git a/src/main/resources/assets/sodium-extra/lang/et_ee.json b/src/main/resources/assets/sodium-extra/lang/et_ee.json
index 1a06d23b..2fce21e3 100644
--- a/src/main/resources/assets/sodium-extra/lang/et_ee.json
+++ b/src/main/resources/assets/sodium-extra/lang/et_ee.json
@@ -1,84 +1,84 @@
 {
-  "sodium-extra.option.animate_fire.tooltip": "Lülita tuleanimatsioon sisse/välja",
-  "sodium-extra.option.animate_lava.tooltip": "Lülita laavaanimatsioon sisse/välja",
-  "sodium-extra.option.animate_portal.tooltip": "Lülita portaalianimatsioon sisse/välja",
-  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
-  "sodium-extra.option.animate_water.tooltip": "Lülita veeanimatsioon sisse/välja",
-  "sodium-extra.option.animations": "Animatsioonid",
-  "sodium-extra.option.animations_all.tooltip": "Lülita kõiki animatsioone",
-  "sodium-extra.option.armor_stands.tooltip": "Lülita rüüaluste renderdus sisse/välja",
-  "sodium-extra.option.beacon_beam": "Beacon Beam",
-  "sodium-extra.option.beacon_beam.tooltip": "If enabled, beacon beams are processed.",
-  "sodium-extra.option.biome_colors": "Bioomivärvid",
-  "sodium-extra.option.biome_colors.tooltip": "Bioomivärvid muutuvad bioomile vastavalt",
-  "sodium-extra.option.block_animations": "Plokianimatsioonid",
-  "sodium-extra.option.block_animations.tooltip": "Töötle plokianimatsioone",
-  "sodium-extra.option.block_break.tooltip": "Töötle purunenud ploki osakesi",
-  "sodium-extra.option.block_breaking.tooltip": "Töötle ploki purunemise osakesi",
-  "sodium-extra.option.bubbles.tooltip": "Lülita mulliosakesed sisse/välja",
-  "sodium-extra.option.cloud_height": "Pilvekõrgus",
-  "sodium-extra.option.cloud_height.tooltip": "Reguleeri pilvede kõrgust",
-  "sodium-extra.option.composter.tooltip": "Lülita komposteri osakesed sisse/välja",
-  "sodium-extra.option.details": "Detailid",
-  "sodium-extra.option.dripping_particles": "Tilgaosakesed",
-  "sodium-extra.option.dripping_particles.tooltip": "Lülita tilgaosakesed sisse/välja",
-  "sodium-extra.option.environment.tooltip": "Lülita keskkonnaosakesed sisse/välja",
-  "sodium-extra.option.explosions.tooltip": "Lülita plahvatuste osakesed sisse/välja",
-  "sodium-extra.option.extras": "Lisad",
-  "sodium-extra.option.fireworks.tooltip": "Lülita ilutulestiku osakesed sisse/välja",
-  "sodium-extra.option.fog": "Udu",
-  "sodium-extra.option.fog.tooltip": "Reguleerib maastikul uduefekti kaugust.\n0 - kasuta vanilli udusätteid\n1-32 - määra udukaugus kamakates\n33 - maksimaalne udukaugus (sisuliselt keelab udu)",
-  "sodium-extra.option.instant_sneak": "Kohene hiilimine",
-  "sodium-extra.option.instant_sneak.tooltip": "Väldi hiilimisel kaamera hüplemist",
-  "sodium-extra.option.item_frames.tooltip": "Lülita esemeraamide renderdamine sisse/välja",
-  "sodium-extra.option.light_updates": "Valguse uuendused",
-  "sodium-extra.option.light_updates.tooltip": "Töötle valguse uuendusi",
-  "sodium-extra.option.overlay_corner": "Ülekatte nurk",
-  "sodium-extra.option.overlay_corner.bottom_left": "All vasakul",
-  "sodium-extra.option.overlay_corner.bottom_right": "All paremal",
-  "sodium-extra.option.overlay_corner.tooltip": "Määrab, millises ekraani nurgas ülekate kuvatakse (kaadrisagedus ja koordinaadid).",
-  "sodium-extra.option.overlay_corner.top_left": "Üleval vasakul",
-  "sodium-extra.option.overlay_corner.top_right": "Üleval paremal",
-  "sodium-extra.option.paintings.tooltip": "Lülita maalide renderdamine sisse/välja",
-  "sodium-extra.option.particles_all.tooltip": "Lülita kõik osakesed sisse/välja",
-  "sodium-extra.option.piston.tooltip": "Töötle kolvianimatsioone",
-  "sodium-extra.option.portal.tooltip": "Lülita portaaliosakesed sisse/välja",
-  "sodium-extra.option.potions.tooltip": "Lülita võlujoogiosakesed sisse/välja",
-  "sodium-extra.option.prevent_shaders": "Väldi varjutajaid",
-  "sodium-extra.option.prevent_shaders.tooltip": "Keela mistahes tüüpi varjutajate laadimine",
-  "sodium-extra.option.rain_snow.tooltip": "Lülita vihm ja lumi sisse/välja",
-  "sodium-extra.option.rain_splash.tooltip": "Lülita vihma plärtsatuste osakesed sisse/välja",
-  "sodium-extra.option.redstone.tooltip": "Lülita redstone-osakesed sisse/välja",
-  "sodium-extra.option.reduce_resolution_on_mac": "Vähenda macOSil resolutsiooni",
-  "sodium-extra.option.reduce_resolution_on_mac.tooltip": "Kasuta retina-ekraanidel poole väiksemat resolutsiooni, suurendab macOSil jõudlust märgatavalt.\nSelle valiku muutmine nõuab mängu taaskäivitust.",
-  "sodium-extra.option.render": "Renderdamine",
-  "sodium-extra.option.resolution.tooltip": "Määrab mängu resolutsiooni",
-  "sodium-extra.option.show_coordinates": "Kuva koordinaadid",
-  "sodium-extra.option.show_coordinates.tooltip": "Kuva koordinaadid üleval vasakus nurgas",
-  "sodium-extra.option.show_fps": "Kuva kaadrisagedus",
-  "sodium-extra.option.show_fps.tooltip": "Kuvab praegust, maksimaalset, keskmist ja minimaalset kaadrisagedust üleval vasakus nurgas",
-  "sodium-extra.option.show_fps_extended": "Kuva kaadrisagedus laiendatult",
-  "sodium-extra.option.show_fps_extended.tooltip": "Kuvab ülekattel täiendavat infot (maksimaalne, keskmine ja minimaalne) hetkese kaadrisageduse kõrval",
-  "sodium-extra.option.sky": "Taevas",
-  "sodium-extra.option.sky.tooltip": "Lubamisel renderdatakse taevas.",
-  "sodium-extra.option.sky_colors": "Taevavärvid",
-  "sodium-extra.option.sky_colors.tooltip": "Taevavärvid muutuvad bioomile vastavalt",
-  "sodium-extra.option.smoke": "Suits",
-  "sodium-extra.option.smoke.tooltip": "Lülitab suitsuosakesed sisse/välja",
-  "sodium-extra.option.stars": "Tähed",
-  "sodium-extra.option.stars.tooltip": "Lubamisel renderdatakse tähed.",
-  "sodium-extra.option.sun_moon": "Päike ja kuu",
-  "sodium-extra.option.sun_moon.tooltip": "Lubamisel renderdatakse päike ja kuu.",
-  "sodium-extra.option.toasts": "Hüpikud",
-  "sodium-extra.option.toasts.tooltip": "Edasijõudmiste ja meisterdusretseptide hüpikud",
-  "sodium-extra.option.use_fast_random": "Kasuta kiiret juhuslikkust",
-  "sodium-extra.option.use_fast_random.tooltip": "Lubamisel kasutatakse plokkide renderdamiseks kiiret juhuslikkuse meetodit. See võib muuta juhuslikult pööratud tekstuuride pöördenurga vanillist erinevaks.",
-  "sodium-extra.option.villagers.tooltip": "Lülita külaelanike osakesed sisse/välja",
-  "sodium-extra.option.water.tooltip": "Lülita veeosakesed sisse/välja",
-  "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
-  "sodium-extra.overlay.fps": "%s k/s",
-  "sodium-extra.overlay.fps_extended": "(max. %s / kesk. %s / min. %s)",
-  "sodium-extra.overlay.light_updates": "Valguse uuendused keelatud",
-  "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
-  "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
+    "sodium-extra.option.animate_fire.tooltip": "Lubamisel töödeldakse tuleanimatsioone.",
+    "sodium-extra.option.animate_lava.tooltip": "Lubamisel töödeldakse laavaanimatsioone.",
+    "sodium-extra.option.animate_portal.tooltip": "Lubamisel töödeldakse portaalianimatsioone.",
+    "sodium-extra.option.animate_sculk_sensor.tooltip": "Lubamisel töödeldakse sculk-sensori animatsioone.",
+    "sodium-extra.option.animate_water.tooltip": "Lubamisel töödeldakse veeanimatsioone.",
+    "sodium-extra.option.animations": "Animatsioonid",
+    "sodium-extra.option.animations_all.tooltip": "Lubamisel töödeldakse animatsioone.",
+    "sodium-extra.option.armor_stands.tooltip": "Lubamisel renderdatakse rüüaluseid.",
+    "sodium-extra.option.beacon_beam": "Majakakiir",
+    "sodium-extra.option.beacon_beam.tooltip": "Lubamisel töödeldakse majakakiiri.",
+    "sodium-extra.option.biome_colors": "Bioomivärvid",
+    "sodium-extra.option.biome_colors.tooltip": "Lubamisel muutuvad bioomivärvid vastavalt bioomile.",
+    "sodium-extra.option.block_animations": "Plokianimatsioonid",
+    "sodium-extra.option.block_animations.tooltip": "Lubamisel töödeldakse plokianimatsioone.",
+    "sodium-extra.option.block_break.tooltip": "Lubamisel töödeldakse purunenud ploki osakesi.",
+    "sodium-extra.option.block_breaking.tooltip": "Lubamisel töödeldakse ploki purunemise osakesi.",
+    "sodium-extra.option.bubbles.tooltip": "Lubamisel töödeldakse mulliosakesi.",
+    "sodium-extra.option.cloud_height": "Pilvekõrgus",
+    "sodium-extra.option.cloud_height.tooltip": "Reguleerib renderdatud pilvede kõrgust.",
+    "sodium-extra.option.composter.tooltip": "Lubamisel töödeldakse komposteri osakesi.",
+    "sodium-extra.option.details": "Detailid",
+    "sodium-extra.option.dripping_particles": "Tilgaosakesed",
+    "sodium-extra.option.dripping_particles.tooltip": "Lubamisel töödeldakse tilgaosakesi.",
+    "sodium-extra.option.environment.tooltip": "Lubamisel töödeldakse keskkonnaosakesi.",
+    "sodium-extra.option.explosions.tooltip": "Lubamisel töödeldakse plahvatuste osakesi.",
+    "sodium-extra.option.extras": "Lisad",
+    "sodium-extra.option.fireworks.tooltip": "Lubamisel töödeldakse ilutulestiku osakesi.",
+    "sodium-extra.option.fog": "Udu",
+    "sodium-extra.option.fog.tooltip": "Reguleerib maastikul uduefekti kaugust.\n0 - kasuta vanilli udusätteid\n1-32 - määra udukaugus kamakates\n33 - maksimaalne udukaugus (sisuliselt keelab udu)",
+    "sodium-extra.option.instant_sneak": "Kohene hiilimine",
+    "sodium-extra.option.instant_sneak.tooltip": "Lubamisel väldib hiilimisel kaamera hüplemist.",
+    "sodium-extra.option.item_frames.tooltip": "Lubamisel renderdatakse esemeraame.",
+    "sodium-extra.option.light_updates": "Valguse uuendused",
+    "sodium-extra.option.light_updates.tooltip": "Lubamisel töödeldakse valguse uuendusi. Keelamisel võib see mõjutada valgustust uute kamakate genereerimisel. Keela vaid siis, kui tead, mida teed.",
+    "sodium-extra.option.overlay_corner": "Ülekatte nurk",
+    "sodium-extra.option.overlay_corner.bottom_left": "All vasakul",
+    "sodium-extra.option.overlay_corner.bottom_right": "All paremal",
+    "sodium-extra.option.overlay_corner.tooltip": "Määrab, millises ekraani nurgas ülekate (kaadrisagedus ja koordinaadid) kuvatakse.",
+    "sodium-extra.option.overlay_corner.top_left": "Üleval vasakul",
+    "sodium-extra.option.overlay_corner.top_right": "Üleval paremal",
+    "sodium-extra.option.paintings.tooltip": "Lubamisel renderdatakse maale.",
+    "sodium-extra.option.particles_all.tooltip": "Lubamisel töödeldakse osakesi.",
+    "sodium-extra.option.piston.tooltip": "Lubamisel töödeldakse kolvianimatsioone.",
+    "sodium-extra.option.portal.tooltip": "Lubamisel töödeldakse portaaliosakesi.",
+    "sodium-extra.option.potions.tooltip": "Lubamisel töödeldakse võlujoogiosakesi.",
+    "sodium-extra.option.prevent_shaders": "Väldi varjutajaid",
+    "sodium-extra.option.prevent_shaders.tooltip": "Lubamisel keelatakse mistahes tüüpi vanilli varjutajate laadimine.",
+    "sodium-extra.option.rain_snow.tooltip": "Lubamisel töödeldakse vihma ja lund.",
+    "sodium-extra.option.rain_splash.tooltip": "Lubamisel töödeldakse vihma plärtsatuste osakesi.",
+    "sodium-extra.option.redstone.tooltip": "Lubamisel töödeldakse redstone-osakesi.",
+    "sodium-extra.option.reduce_resolution_on_mac": "Vähenda macOSil resolutsiooni",
+    "sodium-extra.option.reduce_resolution_on_mac.tooltip": "Kasuta retina-ekraanidel poole väiksemat resolutsiooni, suurendades macOSil jõudlust märgatavalt.\nSelle valiku muutmine nõuab mängu taaskäivitust.",
+    "sodium-extra.option.render": "Renderdamine",
+    "sodium-extra.option.resolution.tooltip": "Määrab mängu resolutsiooni täisekraanil.",
+    "sodium-extra.option.show_coordinates": "Kuva koordinaadid",
+    "sodium-extra.option.show_coordinates.tooltip": "Kuvab mängija koordinaadid ülekattena.",
+    "sodium-extra.option.show_fps": "Kuva kaadrisagedus",
+    "sodium-extra.option.show_fps.tooltip": "Kuvab mängu kaardisagedust ülekattena.",
+    "sodium-extra.option.show_fps_extended": "Kuva kaadrisagedus laiendatult",
+    "sodium-extra.option.show_fps_extended.tooltip": "Kuvab ülekattel täiendavat infot (maksimaalne, keskmine ja minimaalne) hetkese kaadrisageduse kõrval.",
+    "sodium-extra.option.sky": "Taevas",
+    "sodium-extra.option.sky.tooltip": "Lubamisel renderdatakse taevas.",
+    "sodium-extra.option.sky_colors": "Taevavärvid",
+    "sodium-extra.option.sky_colors.tooltip": "Lubamisel muutuvad taevavärvid vastavalt bioomile.",
+    "sodium-extra.option.smoke": "Suits",
+    "sodium-extra.option.smoke.tooltip": "Lubamisel töödeldakse suitsuosakesi.",
+    "sodium-extra.option.stars": "Tähed",
+    "sodium-extra.option.stars.tooltip": "Lubamisel renderdatakse tähed.",
+    "sodium-extra.option.sun_moon": "Päike ja kuu",
+    "sodium-extra.option.sun_moon.tooltip": "Lubamisel renderdatakse päike ja kuu.",
+    "sodium-extra.option.toasts": "Hüpikud",
+    "sodium-extra.option.toasts.tooltip": "Lubamisel kuvatakse edasijõudmiste ja meisterdusretseptide hüpikud.",
+    "sodium-extra.option.use_fast_random": "Kasuta kiiret juhuslikkust",
+    "sodium-extra.option.use_fast_random.tooltip": "Lubamisel kasutatakse plokkide renderdamiseks kiiret juhuslikkuse meetodit. See võib muuta juhuslikult pööratud tekstuuride pöördenurga vanillist erinevaks.",
+    "sodium-extra.option.villagers.tooltip": "Lubamisel töödeldakse külaelanike osakesi.",
+    "sodium-extra.option.water.tooltip": "Lubamisel töödeldakse veeosakesi.",
+    "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
+    "sodium-extra.overlay.fps": "%s k/s",
+    "sodium-extra.overlay.fps_extended": "(max. %s / kesk. %s / min. %s)",
+    "sodium-extra.overlay.light_updates": "Valguse uuendused keelatud",
+    "sodium-extra.suggestRSO.header": "Soovitus: paigalda Reese's Sodium Options",
+    "sodium-extra.suggestRSO.message": "Tungivalt soovitatav on paigaldada Sodium Extra kõrvale Reese's Sodium Options. Kasvava funktsionaalsuse tõttu ei mahu valikud enam Sodiumi graafikasätetesse ära."
 }
\ No newline at end of file

From d3fb3d2edac0c81b2678a975bcbec18a1a845616 Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Wed, 4 May 2022 04:02:53 +0800
Subject: [PATCH 09/20] change: Bump Fabric Loader to 0.14.4

---
 gradle.properties                  | 2 +-
 src/main/resources/fabric.mod.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index d75bd9f3..0029a404 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx1G
     # check these on https://modmuss50.me/fabric.html
     minecraft_version=1.17.1
     yarn_mappings=1.17.1+build.65
-    loader_version=0.13.3
+    loader_version=0.14.4
 
 # Mod Properties
     mod_version=0.4.3
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 7e8abe83..a89a77b9 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -36,7 +36,7 @@
     "sodium-extra.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.13",
+    "fabricloader": ">=0.14",
     "fabric-lifecycle-events-v1": "*",
     "sodium": "0.3.x"
   },

From fddeb839bab85de8ac173418519c3c673393f859 Mon Sep 17 00:00:00 2001
From: Madis Otenurm <Madis0@users.noreply.github.com>
Date: Tue, 3 May 2022 23:10:40 +0300
Subject: [PATCH 10/20] change: Remove formatting from modified vanilla
 resource pack strings (#198)

* Remove colors from vanilla/resource pack strings

* Prettified method
---
 .../gui/SodiumExtraGameOptionPages.java       | 57 ++++++++++---------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java
index 483e98e3..14179a27 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java
@@ -10,6 +10,7 @@
 import me.jellysquid.mods.sodium.client.gui.options.control.SliderControl;
 import me.jellysquid.mods.sodium.client.gui.options.control.TickBoxControl;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.text.LiteralText;
 import net.minecraft.text.TranslatableText;
 
 import java.util.ArrayList;
@@ -18,11 +19,15 @@
 public class SodiumExtraGameOptionPages {
     public static final SodiumExtraOptionsStorage sodiumExtraOpts = new SodiumExtraOptionsStorage();
 
+    private static LiteralText parseVanillaString(String key){
+        return new LiteralText((new TranslatableText(key).getString()).replaceAll("§.", ""));
+    }
+
     public static OptionPage animation() {
         List<OptionGroup> groups = new ArrayList<>();
         groups.add(OptionGroup.createBuilder()
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("gui.socialInteractions.tab_all"))
+                        .setName(parseVanillaString("gui.socialInteractions.tab_all"))
                         .setTooltip(new TranslatableText("sodium-extra.option.animations_all.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.animationSettings.animation = value, opts -> opts.animationSettings.animation)
@@ -33,7 +38,7 @@ public static OptionPage animation() {
 
         groups.add(OptionGroup.createBuilder()
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("block.minecraft.water"))
+                        .setName(parseVanillaString("block.minecraft.water"))
                         .setTooltip(new TranslatableText("sodium-extra.option.animate_water.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.animationSettings.water = value, opts -> opts.animationSettings.water)
@@ -41,7 +46,7 @@ public static OptionPage animation() {
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("block.minecraft.lava"))
+                        .setName(parseVanillaString("block.minecraft.lava"))
                         .setTooltip(new TranslatableText("sodium-extra.option.animate_lava.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.animationSettings.lava = value, opts -> opts.animationSettings.lava)
@@ -49,7 +54,7 @@ public static OptionPage animation() {
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("block.minecraft.fire"))
+                        .setName(parseVanillaString("block.minecraft.fire"))
                         .setTooltip(new TranslatableText("sodium-extra.option.animate_fire.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.animationSettings.fire = value, opts -> opts.animationSettings.fire)
@@ -57,7 +62,7 @@ public static OptionPage animation() {
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("block.minecraft.nether_portal"))
+                        .setName(parseVanillaString("block.minecraft.nether_portal"))
                         .setTooltip(new TranslatableText("sodium-extra.option.animate_portal.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.animationSettings.portal = value, opts -> opts.animationSettings.portal)
@@ -73,7 +78,7 @@ public static OptionPage animation() {
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("block.minecraft.sculk_sensor"))
+                        .setName(parseVanillaString("block.minecraft.sculk_sensor"))
                         .setTooltip(new TranslatableText("sodium-extra.option.animate_sculk_sensor.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((options, value) -> options.animationSettings.sculkSensor = value, options -> options.animationSettings.sculkSensor)
@@ -88,7 +93,7 @@ public static OptionPage particle() {
         List<OptionGroup> groups = new ArrayList<>();
         groups.add(OptionGroup.createBuilder()
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("gui.socialInteractions.tab_all"))
+                        .setName(parseVanillaString("gui.socialInteractions.tab_all"))
                         .setTooltip(new TranslatableText("sodium-extra.option.particles_all.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.particleSettings.particles = value, opts -> opts.particleSettings.particles)
@@ -98,21 +103,21 @@ public static OptionPage particle() {
 
         groups.add(OptionGroup.createBuilder()
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("subtitles.entity.generic.splash"))
+                        .setName(parseVanillaString("subtitles.entity.generic.splash"))
                         .setTooltip(new TranslatableText("sodium-extra.option.rain_splash.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.particleSettings.rainSplash = value, opts -> opts.particleSettings.rainSplash)
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("subtitles.entity.generic.explode"))
+                        .setName(parseVanillaString("subtitles.entity.generic.explode"))
                         .setTooltip(new TranslatableText("sodium-extra.option.explosions.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.particleSettings.explosion = value, opts -> opts.particleSettings.explosion)
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("block.minecraft.water"))
+                        .setName(parseVanillaString("block.minecraft.water"))
                         .setTooltip(new TranslatableText("sodium-extra.option.water.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.particleSettings.water = value, opts -> opts.particleSettings.water)
@@ -126,21 +131,21 @@ public static OptionPage particle() {
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("item.minecraft.potion"))
+                        .setName(parseVanillaString("item.minecraft.potion"))
                         .setTooltip(new TranslatableText("sodium-extra.option.potions.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.particleSettings.potion = value, opts -> opts.particleSettings.potion)
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("block.minecraft.nether_portal"))
+                        .setName(parseVanillaString("block.minecraft.nether_portal"))
                         .setTooltip(new TranslatableText("sodium-extra.option.portal.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.particleSettings.portal = value, opts -> opts.particleSettings.portal)
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("itemGroup.redstone"))
+                        .setName(parseVanillaString("itemGroup.redstone"))
                         .setTooltip(new TranslatableText("sodium-extra.option.redstone.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.particleSettings.redstone = value, opts -> opts.particleSettings.redstone)
@@ -154,56 +159,56 @@ public static OptionPage particle() {
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("subtitles.entity.firework_rocket.blast"))
+                        .setName(parseVanillaString("subtitles.entity.firework_rocket.blast"))
                         .setTooltip(new TranslatableText("sodium-extra.option.fireworks.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.particleSettings.firework = value, opts -> opts.particleSettings.firework)
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("block.minecraft.bubble_column"))
+                        .setName(parseVanillaString("block.minecraft.bubble_column"))
                         .setTooltip(new TranslatableText("sodium-extra.option.bubbles.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.particleSettings.bubble = value, opts -> opts.particleSettings.bubble)
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("soundCategory.ambient"))
+                        .setName(parseVanillaString("soundCategory.ambient"))
                         .setTooltip(new TranslatableText("sodium-extra.option.environment.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.particleSettings.environment = value, opts -> opts.particleSettings.environment)
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("entity.minecraft.villager"))
+                        .setName(parseVanillaString("entity.minecraft.villager"))
                         .setTooltip(new TranslatableText("sodium-extra.option.villagers.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.particleSettings.villagers = value, opts -> opts.particleSettings.villagers)
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("block.minecraft.composter"))
+                        .setName(parseVanillaString("block.minecraft.composter"))
                         .setTooltip(new TranslatableText("sodium-extra.option.composter.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.particleSettings.composter = value, opts -> opts.particleSettings.composter)
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("subtitles.block.generic.break"))
+                        .setName(parseVanillaString("subtitles.block.generic.break"))
                         .setTooltip(new TranslatableText("sodium-extra.option.block_break.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.particleSettings.blockBreak = value, opts -> opts.particleSettings.blockBreak)
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("subtitles.block.generic.hit"))
+                        .setName(parseVanillaString("subtitles.block.generic.hit"))
                         .setTooltip(new TranslatableText("sodium-extra.option.block_breaking.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.particleSettings.blockBreaking = value, opts -> opts.particleSettings.blockBreaking)
                         .build()
                 )
                 .build());
-        return new OptionPage(new TranslatableText("options.particles"), ImmutableList.copyOf(groups));
+        return new OptionPage(parseVanillaString("options.particles"), ImmutableList.copyOf(groups));
     }
 
     public static OptionPage detail() {
@@ -232,7 +237,7 @@ public static OptionPage detail() {
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("soundCategory.weather"))
+                        .setName(parseVanillaString("soundCategory.weather"))
                         .setTooltip(new TranslatableText("sodium-extra.option.rain_snow.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.detailSettings.rainSnow = value, opts -> opts.detailSettings.rainSnow)
@@ -278,21 +283,21 @@ public static OptionPage render() {
                 .build());
         groups.add(OptionGroup.createBuilder()
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("entity.minecraft.item_frame"))
+                        .setName(parseVanillaString("entity.minecraft.item_frame"))
                         .setTooltip(new TranslatableText("sodium-extra.option.item_frames.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.renderSettings.itemFrame = value, opts -> opts.renderSettings.itemFrame)
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("entity.minecraft.armor_stand"))
+                        .setName(parseVanillaString("entity.minecraft.armor_stand"))
                         .setTooltip(new TranslatableText("sodium-extra.option.armor_stands.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((options, value) -> options.renderSettings.armorStand = value, options -> options.renderSettings.armorStand)
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("entity.minecraft.painting"))
+                        .setName(parseVanillaString("entity.minecraft.painting"))
                         .setTooltip(new TranslatableText("sodium-extra.option.paintings.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((options, value) -> options.renderSettings.painting = value, options -> options.renderSettings.painting)
@@ -309,7 +314,7 @@ public static OptionPage render() {
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
-                        .setName(new TranslatableText("block.minecraft.piston"))
+                        .setName(parseVanillaString("block.minecraft.piston"))
                         .setTooltip(new TranslatableText("sodium-extra.option.piston.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((options, value) -> options.renderSettings.piston = value, options -> options.renderSettings.piston)

From 9759c2fe25a7e4d1e22dc4ece85707989044bd05 Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Sat, 14 May 2022 15:55:17 +0800
Subject: [PATCH 11/20] new: Add adaptive sync support

---
 .../gui/SodiumExtraGameOptionPages.java       | 10 ++++++++++
 .../client/gui/SodiumExtraGameOptions.java    |  2 ++
 .../mixin/SodiumExtraMixinConfigPlugin.java   |  1 +
 .../mixin/adaptive_sync/MixinWindow.java      | 20 +++++++++++++++++++
 .../assets/sodium-extra/lang/cs_cz.json       |  2 ++
 .../assets/sodium-extra/lang/de_de.json       |  2 ++
 .../assets/sodium-extra/lang/en_us.json       |  2 ++
 .../assets/sodium-extra/lang/es_mx.json       |  2 ++
 .../assets/sodium-extra/lang/et_ee.json       |  2 ++
 .../assets/sodium-extra/lang/fr_fr.json       |  2 ++
 .../assets/sodium-extra/lang/it_it.json       |  2 ++
 .../assets/sodium-extra/lang/ko_kr.json       |  2 ++
 .../assets/sodium-extra/lang/pl_pl.json       |  2 ++
 .../assets/sodium-extra/lang/pt_br.json       |  2 ++
 .../assets/sodium-extra/lang/ru_ru.json       |  2 ++
 .../assets/sodium-extra/lang/th_th.json       |  2 ++
 .../assets/sodium-extra/lang/tr_TR.json       |  2 ++
 .../assets/sodium-extra/lang/zh_cn.json       |  2 ++
 src/main/resources/sodium-extra.mixins.json   |  1 +
 19 files changed, 62 insertions(+)
 create mode 100644 src/main/java/me/flashyreese/mods/sodiumextra/mixin/adaptive_sync/MixinWindow.java

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java
index 14179a27..fcc1f7ab 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java
@@ -12,6 +12,7 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.LiteralText;
 import net.minecraft.text.TranslatableText;
+import org.lwjgl.glfw.GLFW;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -335,6 +336,15 @@ public static OptionPage extra() {
                         .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
                         .build()
                 )
+                .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
+                        .setName(new TranslatableText("sodium-extra.option.use_adaptive_sync.name"))
+                        .setTooltip(new TranslatableText("sodium-extra.option.use_adaptive_sync.tooltip"))
+                        .setControl(TickBoxControl::new)
+                        .setImpact(OptionImpact.VARIES)
+                        .setEnabled(GLFW.glfwExtensionSupported("GLX_EXT_swap_control_tear") || GLFW.glfwExtensionSupported("WGL_EXT_swap_control_tear"))
+                        .setBinding((opts, value) -> opts.extraSettings.useAdaptiveSync = value, opts -> opts.extraSettings.useAdaptiveSync)
+                        .build()
+                )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
                         .setName(new TranslatableText("sodium-extra.option.reduce_resolution_on_mac"))
                         .setTooltip(new TranslatableText("sodium-extra.option.reduce_resolution_on_mac.tooltip"))
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java
index f0ada05f..fff3d223 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java
@@ -194,6 +194,7 @@ public static class ExtraSettings {
         public boolean showFPSExtended;
         public boolean showCoords;
         public boolean reduceResolutionOnMac;
+        public boolean useAdaptiveSync;
         public int cloudHeight;
         public boolean toasts;
         public boolean instantSneak;
@@ -206,6 +207,7 @@ public ExtraSettings() {
             this.showFPSExtended = true;
             this.showCoords = false;
             this.reduceResolutionOnMac = true;
+            this.useAdaptiveSync = true;
             this.cloudHeight = 128;
             this.toasts = true;
             this.instantSneak = false;
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java
index 974fb492..936346c5 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java
@@ -11,6 +11,7 @@ public class SodiumExtraMixinConfigPlugin extends AbstractCaffeineConfigMixinPlu
     @Override
     protected CaffeineConfig createConfig() {
         return CaffeineConfig.builder("Sodium Extra").withSettingsKey("sodium-extra:options")
+                .addMixinOption("adaptive_sync", true)
                 .addMixinOption("animation", true)
                 .addMixinOption("biome_colors", true)
                 .addMixinOption("cloud", true)
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/adaptive_sync/MixinWindow.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/adaptive_sync/MixinWindow.java
new file mode 100644
index 00000000..fe77b2e6
--- /dev/null
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/adaptive_sync/MixinWindow.java
@@ -0,0 +1,20 @@
+package me.flashyreese.mods.sodiumextra.mixin.adaptive_sync;
+
+import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
+import net.minecraft.client.util.Window;
+import org.lwjgl.glfw.GLFW;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(Window.class)
+public class MixinWindow {
+    @Redirect(method = "setVsync", at = @At(value = "INVOKE", target = "Lorg/lwjgl/glfw/GLFW;glfwSwapInterval(I)V"))
+    private void setSwapInterval(int interval) {
+        if (SodiumExtraClientMod.options().extraSettings.useAdaptiveSync) {
+            GLFW.glfwSwapInterval(interval == 1 ? -1 : 0);
+        } else {
+            GLFW.glfwSwapInterval(interval);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/cs_cz.json b/src/main/resources/assets/sodium-extra/lang/cs_cz.json
index d573f566..9800aa75 100644
--- a/src/main/resources/assets/sodium-extra/lang/cs_cz.json
+++ b/src/main/resources/assets/sodium-extra/lang/cs_cz.json
@@ -71,6 +71,8 @@
   "sodium-extra.option.sun_moon.tooltip": "If enabled, the sun and moon will be rendered.",
   "sodium-extra.option.toasts": "Vyskakovací zprávy",
   "sodium-extra.option.toasts.tooltip": "Vyskakovací zprávy s pokroky a recepty",
+  "sodium-extra.option.use_adaptive_sync.name": "Use Adaptive Sync",
+  "sodium-extra.option.use_adaptive_sync.tooltip": "If enabled, V-Sync will be able to swap mid-frame and disable itself at times, usually notably helping responsiveness.",
   "sodium-extra.option.use_fast_random": "Použít rychlý náhodný výběr",
   "sodium-extra.option.use_fast_random.tooltip": "Při povolení bude pro vykreslování bloků použita rychlá náhodná funkce. Toto může ovlivnit rotaci náhodně otočených textur při porovnání s vanillou.",
   "sodium-extra.option.villagers.tooltip": "Přepnout částice vesničanů",
diff --git a/src/main/resources/assets/sodium-extra/lang/de_de.json b/src/main/resources/assets/sodium-extra/lang/de_de.json
index b6bac5f7..9443daac 100644
--- a/src/main/resources/assets/sodium-extra/lang/de_de.json
+++ b/src/main/resources/assets/sodium-extra/lang/de_de.json
@@ -71,6 +71,8 @@
   "sodium-extra.option.sun_moon.tooltip": "If enabled, the sun and moon will be rendered.",
   "sodium-extra.option.toasts": "Toasts",
   "sodium-extra.option.toasts.tooltip": "Popups für Fortschritte und Handwerksrezepte",
+  "sodium-extra.option.use_adaptive_sync.name": "Use Adaptive Sync",
+  "sodium-extra.option.use_adaptive_sync.tooltip": "If enabled, V-Sync will be able to swap mid-frame and disable itself at times, usually notably helping responsiveness.",
   "sodium-extra.option.use_fast_random": "Schnellen Zufallsgenerator verwenden",
   "sodium-extra.option.use_fast_random.tooltip": "Falls aktiviert wird eine schnelle Zufallsgeneratorfunktion für das Block-Rendering genutzt. Dies kann die Rotation von einigen zufällig gedrehten Texturen im Vergleich zum Vanilla-Verhalten verändern.",
   "sodium-extra.option.villagers.tooltip": "Dorfbewohnerpartikel umschalten",
diff --git a/src/main/resources/assets/sodium-extra/lang/en_us.json b/src/main/resources/assets/sodium-extra/lang/en_us.json
index 97529fe3..4ceaef12 100644
--- a/src/main/resources/assets/sodium-extra/lang/en_us.json
+++ b/src/main/resources/assets/sodium-extra/lang/en_us.json
@@ -71,6 +71,8 @@
   "sodium-extra.option.sun_moon.tooltip": "If enabled, the sun and moon will be rendered.",
   "sodium-extra.option.toasts": "Toasts",
   "sodium-extra.option.toasts.tooltip": "If enabled, advancement and crafting recipe popups will be displayed.",
+  "sodium-extra.option.use_adaptive_sync.name": "Use Adaptive Sync",
+  "sodium-extra.option.use_adaptive_sync.tooltip": "If enabled, V-Sync will be able to swap mid-frame and disable itself at times, usually notably helping responsiveness.",
   "sodium-extra.option.use_fast_random": "Use Fast Random",
   "sodium-extra.option.use_fast_random.tooltip": "If enabled, a fast random function will be used for block rendering. This can affect the rotation of randomly rotated textures when compared to vanilla.",
   "sodium-extra.option.villagers.tooltip": "If enabled, villager particles are processed.",
diff --git a/src/main/resources/assets/sodium-extra/lang/es_mx.json b/src/main/resources/assets/sodium-extra/lang/es_mx.json
index ce073fcb..d9070c37 100644
--- a/src/main/resources/assets/sodium-extra/lang/es_mx.json
+++ b/src/main/resources/assets/sodium-extra/lang/es_mx.json
@@ -71,6 +71,8 @@
   "sodium-extra.option.sun_moon.tooltip": "Si está habilitado, se renderizarán el sol y la luna.",
   "sodium-extra.option.toasts": "Notificaciones",
   "sodium-extra.option.toasts.tooltip": "Si está habilitado, se mostrarán ventanas emergentes de recetas de avance y elaboración.",
+  "sodium-extra.option.use_adaptive_sync.name": "Utilice sincronización adaptiva",
+  "sodium-extra.option.use_adaptive_sync.tooltip": "Si está habilitado, V-Sync podrá cambiar la fotograma media y deshabilitarse a sí mismo a veces, lo que generalmente ayuda notablemente a la tiempo de respuesta.",
   "sodium-extra.option.use_fast_random": "Utilice aleatorio rápido",
   "sodium-extra.option.use_fast_random.tooltip": "Si está habilitada, se utilizará una función aleatoria rápida para la representación de bloques. Esto puede afectar la rotación de texturas rotadas aleatoriamente en comparación con vainilla.",
   "sodium-extra.option.villagers.tooltip": "Si está habilitado, se procesan las partículas de los aldeanos.",
diff --git a/src/main/resources/assets/sodium-extra/lang/et_ee.json b/src/main/resources/assets/sodium-extra/lang/et_ee.json
index 2fce21e3..8f67405a 100644
--- a/src/main/resources/assets/sodium-extra/lang/et_ee.json
+++ b/src/main/resources/assets/sodium-extra/lang/et_ee.json
@@ -71,6 +71,8 @@
     "sodium-extra.option.sun_moon.tooltip": "Lubamisel renderdatakse päike ja kuu.",
     "sodium-extra.option.toasts": "Hüpikud",
     "sodium-extra.option.toasts.tooltip": "Lubamisel kuvatakse edasijõudmiste ja meisterdusretseptide hüpikud.",
+    "sodium-extra.option.use_adaptive_sync.name": "Use Adaptive Sync",
+    "sodium-extra.option.use_adaptive_sync.tooltip": "If enabled, V-Sync will be able to swap mid-frame and disable itself at times, usually notably helping responsiveness.",
     "sodium-extra.option.use_fast_random": "Kasuta kiiret juhuslikkust",
     "sodium-extra.option.use_fast_random.tooltip": "Lubamisel kasutatakse plokkide renderdamiseks kiiret juhuslikkuse meetodit. See võib muuta juhuslikult pööratud tekstuuride pöördenurga vanillist erinevaks.",
     "sodium-extra.option.villagers.tooltip": "Lubamisel töödeldakse külaelanike osakesi.",
diff --git a/src/main/resources/assets/sodium-extra/lang/fr_fr.json b/src/main/resources/assets/sodium-extra/lang/fr_fr.json
index e9126043..fd5878af 100644
--- a/src/main/resources/assets/sodium-extra/lang/fr_fr.json
+++ b/src/main/resources/assets/sodium-extra/lang/fr_fr.json
@@ -71,6 +71,8 @@
   "sodium-extra.option.sun_moon.tooltip": "If enabled, the sun and moon will be rendered.",
   "sodium-extra.option.toasts": "Notifications",
   "sodium-extra.option.toasts.tooltip": "Afficher les notifications des succès et des craft",
+  "sodium-extra.option.use_adaptive_sync.name": "Use Adaptive Sync",
+  "sodium-extra.option.use_adaptive_sync.tooltip": "If enabled, V-Sync will be able to swap mid-frame and disable itself at times, usually notably helping responsiveness.",
   "sodium-extra.option.use_fast_random": "Fast Random",
   "sodium-extra.option.use_fast_random.tooltip": "Si activé, une fonction d'aléatoire plus rapide sera utilisée pour le rendu des blocs. Cela peut affecter la rotation de certaines textures.",
   "sodium-extra.option.villagers.tooltip": "Activer les particules des villageois",
diff --git a/src/main/resources/assets/sodium-extra/lang/it_it.json b/src/main/resources/assets/sodium-extra/lang/it_it.json
index e9794e1f..f739d1e3 100644
--- a/src/main/resources/assets/sodium-extra/lang/it_it.json
+++ b/src/main/resources/assets/sodium-extra/lang/it_it.json
@@ -71,6 +71,8 @@
   "sodium-extra.option.sun_moon.tooltip": "If enabled, the sun and moon will be rendered.",
   "sodium-extra.option.toasts": "Popup",
   "sodium-extra.option.toasts.tooltip": "Popup progressi e ricette",
+  "sodium-extra.option.use_adaptive_sync.name": "Use Adaptive Sync",
+  "sodium-extra.option.use_adaptive_sync.tooltip": "If enabled, V-Sync will be able to swap mid-frame and disable itself at times, usually notably helping responsiveness.",
   "sodium-extra.option.use_fast_random": "Usa random veloce",
   "sodium-extra.option.use_fast_random.tooltip": "Se abilitata, verrà utilizzata una funzione random veloce per il rendering dei blocchi. Questo può influenzare la rotazione delle texture ruotate casualmente rispetto alla vanilla.",
   "sodium-extra.option.villagers.tooltip": "Attiva/disattiva le particelle dei villager",
diff --git a/src/main/resources/assets/sodium-extra/lang/ko_kr.json b/src/main/resources/assets/sodium-extra/lang/ko_kr.json
index fcb6ea90..55292540 100644
--- a/src/main/resources/assets/sodium-extra/lang/ko_kr.json
+++ b/src/main/resources/assets/sodium-extra/lang/ko_kr.json
@@ -71,6 +71,8 @@
     "sodium-extra.option.sun_moon.tooltip": "활성화 하면, 태양과 달이 렌더링 됩니다.",
     "sodium-extra.option.toasts": "토스트",
     "sodium-extra.option.toasts.tooltip": "활성화 하면, 토스트(도전과제, 레시피 등 알림) 가 표시됩니다.",
+    "sodium-extra.option.use_adaptive_sync.name": "Use Adaptive Sync",
+    "sodium-extra.option.use_adaptive_sync.tooltip": "If enabled, V-Sync will be able to swap mid-frame and disable itself at times, usually notably helping responsiveness.",
     "sodium-extra.option.use_fast_random": "빠른 랜덤 함수 사용",
     "sodium-extra.option.use_fast_random.tooltip": "활성화 하면, 블록 렌더링을 위해 빠른 랜덤 함수가 사용됩니다. 클라이언트에서 회전되는 텍스쳐의 영향을 줄 수 있습니다.",
     "sodium-extra.option.villagers.tooltip": "활성화 하면, 주민 입자가 렌더링 됩니다.",
diff --git a/src/main/resources/assets/sodium-extra/lang/pl_pl.json b/src/main/resources/assets/sodium-extra/lang/pl_pl.json
index 80fefcc1..65d95032 100644
--- a/src/main/resources/assets/sodium-extra/lang/pl_pl.json
+++ b/src/main/resources/assets/sodium-extra/lang/pl_pl.json
@@ -71,6 +71,8 @@
   "sodium-extra.option.sun_moon.tooltip": "Jeśli ta opcja jest włączona, the sun and moon will be rendered.",
   "sodium-extra.option.toasts": "Wyskakujące powiadomienia",
   "sodium-extra.option.toasts.tooltip": "Jeśli ta opcja jest włączona, wyskakujące powiadomienia o postępach i recepturach będą wyświetlane.",
+  "sodium-extra.option.use_adaptive_sync.name": "Use Adaptive Sync",
+  "sodium-extra.option.use_adaptive_sync.tooltip": "If enabled, V-Sync will be able to swap mid-frame and disable itself at times, usually notably helping responsiveness.",
   "sodium-extra.option.use_fast_random": "Użyj szybkiej losowości",
   "sodium-extra.option.use_fast_random.tooltip": "Jeśli ta opcja jest włączona, do renderowania bloków zostanie użyta szybka funkcja losowa. Może to wpłynąć na rotację losowo obracanych tekstur w porównaniu z domyślnym ustawieniem.",
   "sodium-extra.option.villagers.tooltip": "Jeśli ta opcja jest włączona, cząstki osadników są przetwarzane.",
diff --git a/src/main/resources/assets/sodium-extra/lang/pt_br.json b/src/main/resources/assets/sodium-extra/lang/pt_br.json
index af98cea7..0fdc29b5 100644
--- a/src/main/resources/assets/sodium-extra/lang/pt_br.json
+++ b/src/main/resources/assets/sodium-extra/lang/pt_br.json
@@ -71,6 +71,8 @@
   "sodium-extra.option.sun_moon.tooltip": "If enabled, the sun and moon will be rendered.",
   "sodium-extra.option.toasts": "Notificação de conquistas e descobertas de receita",
   "sodium-extra.option.toasts.tooltip": "Alterna o aparecimento da notificação no canto superior direito ao conseguir uma conquista ou desbloquear alguma receita.",
+  "sodium-extra.option.use_adaptive_sync.name": "Use Adaptive Sync",
+  "sodium-extra.option.use_adaptive_sync.tooltip": "If enabled, V-Sync will be able to swap mid-frame and disable itself at times, usually notably helping responsiveness.",
   "sodium-extra.option.use_fast_random": "Usar aleatoriedade rápida",
   "sodium-extra.option.use_fast_random.tooltip": "Caso habilitada, a função de aleatoriedade rápida será usada para o processamento visual de blocos.\nIsto pode afetar a função de rotação aleatória de algumas texturas de blocos tornando-as um pouco diferentes do padrão.",
   "sodium-extra.option.villagers.tooltip": "Alternar as partículas de aldeões",
diff --git a/src/main/resources/assets/sodium-extra/lang/ru_ru.json b/src/main/resources/assets/sodium-extra/lang/ru_ru.json
index a07e5eae..1958f808 100644
--- a/src/main/resources/assets/sodium-extra/lang/ru_ru.json
+++ b/src/main/resources/assets/sodium-extra/lang/ru_ru.json
@@ -71,6 +71,8 @@
   "sodium-extra.option.sun_moon.tooltip": "Отображение Солнца и Луны",
   "sodium-extra.option.toasts": "Уведомления",
   "sodium-extra.option.toasts.tooltip": "Всплывающие уведомления о достижениях и новых рецептах",
+  "sodium-extra.option.use_adaptive_sync.name": "Use Adaptive Sync",
+  "sodium-extra.option.use_adaptive_sync.tooltip": "If enabled, V-Sync will be able to swap mid-frame and disable itself at times, usually notably helping responsiveness.",
   "sodium-extra.option.use_fast_random": "Использовать быстрый рандом",
   "sodium-extra.option.use_fast_random.tooltip": "Если включено, для рендеринга блоков будет использоваться функция быстрого рандома. Это может повлиять на положение случайно повёрнутых текстур по сравнению с ванилью.",
   "sodium-extra.option.villagers.tooltip": "Переключение частиц крестьян",
diff --git a/src/main/resources/assets/sodium-extra/lang/th_th.json b/src/main/resources/assets/sodium-extra/lang/th_th.json
index 89be72de..341c6031 100644
--- a/src/main/resources/assets/sodium-extra/lang/th_th.json
+++ b/src/main/resources/assets/sodium-extra/lang/th_th.json
@@ -71,6 +71,8 @@
   "sodium-extra.option.sun_moon.tooltip": "ถ้าเปิดตัวเลือกนี้ ดวงอาทิตย์ และดวงจันทร์ จะได้รับการเรนเดอร์",
   "sodium-extra.option.toasts": "Toasts",
   "sodium-extra.option.toasts.tooltip": "ถ้าเปิดตัวเลือกนี้ ป็อบอัพความก้าวหน้า และสูตรคราฟจะถูกแสดง",
+  "sodium-extra.option.use_adaptive_sync.name": "Use Adaptive Sync",
+  "sodium-extra.option.use_adaptive_sync.tooltip": "If enabled, V-Sync will be able to swap mid-frame and disable itself at times, usually notably helping responsiveness.",
   "sodium-extra.option.use_fast_random": "ใช้การสุ่มเร็ว",
   "sodium-extra.option.use_fast_random.tooltip": "ถ้าเปิดตัวเลือกนี้ ฟังก์ชั่นการสุ่มเร็วจะถูกใช้ในการเรนเดอร์บล็อกต่าง ๆ ตัวเลือกนี้จะมีผลต่อการหมุนพื้นผิวแบบสุ่มอีกด้วยเมื่อเทียบกับแบบวานิลลา",
   "sodium-extra.option.villagers.tooltip": "ถ้าเปิดตัวเลือกนี้ อนุภาคจากชาวบ้านจะทำงาน",
diff --git a/src/main/resources/assets/sodium-extra/lang/tr_TR.json b/src/main/resources/assets/sodium-extra/lang/tr_TR.json
index f13f3c76..249e1a01 100644
--- a/src/main/resources/assets/sodium-extra/lang/tr_TR.json
+++ b/src/main/resources/assets/sodium-extra/lang/tr_TR.json
@@ -71,6 +71,8 @@
   "sodium-extra.option.sun_moon.tooltip": "Etkinleştirilirse, güneş ve ay işlenecektir.",
   "sodium-extra.option.toasts": "Bildirim Kutucuğu",
   "sodium-extra.option.toasts.tooltip": "Gelişim ve üretim tarif bildirimleri",
+  "sodium-extra.option.use_adaptive_sync.name": "Use Adaptive Sync",
+  "sodium-extra.option.use_adaptive_sync.tooltip": "If enabled, V-Sync will be able to swap mid-frame and disable itself at times, usually notably helping responsiveness.",
   "sodium-extra.option.use_fast_random": "Hızlı Olasılık Dağılımı Kullan",
   "sodium-extra.option.use_fast_random.tooltip": "Etkin ise, bir hızlı olasılık dağılım fonksiyonu blok görüntülemesi için kullanılacak. Bu ayar, vanillaya göre rastgele döndürülmüş dokuların rotasyonunu etkileyecektir.",
   "sodium-extra.option.villagers.tooltip": "Köylülerin parçacıklarını aç/kapa",
diff --git a/src/main/resources/assets/sodium-extra/lang/zh_cn.json b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
index a4278539..ba9b8418 100644
--- a/src/main/resources/assets/sodium-extra/lang/zh_cn.json
+++ b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
@@ -71,6 +71,8 @@
   "sodium-extra.option.sun_moon.tooltip": "开启或关闭太阳和月亮的渲染",
   "sodium-extra.option.toasts": "弹窗提示",
   "sodium-extra.option.toasts.tooltip": "显示成就和合成配方的弹窗提示",
+  "sodium-extra.option.use_adaptive_sync.name": "Use Adaptive Sync",
+  "sodium-extra.option.use_adaptive_sync.tooltip": "If enabled, V-Sync will be able to swap mid-frame and disable itself at times, usually notably helping responsiveness.",
   "sodium-extra.option.use_fast_random": "快速随机材质",
   "sodium-extra.option.use_fast_random.tooltip": "启用后, 将使用快速随机函数来渲染方块。\n与原版相比, 这会影响随机旋转纹理的旋转方向。",
   "sodium-extra.option.villagers.tooltip": "开启或关闭村民粒子效果",
diff --git a/src/main/resources/sodium-extra.mixins.json b/src/main/resources/sodium-extra.mixins.json
index 67e339d5..1703180d 100644
--- a/src/main/resources/sodium-extra.mixins.json
+++ b/src/main/resources/sodium-extra.mixins.json
@@ -5,6 +5,7 @@
   "package": "me.flashyreese.mods.sodiumextra.mixin",
   "compatibilityLevel": "JAVA_16",
   "client": [
+    "adaptive_sync.MixinWindow",
     "animation.MixinSpriteAtlasTexture",
     "biome_colors.MixinBiomeColors",
     "cloud.MixinWorldRenderer",

From 6aeaf4731b921f55cda751d045061c815b5bae69 Mon Sep 17 00:00:00 2001
From: Felix14-v2 <75726196+Felix14-v2@users.noreply.github.com>
Date: Sun, 15 May 2022 15:42:26 +0300
Subject: [PATCH 12/20] Update ru_ru.json (#184)

* Update ru_ru.json

* Update ru_ru.json

* Update ru_ru.json

* Update ru_ru.json

* Update ru_ru.json

Beacon beams, light updates and Adaptive sync

Co-authored-by: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
---
 src/main/resources/assets/sodium-extra/lang/ru_ru.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/assets/sodium-extra/lang/ru_ru.json b/src/main/resources/assets/sodium-extra/lang/ru_ru.json
index 1958f808..19dd2367 100644
--- a/src/main/resources/assets/sodium-extra/lang/ru_ru.json
+++ b/src/main/resources/assets/sodium-extra/lang/ru_ru.json
@@ -7,8 +7,8 @@
   "sodium-extra.option.animations": "Анимация",
   "sodium-extra.option.animations_all.tooltip": "Переключение всех анимаций",
   "sodium-extra.option.armor_stands.tooltip": "Переключение рендеринга стоек для брони",
-  "sodium-extra.option.beacon_beam": "Beacon Beam",
-  "sodium-extra.option.beacon_beam.tooltip": "If enabled, beacon beams are processed.",
+  "sodium-extra.option.beacon_beam": "Луч маяка",
+  "sodium-extra.option.beacon_beam.tooltip": "Отображение лучей маяков",
   "sodium-extra.option.biome_colors": "Цвета Биомов",
   "sodium-extra.option.biome_colors.tooltip": "Изменение цветов биома в зависимости от биома",
   "sodium-extra.option.block_animations": "Анимации блоков",
@@ -71,8 +71,8 @@
   "sodium-extra.option.sun_moon.tooltip": "Отображение Солнца и Луны",
   "sodium-extra.option.toasts": "Уведомления",
   "sodium-extra.option.toasts.tooltip": "Всплывающие уведомления о достижениях и новых рецептах",
-  "sodium-extra.option.use_adaptive_sync.name": "Use Adaptive Sync",
-  "sodium-extra.option.use_adaptive_sync.tooltip": "If enabled, V-Sync will be able to swap mid-frame and disable itself at times, usually notably helping responsiveness.",
+  "sodium-extra.option.use_adaptive_sync.name": "Адаптивная синхронизация",
+  "sodium-extra.option.use_adaptive_sync.tooltip": "Вертикальная синхронизация сможет переключаться между кадрами и время от времени отключаться, что обычно заметно улучшает быстродействие.",
   "sodium-extra.option.use_fast_random": "Использовать быстрый рандом",
   "sodium-extra.option.use_fast_random.tooltip": "Если включено, для рендеринга блоков будет использоваться функция быстрого рандома. Это может повлиять на положение случайно повёрнутых текстур по сравнению с ванилью.",
   "sodium-extra.option.villagers.tooltip": "Переключение частиц крестьян",
@@ -80,7 +80,7 @@
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
   "sodium-extra.overlay.fps_extended": "(макс. %s / сред. %s / мин. %s)",
-  "sodium-extra.overlay.light_updates": "Light updates disabled",
+  "sodium-extra.overlay.light_updates": "Обновления света отключены",
   "sodium-extra.suggestRSO.header": "Совет: установите Reese's Sodium Options",
   "sodium-extra.suggestRSO.message": "Крайне рекомендуется использовать Reese's Sodium Options совместно с Sodium Extra. Из-за возрастающего количества функций его элементы не умещаются должным образом в обычном окне настроек графики Sodium."
 }

From c8fe607adac776a479737415641673f8e73d300d Mon Sep 17 00:00:00 2001
From: 7777777_4547 <83630775+7777777-4547@users.noreply.github.com>
Date: Sun, 15 May 2022 20:43:10 +0800
Subject: [PATCH 13/20] Update zh_cn (#185)

* Update zh_cn.json

* Update zh_cn.json

* Update zh_cn.json

* Update zh_cn.json

* Update zh_cn.json

* Update zh_cn.json

* Update zh_cn.json

* fix wrong translation[zh_cn]

* merge upstream

* ahhh, merge forgot!

* fix

* Update zh_cn.json

Co-authored-by: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
---
 src/main/resources/assets/sodium-extra/lang/zh_cn.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/assets/sodium-extra/lang/zh_cn.json b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
index ba9b8418..e33256e2 100644
--- a/src/main/resources/assets/sodium-extra/lang/zh_cn.json
+++ b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
@@ -7,8 +7,8 @@
   "sodium-extra.option.animations": "动画",
   "sodium-extra.option.animations_all.tooltip": "开启或关闭全部动画",
   "sodium-extra.option.armor_stands.tooltip": "开启或关闭显示盔甲架",
-  "sodium-extra.option.beacon_beam": "Beacon Beam",
-  "sodium-extra.option.beacon_beam.tooltip": "If enabled, beacon beams are processed.",
+  "sodium-extra.option.beacon_beam": "信标光束",
+  "sodium-extra.option.beacon_beam.tooltip": "开启或关闭信标光束",
   "sodium-extra.option.biome_colors": "群系颜色",
   "sodium-extra.option.biome_colors.tooltip": "生物群系颜色根据生物群系变化",
   "sodium-extra.option.block_animations": "方块动画",
@@ -27,7 +27,7 @@
   "sodium-extra.option.extras": "其他",
   "sodium-extra.option.fireworks.tooltip": "开启或关闭烟花粒子效果",
   "sodium-extra.option.fog": "迷雾",
-  "sodium-extra.option.fog.tooltip": "设置地形开始显示迷雾效果的距离。\n0 - 使用原版的迷雾设置\n1-32 - 以方块为单位设置迷雾距离\n33 - 最大迷雾距离(基本上禁用迷雾)",
+  "sodium-extra.option.fog.tooltip": "设置地形开始显示迷雾效果的距离。\n0 - 使用原版的迷雾设置\n1-32 - 以区块为单位设置迷雾距离\n33 - 最大迷雾距离(基本上禁用迷雾)",
   "sodium-extra.option.instant_sneak": "直接潜行",
   "sodium-extra.option.instant_sneak.tooltip": "潜行时视角直接下移而不是缓慢地",
   "sodium-extra.option.item_frames.tooltip": "开启或关闭显示物品展示框",
@@ -80,7 +80,7 @@
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
   "sodium-extra.overlay.fps_extended": "(max. %s / avg. %s / min. %s)",
-  "sodium-extra.overlay.light_updates": "Light updates disabled",
+  "sodium-extra.overlay.light_updates": "光照更新已禁用",
   "sodium-extra.suggestRSO.header": "建议: 安装Reese's Sodium Options",
   "sodium-extra.suggestRSO.message": "强烈建议您在安装Sodium Extra的同时安装Reese's Sodium Options。由于越来越多的功能，它不再适合Sodium的视频设置。"
-}
\ No newline at end of file
+}

From bfb474ec32f60e3e5537ae812dbe875334bcd258 Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Mon, 16 May 2022 19:14:47 +0800
Subject: [PATCH 14/20] new: Add Maven Publication

---
 .github/workflows/publish.yml                 |  6 ++-
 .../{gradle.yml => pull-request.yml}          |  2 +-
 .github/workflows/push.yml                    | 26 ++++++++++
 build.gradle                                  | 47 +++++++++++++++++--
 4 files changed, 75 insertions(+), 6 deletions(-)
 rename .github/workflows/{gradle.yml => pull-request.yml} (95%)
 create mode 100644 .github/workflows/push.yml

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 47e1f412..b89c0481 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -17,9 +17,11 @@ jobs:
           java-version: 17
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
-      - name: Upload assets to GitHub
-        run: ./gradlew build
+      - name: Upload assets to releases
+        run: ./gradlew build publishAllPublicationsToFlashyReeseReleasesRepository
         env:
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
           BUILD_RELEASE: ${{ github.event.prerelease == false }}
       - name: Publish to Modrinth & CurseForge
         uses: Kir-Antipov/mc-publish@v2.1
diff --git a/.github/workflows/gradle.yml b/.github/workflows/pull-request.yml
similarity index 95%
rename from .github/workflows/gradle.yml
rename to .github/workflows/pull-request.yml
index 8941d1e8..e25d801c 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/pull-request.yml
@@ -1,6 +1,6 @@
 name: Java CI with Gradle
 
-on: [ push, pull_request ]
+on: [ pull_request ]
 
 jobs:
   build:
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
new file mode 100644
index 00000000..22360e8e
--- /dev/null
+++ b/.github/workflows/push.yml
@@ -0,0 +1,26 @@
+name: Java CI with Gradle
+
+on: [ push ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v1
+        with:
+          java-version: 17
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Build with Gradle
+        run: ./gradlew build publishAllPublicationsToFlashyReeseSnapshotsRepository
+        env:
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v1
+        with:
+          name: build-artifacts
+          path: build/libs
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index d9c5f3aa..0cf3bf7d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,6 @@
 plugins {
+    id 'org.ajoberstar.grgit' version '5.0.0'
+    id 'signing'
     id 'fabric-loom' version '0.11-SNAPSHOT'
     id 'maven-publish'
     id 'io.github.juuxel.loom-quiltflower' version '1.6.1'
@@ -7,8 +9,8 @@ plugins {
 sourceCompatibility = JavaVersion.VERSION_16
 targetCompatibility = JavaVersion.VERSION_16
 
-archivesBaseName = "${project.archives_base_name}-mc${project.minecraft_version}"
-version = project.mod_version
+archivesBaseName = project.archives_base_name
+version = "${project.mod_version}-mc${project.minecraft_version}+${getVersionMetadata()}"
 group = project.maven_group
 
 repositories {
@@ -88,6 +90,45 @@ publishing {
     // select the repositories you want to publish to
     repositories {
         // uncomment to publish to the local maven
-        // mavenLocal()
+        maven {
+            name = "FlashyReeseReleases"
+            url = "https://maven.flashyreese.me/releases"
+            credentials {
+                username = System.getenv("MAVEN_USERNAME")
+                password = System.getenv("MAVEN_PASSWORD")
+            }
+        }
+        maven {
+            name = "FlashyReeseSnapshots"
+            url = "https://maven.flashyreese.me/snapshots"
+            credentials {
+                username = System.getenv("MAVEN_USERNAME")
+                password = System.getenv("MAVEN_PASSWORD")
+            }
+        }
+    }
+}
+
+def getVersionMetadata() {
+    def build_id = System.getenv("GITHUB_RUN_NUMBER")
+
+    // CI builds only
+    if (build_id != null) {
+        return "build.${build_id}"
     }
+
+    if (grgit != null) {
+        def head = grgit.head()
+        def id = head.abbreviatedId
+
+        // Flag the build if the build tree is not clean
+        if (!grgit.status().clean) {
+            id += "-dirty"
+        }
+
+        return "rev.${id}"
+    }
+
+    // No tracking information could be found about the build
+    return "unknown"
 }
\ No newline at end of file

From 71b2718306132aee187f021a79b4c977eff9906e Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Mon, 16 May 2022 19:59:29 +0800
Subject: [PATCH 15/20] change: Move Minecraft version to build label

---
 build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0cf3bf7d..427a399e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ sourceCompatibility = JavaVersion.VERSION_16
 targetCompatibility = JavaVersion.VERSION_16
 
 archivesBaseName = project.archives_base_name
-version = "${project.mod_version}-mc${project.minecraft_version}+${getVersionMetadata()}"
+version = "${project.mod_version}+${getVersionMetadata()}"
 group = project.maven_group
 
 repositories {
@@ -114,7 +114,7 @@ def getVersionMetadata() {
 
     // CI builds only
     if (build_id != null) {
-        return "build.${build_id}"
+        return "${project.minecraft_version}-build.${build_id}"
     }
 
     if (grgit != null) {
@@ -126,9 +126,9 @@ def getVersionMetadata() {
             id += "-dirty"
         }
 
-        return "rev.${id}"
+        return "${project.minecraft_version}-rev.${id}"
     }
 
     // No tracking information could be found about the build
-    return "unknown"
+    return "${project.minecraft_version}-unknown"
 }
\ No newline at end of file

From e53ea79246601e664a773f04f0e335e0aacd1be7 Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Mon, 16 May 2022 21:17:26 +0800
Subject: [PATCH 16/20] change: Fix build label again

---
 build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 427a399e..ce974a2e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ sourceCompatibility = JavaVersion.VERSION_16
 targetCompatibility = JavaVersion.VERSION_16
 
 archivesBaseName = project.archives_base_name
-version = "${project.mod_version}+${getVersionMetadata()}"
+version = "${project.mod_version}+mc${project.minecraft_version}-${getVersionMetadata()}"
 group = project.maven_group
 
 repositories {
@@ -114,7 +114,7 @@ def getVersionMetadata() {
 
     // CI builds only
     if (build_id != null) {
-        return "${project.minecraft_version}-build.${build_id}"
+        return "build.${build_id}"
     }
 
     if (grgit != null) {
@@ -126,9 +126,9 @@ def getVersionMetadata() {
             id += "-dirty"
         }
 
-        return "${project.minecraft_version}-rev.${id}"
+        return "rev.${id}"
     }
 
     // No tracking information could be found about the build
-    return "${project.minecraft_version}-unknown"
+    return "unknown"
 }
\ No newline at end of file

From fafe42f307cb363e66d3ff98c679e7d64191edf8 Mon Sep 17 00:00:00 2001
From: Radplay <63958709+Radplay@users.noreply.github.com>
Date: Mon, 16 May 2022 17:48:14 +0200
Subject: [PATCH 17/20] Update pl_pl.json

---
 .../assets/sodium-extra/lang/pl_pl.json       | 82 +++++++++----------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/src/main/resources/assets/sodium-extra/lang/pl_pl.json b/src/main/resources/assets/sodium-extra/lang/pl_pl.json
index 65d95032..4a6d1dda 100644
--- a/src/main/resources/assets/sodium-extra/lang/pl_pl.json
+++ b/src/main/resources/assets/sodium-extra/lang/pl_pl.json
@@ -1,54 +1,54 @@
 {
-  "sodium-extra.option.animate_fire.tooltip": "Jeśli ta opcja jest włączona, przetwarzane są animacje ognia.",
-  "sodium-extra.option.animate_lava.tooltip": "Jeśli ta opcja jest włączona, przetwarzane są animacje lawy.",
-  "sodium-extra.option.animate_portal.tooltip": "Jeśli ta opcja jest włączona, przetwarzane są animacje portali.",
-  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
-  "sodium-extra.option.animate_water.tooltip": "Jeśli ta opcja jest włączona, przetwarzane są animacje wody.",
+  "sodium-extra.option.animate_fire.tooltip": "Jeśli ta opcja jest włączona, animacje ognia będą przetwarzane.",
+  "sodium-extra.option.animate_lava.tooltip": "Jeśli ta opcja jest włączona, animacje lawy będą przetwarzane.",
+  "sodium-extra.option.animate_portal.tooltip": "Jeśli ta opcja jest włączona, animacje portali będą przetwarzane.",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "Jeśli ta opcja jest włączona, animacje Skulkowego czujnika będą przetwarzane.",
+  "sodium-extra.option.animate_water.tooltip": "Jeśli ta opcja jest włączona, animacje wody będą przetwarzane.",
   "sodium-extra.option.animations": "Animacje",
-  "sodium-extra.option.animations_all.tooltip": "Jeśli ta opcja jest włączona, animacje są przetwarzane.",
-  "sodium-extra.option.armor_stands.tooltip": "Jeśli ta opcja jest włączona, stojaki na zbroje są renderowane.",
-  "sodium-extra.option.beacon_beam": "Beacon Beam",
-  "sodium-extra.option.beacon_beam.tooltip": "If enabled, beacon beams are processed.",
-  "sodium-extra.option.biome_colors": "Korory biomów",
+  "sodium-extra.option.animations_all.tooltip": "Jeśli ta opcja jest włączona, animacje będą przetwarzane.",
+  "sodium-extra.option.armor_stands.tooltip": "Jeśli ta opcja jest włączona, stojaki na zbroje będą renderowane.",
+  "sodium-extra.option.beacon_beam": "Promień magicznej latarni",
+  "sodium-extra.option.beacon_beam.tooltip": "Jeśli ta opcja jest włączona, promienie magicznych latarnii będą przetwarzane.",
+  "sodium-extra.option.biome_colors": "Kolory biomów",
   "sodium-extra.option.biome_colors.tooltip": "Jeśli ta opcja jest włączona, kolory biomów zmieniają się w zależności od biomu.",
   "sodium-extra.option.block_animations": "Animacje bloków",
-  "sodium-extra.option.block_animations.tooltip": "Jeśli ta opcja jest włączona, animacje bloków są przetwarzane.",
-  "sodium-extra.option.block_break.tooltip": "Jeśli ta opcja jest włączona, animacje niszczenia bloków są przetwarzane.",
-  "sodium-extra.option.block_breaking.tooltip": "Jeśli ta opcja jest włączona, cząstki niszczenia bloków są przetwarzane.",
-  "sodium-extra.option.bubbles.tooltip": "Jeśli ta opcja jest włączona, cząstki bąbelków są przetwarzane.",
+  "sodium-extra.option.block_animations.tooltip": "Jeśli ta opcja jest włączona, animacje bloków będą przetwarzane.",
+  "sodium-extra.option.block_break.tooltip": "Jeśli ta opcja jest włączona, animacje niszczenia bloków będą przetwarzane.",
+  "sodium-extra.option.block_breaking.tooltip": "Jeśli ta opcja jest włączona, cząstki niszczenia bloków będą przetwarzane.",
+  "sodium-extra.option.bubbles.tooltip": "Jeśli ta opcja jest włączona, cząstki bąbelków będą przetwarzane.",
   "sodium-extra.option.cloud_height": "Wysokość chmur",
   "sodium-extra.option.cloud_height.tooltip": "Steruje wysokością renderowanych chmur.",
-  "sodium-extra.option.composter.tooltip": "Jeśli ta opcja jest włączona, cząstki kompostowników są przetwarzane.",
+  "sodium-extra.option.composter.tooltip": "Jeśli ta opcja jest włączona, cząsteczki kompostowników będą przetwarzane.",
   "sodium-extra.option.details": "Detale",
-  "sodium-extra.option.dripping_particles": "Cząstki kapania",
-  "sodium-extra.option.dripping_particles.tooltip": "Jeśli ta opcja jest włączona, cząstki kapania są przetwarzane.",
-  "sodium-extra.option.environment.tooltip": "Jeśli ta opcja jest włączona, cząstki otoczenia są przetwarzane.",
-  "sodium-extra.option.explosions.tooltip": "Jeśli ta opcja jest włączona, cząstki wybuchów są przetwarzane",
+  "sodium-extra.option.dripping_particles": "Cząsteczki kapania",
+  "sodium-extra.option.dripping_particles.tooltip": "Jeśli ta opcja jest włączona, cząsteczki kapania będą przetwarzane.",
+  "sodium-extra.option.environment.tooltip": "Jeśli ta opcja jest włączona, cząsteczki otoczenia będą przetwarzane.",
+  "sodium-extra.option.explosions.tooltip": "Jeśli ta opcja jest włączona, cząsteczki wybuchów będą przetwarzane",
   "sodium-extra.option.extras": "Dodatki",
-  "sodium-extra.option.fireworks.tooltip": "Jeśli ta opcja jest włączona, cząstki fajerwerków są przetwarzane.",
+  "sodium-extra.option.fireworks.tooltip": "Jeśli ta opcja jest włączona, cząsteczki fajerwerków będą przetwarzane.",
   "sodium-extra.option.fog": "Mgła",
   "sodium-extra.option.fog.tooltip": "Dostosowuje odległość efektu mgły na terenie. \n0 - użyj ustawień domyślnej mgły\n1-32 - ustaw odległość mgły w chunkach\n33 - maksymalna odległość mgły (zasadniczo wyłącza mgłę)",
   "sodium-extra.option.instant_sneak": "Natychmiastowe skradanie się",
   "sodium-extra.option.instant_sneak.tooltip": "Jeśli ta opcja jest włączona, kamera nie będzie się płynnie obniżać przy skradaniu.",
-  "sodium-extra.option.item_frames.tooltip": "Jeśli ta opcja jest włączona, przedmioty są renderowane.",
+  "sodium-extra.option.item_frames.tooltip": "Jeśli ta opcja jest włączona, przedmioty będą renderowane.",
   "sodium-extra.option.light_updates": "Aktualizacje oświetlenia",
-  "sodium-extra.option.light_updates.tooltip": "Jeśli ta opcja jest włączona, aktualizacje oświetlenia są przetwarzane. Jeśli jest wyłączona, może to wpłynąć na oświetlenie podczas generowania nowych chunków. Wyłącz to tylko wtedy, gdy wiesz, co robisz. ",
+  "sodium-extra.option.light_updates.tooltip": "Jeśli ta opcja jest włączona, aktualizacje oświetlenia będą przetwarzane. Jeśli jest wyłączona, może to wpłynąć na oświetlenie podczas generowania nowych chunków. Wyłącz to tylko wtedy, gdy wiesz, co robisz. ",
   "sodium-extra.option.overlay_corner": "Róg nakładki",
   "sodium-extra.option.overlay_corner.bottom_left": "Lewy dolny",
   "sodium-extra.option.overlay_corner.bottom_right": "Prawy dolny",
   "sodium-extra.option.overlay_corner.tooltip": "Określa, w którym rogu ekranu zostanie wyrenderowana nakładka (FPS i współrzędne).",
   "sodium-extra.option.overlay_corner.top_left": "Lewy górny",
   "sodium-extra.option.overlay_corner.top_right": "Prawy górny",
-  "sodium-extra.option.paintings.tooltip": "Jeśli ta opcja jest włączona, obrazy są renderowane.",
-  "sodium-extra.option.particles_all.tooltip": "Jeśli ta opcja jest włączona, cząstki są renderowane.",
-  "sodium-extra.option.piston.tooltip": "Jeśli ta opcja jest włączona, animacje wysuwania się tłoków są przetwarzane.",
-  "sodium-extra.option.portal.tooltip": "Jeśli ta opcja jest włączona, cząstki portali są przetwarzane.",
-  "sodium-extra.option.potions.tooltip": "Jeśli ta opcja jest włączona, cząstki mikstur są przetwarzane.",
+  "sodium-extra.option.paintings.tooltip": "Jeśli ta opcja jest włączona, obrazy będą renderowane.",
+  "sodium-extra.option.particles_all.tooltip": "Jeśli ta opcja jest włączona, cząsteczki będą renderowane.",
+  "sodium-extra.option.piston.tooltip": "Jeśli ta opcja jest włączona, animacje wysuwania się tłoków będą przetwarzane.",
+  "sodium-extra.option.portal.tooltip": "Jeśli ta opcja jest włączona, cząsteczki portali będą przetwarzane.",
+  "sodium-extra.option.potions.tooltip": "Jeśli ta opcja jest włączona, cząsteczki mikstur będą przetwarzane.",
   "sodium-extra.option.prevent_shaders": "Zapobiegaj shaderom ",
   "sodium-extra.option.prevent_shaders.tooltip": "Jeśli ta opcja jest włączona, ładowanie domyślnych shaderów nie będzie możliwe. ",
-  "sodium-extra.option.rain_snow.tooltip": "Jeśli ta opcja jest włączona, deszcz i śnieg są przetwarzane.",
-  "sodium-extra.option.rain_splash.tooltip": "Jeśli ta opcja jest włączona, cząstki rozprysku deszczu są przetwarzane.",
-  "sodium-extra.option.redstone.tooltip": "Jeśli ta opcja jest włączona, cząstki redstone'a są przetwarzane.",
+  "sodium-extra.option.rain_snow.tooltip": "Jeśli ta opcja jest włączona, deszcz i śnieg będą przetwarzane.",
+  "sodium-extra.option.rain_splash.tooltip": "Jeśli ta opcja jest włączona, cząsteczki rozprysku deszczu będą przetwarzane.",
+  "sodium-extra.option.redstone.tooltip": "Jeśli ta opcja jest włączona, cząsteczki redstone'u będą przetwarzane.",
   "sodium-extra.option.reduce_resolution_on_mac": "Zmniejsz rozdzielczość na macOS",
   "sodium-extra.option.reduce_resolution_on_mac.tooltip": "Użyj połowy rozdzielczości na wyświetlaczach Retina, znacznie poprawiając wydajność na systemie macOS.\nZmiana tej opcji będzie wymagać ponownego uruchomienia gry.",
   "sodium-extra.option.render": "Renderowanie",
@@ -64,23 +64,23 @@
   "sodium-extra.option.sky_colors": "Kolory nieba",
   "sodium-extra.option.sky_colors.tooltip": "Jeśli ta opcja jest włączona, kolory nieba zmieniają się w zależności od biomu.",
   "sodium-extra.option.smoke": "Dym",
-  "sodium-extra.option.smoke.tooltip": "Jeśli ta opcja jest włączona, smoke particles są przetwarzane.",
+  "sodium-extra.option.smoke.tooltip": "Jeśli ta opcja jest włączona, cząsteczki dymu będą przetwarzane.",
   "sodium-extra.option.stars": "Gwiazdy",
-  "sodium-extra.option.stars.tooltip": "Jeśli ta opcja jest włączona, the stars will be rendered.",
+  "sodium-extra.option.stars.tooltip": "Jeśli ta opcja jest włączona, gwiazdy będą przetwarzane.",
   "sodium-extra.option.sun_moon": "Słońce i księżyc",
-  "sodium-extra.option.sun_moon.tooltip": "Jeśli ta opcja jest włączona, the sun and moon will be rendered.",
+  "sodium-extra.option.sun_moon.tooltip": "Jeśli ta opcja jest włączona, słońce i księżyc będą renderowane.",
   "sodium-extra.option.toasts": "Wyskakujące powiadomienia",
   "sodium-extra.option.toasts.tooltip": "Jeśli ta opcja jest włączona, wyskakujące powiadomienia o postępach i recepturach będą wyświetlane.",
-  "sodium-extra.option.use_adaptive_sync.name": "Use Adaptive Sync",
-  "sodium-extra.option.use_adaptive_sync.tooltip": "If enabled, V-Sync will be able to swap mid-frame and disable itself at times, usually notably helping responsiveness.",
+  "sodium-extra.option.use_adaptive_sync.name": "Użyj Adaptive Sync",
+  "sodium-extra.option.use_adaptive_sync.tooltip": "Jeśli ta opcja jest włączona, V-Sync będzie mógł zamienić się wsród-klatkowo i czasami wyłączyć się, przeważnie ulepszając responsywność.",
   "sodium-extra.option.use_fast_random": "Użyj szybkiej losowości",
   "sodium-extra.option.use_fast_random.tooltip": "Jeśli ta opcja jest włączona, do renderowania bloków zostanie użyta szybka funkcja losowa. Może to wpłynąć na rotację losowo obracanych tekstur w porównaniu z domyślnym ustawieniem.",
-  "sodium-extra.option.villagers.tooltip": "Jeśli ta opcja jest włączona, cząstki osadników są przetwarzane.",
-  "sodium-extra.option.water.tooltip": "Jeśli ta opcja jest włączona, cząstki wody są przetwarzane.",
+  "sodium-extra.option.villagers.tooltip": "Jeśli ta opcja jest włączona, cząsteczki osadników będą przetwarzane.",
+  "sodium-extra.option.water.tooltip": "Jeśli ta opcja jest włączona, cząsteczki wody będą przetwarzane.",
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
   "sodium-extra.overlay.fps_extended": "(maks. %s / śr. %s / min. %s)",
-  "sodium-extra.overlay.light_updates": "Light updates disabled",
-  "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
-  "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
-}
\ No newline at end of file
+  "sodium-extra.overlay.light_updates": "Aktualizacje oświetlenia wyłączone",
+  "sodium-extra.suggestRSO.header": "Sugestia: Zainstaluj Reese's Sodium Options",
+  "sodium-extra.suggestRSO.message": "Wysoce rekomendowane jest zainstalowanie moda Reese's Sodium Options wraz z Sodium Extra. Przez ciągle zwiększającą się liczbę funkcji, opcje nie mieszczą się na ekranie ustawień Sodium."
+}

From 6da8850f3d7aeb302eb8cc21c9b69c4337e7a038 Mon Sep 17 00:00:00 2001
From: 7777777_4547 <83630775+7777777-4547@users.noreply.github.com>
Date: Sun, 15 May 2022 23:46:46 +0800
Subject: [PATCH 18/20] Update zh_cn.json

---
 src/main/resources/assets/sodium-extra/lang/zh_cn.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/assets/sodium-extra/lang/zh_cn.json b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
index e33256e2..86875481 100644
--- a/src/main/resources/assets/sodium-extra/lang/zh_cn.json
+++ b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
@@ -71,9 +71,9 @@
   "sodium-extra.option.sun_moon.tooltip": "开启或关闭太阳和月亮的渲染",
   "sodium-extra.option.toasts": "弹窗提示",
   "sodium-extra.option.toasts.tooltip": "显示成就和合成配方的弹窗提示",
-  "sodium-extra.option.use_adaptive_sync.name": "Use Adaptive Sync",
-  "sodium-extra.option.use_adaptive_sync.tooltip": "If enabled, V-Sync will be able to swap mid-frame and disable itself at times, usually notably helping responsiveness.",
-  "sodium-extra.option.use_fast_random": "快速随机材质",
+  "sodium-extra.option.use_adaptive_sync.name": "使用自适应同步",
+  "sodium-extra.option.use_adaptive_sync.tooltip": "启用后，垂直同步将能够交换中间帧，并不时禁用自己，通常有助于响应",
+  "sodium-extra.option.use_fast_random": "快速随机纹理",
   "sodium-extra.option.use_fast_random.tooltip": "启用后, 将使用快速随机函数来渲染方块。\n与原版相比, 这会影响随机旋转纹理的旋转方向。",
   "sodium-extra.option.villagers.tooltip": "开启或关闭村民粒子效果",
   "sodium-extra.option.water.tooltip": "开启或关闭水面粒子效果",

From 1df177a3bf8337ecac71fb6e12072252c76d9e5e Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Tue, 17 May 2022 01:36:45 +0800
Subject: [PATCH 19/20] change: Update Gradle Wrapper

---
 build.gradle                             |  10 ++++++++--
 gradle.properties                        |   2 +-
 gradle/wrapper/gradle-wrapper.jar        | Bin 59536 -> 59821 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |  10 +++++-----
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index ce974a2e..a1b9994e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'org.ajoberstar.grgit' version '5.0.0'
     id 'signing'
-    id 'fabric-loom' version '0.11-SNAPSHOT'
+    id 'fabric-loom' version '0.12-SNAPSHOT'
     id 'maven-publish'
     id 'io.github.juuxel.loom-quiltflower' version '1.6.1'
 }
@@ -22,6 +22,12 @@ repositories {
             includeGroup "maven.modrinth"
         }
     }
+    maven {
+        url "https://maven.flashyreese.me/releases"
+    }
+    maven {
+        url "https://maven.flashyreese.me/snapshots"
+    }
 }
 
 dependencies {
@@ -31,7 +37,7 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
     modImplementation "maven.modrinth:sodium:${project.sodium_version}"
-    modImplementation "maven.modrinth:reeses-sodium-options:${project.reeses_sodium_options}"
+    modImplementation "me.flashyreese.mods:reeses-sodium-options:${project.reeses_sodium_options}"
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
     implementation "org.joml:joml:1.10.2"
 
diff --git a/gradle.properties b/gradle.properties
index 0029a404..85f64a06 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,6 +12,6 @@ org.gradle.jvmargs=-Xmx1G
     archives_base_name=sodium-extra
 
 # Dependencies
-    reeses_sodium_options=mc1.17.1-1.4.2
+    reeses_sodium_options=1.4.2+mc1.17.1-build.10
     sodium_version=mc1.17.1-0.3.4
     fabric_version=0.46.1+1.17
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..41d9927a4d4fb3f96a785543079b8df6723c946b 100644
GIT binary patch
delta 8958
zcmY+KWl$VIlZIh&f(Hri?gR<$?iyT!TL`X;1^2~W7YVSq1qtqM!JWlDxLm%}UESUM
zndj}Uny%^UnjhVhFb!8V3s(a#fIy>`VW15{5nuy;_V&a5O#0S&!a4dSkUMz_VHu3S
zGA@p9Q$T|Sj}tYGWdjH;Mpp8m&yu&YURcrt{K;R|kM~(*{v%QwrBJIUF+K1kX5ZmF
zty3i{d`y0;DgE+d<pEk7Pr|u=*zNE>e>vN@yYqFPe1Ud{!&G*Q?iUc^V=|H%4~2|N
zW+DM)W!`b&V2mQ0Y4u<ea&fhP8Zl}9enFLMGA78rwN)ZSva{tuDBrFm!)H9vOM3m4
z-niSubJ&a4xSs}+dP%fO+GC$_<4)P0YuO<_KzvEJ?(Ir@)@_h}QPu8eKx^*hOS|ob
zglR#!I=XV6e96{sFaTqa*yroz1qr?Te(?&#62a<0lDtodq4P_}6zQ3XQ@k&Wac@zj
z!xW|4+QCtgyAKtcH=EZr)8(8$Sk&Y@4x_8dchwcHlyPSsIYtMhD7{~tRr%@kj%5Vm
z;7_r0klH%P3r<%Wk32g(qX3Vlvsh(>_)uB=P@-2`v|Wm{>CxE<!zXQ=*HWl2>R1P^
z>c}ZPZ)xxdOCDu59{X^~2id7+6l6x)U}C4Em?H~F`uOxS1?}xMxTV|5@}PlN%Cg$(
z<u@mW976lW8Jb6)e1=uV8`_*8fnDQKnsWpmN8p7Nc?_FdC-=Z>wY6c}r60=z5ZA1L
zTMe;84rLtYvcm?M(H~ZqU;6F7Evo{P7!<V=+h%r|+GH1ai~D70{AN;wJ6scs_bdsL
zk~o&+!QijE(H{-r{aJH0mTO&C64O&h_H<P$ZX>LGcdwO|qf1w+)MsnvK5^c@Uzj<{
zUoej1>95tuSvDJ|5K6k%&UF*uE6kBn47QJw^yE&#G;u^Z9oYWrK(+oL97hBsUMc_^
z;-lmxebwlB`Er_kXp2$`&o+rPJAN<`WX3ws2K{q@qUp}XTfV{t%KrsZ5vM!Q#4{V&
zq>iO$MCiLq#%wXj%`W$_%FRg_WR*quv65TdHhdpV&jlq<=K^K`&!Kl5mA6p4n~p3u
zWE{20^hYpn1M}}VmSHBXl1*-)2MP=0_k)EPr#>EoZukiXFDz?Di1I>2@Z^P$pvaF+
zN+qUy63jek2m59;YG)`r^F3-O)0RDIXPhf)XOOdkmu`3SMMSW(g+`Ajt{=h1dt~ks
ztrhhP|L4G%5x79N#kwAHh5N){@{fzE7n&%dnisCm65Za<8r_hKvfx4Bg*`%-*-Mvn
zFvn~)VP@}1sAyD+B{{8l{EjD10Av&Mz9^Xff*t`lU=q=S#(|>ls520;n3<}X#pyh&
z*{CJf7$*&~!9jMnw_D~ikUKJ2+UnXmN6qak{xx%W;BKuXt7@ky!LPI1qk?gDwG@@o
zkY+BkIie>{{q==5)kXw(*t#I?__Kwi>`=+s?Gq6X+vtSsaAO&Tf+Bl$vKnzc&%BHM
z=loWOQq~n}>l=EL(5&6((ESsQC3^@4jlO5Od{qN#sWV)vqXw}aA>*uvwZopNN(|-T
zRTF%5Y_k1R$;(d-)n;hWex{;7b6KgdAVE@&0pd(*qDzBO#YZV%kh%pYt1`hnQ(Fa&
zYiDrOTDqk5M7hzp9kI2h!PxNnuJ<B`^Mhe3ly%$^w$3*WOd4DLEzfG@J3$}Y)fnX)
zH;<m_AN0yr_leAC%G$CR3<-^>&xl*zF8sx6!67bA49R1bmUF5bpK&&{eI0U~cH}PM
z3aW1$lRb|ItkG<M4<w%Yk)iJvsJ=qk(wBabc9wCBgqqQUl?_J0j@dtLNgo0oTIBMw
zFmxG2{&>5~_eBNu$|I|vYIdAA9a!pVq<+UTx*M}f<Cydl3cV>G`23zxXp&E=FfnY-
zEzKj;Cu_s4v>leO7M2-mE(UzKHL4c$c`3dS*19OpLV^4NI*hWWnJQ9lvzP4c;c?do
zqrcsKT*i~eIHl0D3r4N{)+RsB6XhrC^;sp2cf_Eq#6*CV;t8v=V!ISe>>9kPgh}NI
z=1UZutslxcT$Ad;_P^;Oouoa(cs!Ctpvi>%aQ+Zp=1d|h{W9Wmf7JWxa(~<#<N|-x
z+wB5>tSZ?C%wu4_5F!fc!<@PIBeJ)Nr^$bB6!_Gic_7}c3J{<c?hHY$$whr&k?{Y6
znNJn%ZB2QXBU93>QI~Gg5g5jTp9}V6KYgrgaX>pJt}7$!wOht&KO|+z{Iw@YL|@~D
zMww}+lG}rm2^peNx>58ME||ZQxFQeVSX8iogHLq_vXb`>RnoEKaTWBF-$JD#Q4BMv
zt2(2Qb*x-?ur1Y(NsW8AdtX0#rDB?O(Vs4_xA(u-o!-tBG03OI!pQD+2UytbL5>lG
z*(F)KacHqMa4?dxa(Vcrw>IIAeB$3cx#;;5r2X;HE8|}eYdAgCw#tpXNy7C3w1q`9
zGxZ6;@1G%8shz9e+!K2MO*{_RjO}Jo6eL3{TSZ>nY7)Qs`Dhi5><@oh0r)gT7H-?3
zLDsd^@m<xQVzcNd`(P7s86P>%JvrS8sta5`QiZNs^*GT}Hiy^zjK2^Ni%`Z|ma)D2
zuyumbvw$M8$haCTI~6M%d4+P)uX%u{Sfg4Al+F7c6;O-*)DKI7E8izSOKB#FcV{M+
zEvY0FBkq!$J0EW$Cxl}3{JwV^ki-T?q6C30Y5e&p@8Rd?$ST-Ghn*-`tB{k54W<>F
z5I)TFpUC!E9298=sk>m#FI4sUDy_!8?51F<M%uN*Ajyq*bGIeIeUdXoo%Xd3XTV_s
zo>qqW!9LN1(zuDnB3$!<jN%eFzQRV+_R;j^$*k0bf`MjlUD&itHhuf_;vw1w4BRM?
z6D;>pEUjL>N>RNgAG~-9Xm|1lqHseW(%v&6K(DZ3Pano(1-Qe?3%J&>0`~w^Q-p&@
zg@HjvhJk?*hpF7$9P|gkzz`zBz_5Z!C4_-%fCcAgiSilzFQef!@amHDrW!YZS@?7C
zs2Y9~>yqO<a2K5*Q;s{+>+rkih?kXztzvnB^6W=f52*iyuZPv$<OX>c42$WK7>PHb
z6%MYIr5D32KPdwL1hJf{_#jn?`k(taW?mwmZVvrr=y~fNcV$`}v(8};o9AjOJumS4
z`889O91^pkF+|@$d9wVoZ3<bnIfu#o3!UfMc5V%(mOg>;^j;^sUs&Ubo_qD&MTL%O
z&*SE0ujG~<CGD(ok$`?}t)%pTf{IbQ(>zm;?<jNixA~e@gZ*6U>x)8TLC&ft))nyI
zcg44@*Q{cYT+qGrA=In_X{NNCD+B0w#;@g)jvBU;_8od6U>;7HIo@F*=g8CQUo(u^
z3r4FJ7#<@)MXO&5+DgKE&^>^`r!loe7CWE*1k0*0wLFzSOV8jvlX~<chY>WOQ?$1v
zk$Or}!;ix0g78^6W;+<=J>z@CBs!<<)HvF(Ls-&`mat<kA@dLCUcQ=31Rg+;+4kFq
zMtMu68RC?D0`}krH?jJL21$$HZ{Lsv3X)mHiwI4hrTnt?y2RfqwFnpo_DGwe6uJ3A
zv|B1aggMlaQ%*i&<>pesJ5kkjC)6nGB@b{ii6-Uoho$BT%iJgugTOeZ$5Xo4D7Pd<
zC*LJh5V@2#5%aBZCgzlQi3@<_!VfiL0<l-dOmBG0&Iil%Hq+E?Sf^KQ(|bI4!OpXy
zVRBc5#N^$i6+{=62?W$DwMDtPX+J-4uBMRSZ1m0%a%LR*o4)iDuAWoJVbBFktzX97
z3sONNH5G)`)=!)`1yxB-Ty^?M2IkLZ>7ywc)ZbwKPfcR|ElQoS(8x|a7#IR}7#Io=
zwg4$8S{egr-NffD)Fg&X9bJSoM25pF&%hf>(T&9bI}=#dPQyNYz;ZZ7EZ<P2*spI-
zU~l_wK|f7_K)-tdJ_gn9c)@?Z$)mZdsj<<w(WdjQ)!B+m9x>=u1n701<vS^S$MWWS
z*2<^a_4=z<N^2*xa+XX)H4|Y5SH4~?Q`*}ms)P}km{%f@@-<^%&uN>SWKkZ9n(-qU
ztN`sdWL1uxQ1mKS@x11;O|@^AD9!NeoPx}?EKIr!2>1Qq4gjfGU)tr6?Z5l7JAS3j
zZeq{vG{rb%DFE4%$szK}d2UzB{4>L?Tv+NAlE*&Nq6g+XauaSI+N2Y8PJLw+aNg1p
zbxr|hI8wcMP&&+(Cu|%+Jq|r>+BHk@{AvfBXKiVldN)@}TBS0LdIpnANCVE26WL-}
zV}HJ^?m&$Rkq;Zf*i-hoasnpJVyTH__dbGWrB_R55d*>pTyl6(?$EO@>RCmTX1Hzr
zT2)rOng?D4FfZ_C49hjMV*UonG2DlG$^+k=Y%|?Dqae4}JOU=8=fgY4Uh!pa9eEqf
zFX&WLPu!jArN*^(>|H>dj~g`ONZhaaD%h_HHrHkk%d~TR_RrX{&eM#P@3x=S^%_6h
zh=A)A{id16$zEFq@-D7La;kTuE!oopx^9{uA3y<}<CA$fk1IT{4FjGWgv!&Qj=->9
z^bQ@U<&pJV6kq7LRF47&!UAvgkBx=)KS_<sRR+!6RZC5cwwj}~S;x)Q)+5fHbM32@
zs9Dpw6*_`sQMYrP%1#j|U1c3>X!NY28^gQr27P=gKh0+E>$aCx&^vj2uc}ycsfSEP
zedhTgUwPx%?;+dESs!g1z}5q9EC+fol}tAH9#fhZQ?q1GjyIaR@}lGCSpM-014T~l
zEwriqt~ftwz=@2tn$xP&-rJt?nn5sy8sJ5Roy;pavj@O+tm}d_qmAlvhG(&k>(arz
z;e|SiTr+0<&6(-An0*4{7akwUk~Yf4<JX9Tq5J!*OP4&wi-J3;wg&c+D8MXROBM9x
zY%+{fj6XCxVA3e*V+E4ZaC2?*_b$@bw?dl3w)Md>M!!YKj^swp9WOa%al`%R>V7mi
z+5+UodFAaPdi4(8_FO&O!Ymb#@yxk<HZ;C?aw~lw1!ng28dO31y6a^%A?mrZiLhlq
z*)r9D-qc@_^Yo)QL>uVMrog(7gkj$G@FLA#ENMxG)4f<}S%Fn?Up$+C%{02AgMKa^
z4SFGWp6U>{Q6VRJV}yjxXT*e`1XaX}(dW1F&RNhpTzvC<hla}alUMpFiPxiUEJDg)
z5T@OEnNE}Jw;&G3crL{}5pCqBws~Gb_7$63#%$YX!r1fagPH-PbSt2dQ@`XI+!FpO
zPBg3@LF}wg;SB#}QqN)V$tpZHYJGRjf`Z$Cq<>tzuu;LMhMfJ2LBEy?{^GHG!OF!!
zDvs64TG)?MX&9NCE#H3(M0K>O>`ca0WT2YR>PTe&tn?~0FV!MRtdb@v?MAUG&Ef7v
zW%7>H<yyBb4^02^=S~lp(==aV^=yU&QsYS{R$Z#_MPQ}KX>(;Mm)RJkt18GXv!&np
z?RUxOrCfs;m{fBz5MVlq59idhov21di5>WXWD-594L-X5;|@kyWi@N+(jLuh=o+5l
zGGTi~)nflP_G}Yg5Pi%pl88U4+^*ihDoMP&zA*^xJE_X*Ah!jODrijCqQ^{=&hD7&
z^)qv3;cu?olaT3pc{)Kcy9jA2E8I)#Kn8qO>70SQ5P8YSCN<o_4{q)RX(xgDwNlZH
zzebPidQyv5yfB^u)f8#wF9D2~qZ>=_+_&)qg)OYBg|-k^d3*@jRAeB?;yd-O1A0wJ
z?K*RDm|wE<(PBz~+C%2CTtzCTUohxP2*1kE8Of~{KRAvMrO_}NN&@P7SUO{;zx0iK
z@or9<q8_W=jB;CG$!3sa>R8ydYOFZ<QmE(^V7$Xl0ZTLH#4LQ49$*&tdo06GSY2B5
zWAbnOoFOm;0r9<^opq%%1#>f(cHASCAatL%;62IL27~SmASr(7F&NMr+#gNw@z1VM
z_ALFwo3)SoANEwRerBdRV`>y`t72#aF2ConmWQp(Xy|msN9$yxhZ1jAQ67lq{vbC5
zujj|MlGo`6Bfn0TfKgi(k=gq0`K~W+X(@GzYlPI4g0M;owH3yG14rhK>lG8lS{`!K
z+Nc@glT-DGz?Ym?v#Hq|_mEdPAlHH5jZuh*6glq!+>Lk$S%ED2@+ea6CE@&1-9a?s
znglt|fmIK}fg<9@XgHe4*q!aO<-;Xj$T?IzB-{&2`<ytxLqDCA^PWKz2Ct4sO5e`N
z#3V>#eA6rdtCi80mpP&vw(Uytxu$#YzNI_<LOg^VxHp(U<w~GJ1f1W5T<#!>cB>LS
z<BGD5FQUI9ZdhON9ZG|Z2$;M>mim>ys;ir;*Dzbr22ZDxO2s;671&J0U<9(n1yj)J
zHFNz=ufPcQVEG+ePjB<5C;=H0{>Mi*xD>hQq8`Vi7TjJ$V04$`h3EZGL|}a07oQdR
z?{cR(z+d>arn^AUug&voOzzi$ZqaS)blz-z3zr;10x;oP2)|Cyb^WtN2*wNn`YX!Y
z+$Pji<7|!XyMCEw4so}xXLU)p)BA~2fl>y2Tt}o9*BPm?AXA8UE8a;>rOgyCwZBFa
zyl42y`bc3}+hiZL_|L_LY29vVerM+BVE@YxK>TGm@dHi@Uw*7AIq?QA9?THL603J%
zIBJ4y3n8OFzsOI;NH%DZ!MDwMl<#$)d9eVVeqVl(5ZX$PPbt*p_(_9VSXhaUPa9Qu
z7)q4vqYKX7ieVSjOmVEbLj4VYtnDpe*0Y&+>0dS^bJ<8s*eHq3tjRAw^+Mu4W^-E=
z4;&namG4G;3pVDyPkUw#0kWEO1;HI6M51(1<0|*pa(I!sj}F^)avrE`ShVMKBz}nE
zzKgOPMSEp6M>h<xzBqqC2r<F^H92Aw&4uudWPKvL8@MToS|loeJ@cW2tFfXRh#&3M
zmy2Twln2FD@uLUm4efWiER|oHpuZBo0oOKxa%U{r=@uGv42}`By+%ym)Y7RDXH&du
zoEx|?JqEWM#fL@T=I%`p-wa5K`f*Y;?romQLrl!#2OvbxCL(4R_Rj)fPeHt@ZfZ6z
z!;^0XxFdQkgf|tVjx9o8i${;IN?3&o^gkMA7K`xtqNSPm346BF^Tw77TU$f7fhUZg
zx>JzyTHHcjV%W*;Tdb}1xJjCP#=iQuBk_Eho6yCRVp<B-D5qnXH^$;Z)Q%;=b)~TV
zma>&e!}4IBJ&?ksVc&u#g3+G$oNlJ?mWfADjeBS-Ph3`DKk-~Z70XugH8sq2eba@4
zIC1H_J$`9b$K`J)sGX3d!&>OmC@@rx1TL~NinQOYy72Q_+^&Mg>Ku(fTgaXdr$p_V
z#gav1o{k~c>#)u3r@~6v^o)Lf=C{rAlL@!s457pq)pO;Cojx7U{urO4cvXP|E>+dV
zmr2?!-5)tk-&*ap^D^2x7NG6nOop2zNFQ9v8-EZ{WCz-h36C)<<!{n3lmWRTJS2LL
zKqeb1k2ia;BW>^|f{V#R_WE^@(T0+d-at5hXX{U?zak*ac-XnyINo+yBD~~3O1I=a
z99|CI>502&s-Qi5bv>^2#cQ%ut<4d7KgQ^kE|=%6#VlGiY8$rdJUH{sra;P~cyb_i
zeX(kS%w0C?mjhJl9TZp8RS;N~y3(EXEz13oPhOSE4WaTljGkVXWd~|#)<uV3j}5Te
zkV*EdY9egzhtn*nao`21CzD^I)5+{Z18Rw4lVU`8%2$p*UCl1`TX(>vsG6_76I)Kb
z8ro?;{j^lxNsaxE-cfP;g(e;mhh3)&ba}li?woV2#7ByioiD>s%L_D;?#;C#z;a(N
z-_WY<=SH42m9bFQ>Nb<j)a&Ob18H&7^vzH?H5JL2Of;-n4as~D=@sj@(xGD?Q&6)o
zNw<auASS+8#i*1R!&uI-tFKh%KIr6NC(#SxD@3iP2k4DgV7OG2_i^y2M9g#zlD(U-
z$!Uj{C~~=*h*XIwivlGPRURp*;)QB+YqgJIj&37B54@$-sI~y;X3Dihu4r?k)$3U*
zk9uj6ma79_U1P?O&-Dm+nDF-X=2Qho8(&-!Lg<We!MbaT@J&@W=LLZ<CT{ON!^Ca>
z@4K$@4l8pD7AKxCR>t0%`Qoy9=hA?<<^Vcj8;-E+oBe3ReW1`el8np8E$k{LgFQ}2
z2t8a`wOXFdJ9!5$&mEfD1CnJ)TB+R<n2vZS8t~mtTC`K4pZCx&&(3zcvRA9eh$H8M
z_(FD=Q{%@E%kevl^P8LEUHNViR|?_s&XalEIk_ZMI{}%7`W~XTC3|-uNW*qO<~QBb
z3zP=yM9fq3N?>Jih88-Zos9@<!L<$JX|GawFX(o*O6o}Qi}@c~jn=uep}m0v`a|BB
z2yR(9di0m0I`Pal?D2-w8ORi_pAzH`yiiE8$#II4Ocmx12(HsCbIF+K0-=4+5>HZ#
zL#{qfbF0ARTXkR@G{lwlOH~nnL)1jcyu!qv2`57S&%oKz0}r{~l9U_UHaJ5!8#nrs
z<AG(3w&=4UE7yD|>?2FrL`mxnzu&{bweD&62)ilz*?pYIvt`T!XFVVA78})p1YEy7
z8fK#s?b~Yo$n7&_a?E<s;#As-2YXI2Zgj?Y;b*tIcNMs31ValY{ovhcp0H0&QM5o$
z4!co%1r!(fx$se``<7Cmbm7?ejQIjV2y;U|x^!0Vm*%Fy)fu&$Qx*Oc;-S!FsjbE@
zLB~r9R-1QTmStt90_5Z$9#S2eFR((hQF{$xVA=D1=6|LvHNnwH@y;m(oAc$*ViI6Z
zEx94E7BZJ-uSdFn?oC)Uou8kJ2oUZF*FO-jg9CC19{3y;-I@2Jr?+Cmtid${#WLE7
z>BdXH-_W)Z44?!;DFx6pZ?~RArtBI*Qm4~6nX6Z_T*i$bQPE;Qz?DAPstpGSqr-AJ
zo%m9cA`oDDm?&dTaoh_>@F>a?!y4qt_;NGN9Z<%SS;fX-cSu|>+Pba22`CRb#|HZa
z;{)yHE>M-pc1C0mrnT~80!u&dvVTYFV8xTQ#g;6{c<9d!FDqU%TK5T6h*w*p980D~
zUyCb`y3{-?(mJFP)0*-Nt;mI$-gc4VQumh|rs&j_^R{sgTPF`1Xja2YWstsKFuQ(d
zmZMxV$p$|qQUXchu&8%J(9|)B?`~rIx&)LqDS>ob5%gTeTP#Sbny#y*rnJ&?(l=!(
zoV~}LJ1DPLnF8oyM(2ScrQ0{Q4m4-BWnS4wilgCW-~~;}pw=&<+HggRD_3c@3RQIr
z9+-%!%}u_{`YS=&>h%kPO3ce}>y!d-zqiniNR-b5r97u;+K6HA2tS>Z#cV{+eFI`*
zd8RMGAUtX1KWfPV;q<-5JAykS+2sY$2~UX+4461a(%{P#{rwFPu0xpIuYlbgD{C7C
z=U{FUarVTYX6ZUq3wE@G^QT4H2Re;n$Fz9cJ>hABl)9T8pozqbA1)H-%1=WKm^QMu
zjnUZ&Pu>q+X&6Co*y#@pxc-4waKMInEPGmE_>3@Ym3S*dedSradmc5mlJn`i0vMW6
zhBnGQD^Z;&S0lnS0curqDO@({J7kTtRE+Ra?nl^HP9<)W&C>~`!258f$XDbyQOQXG
zP8hhy<b(LFnif-XZwyRLGhe;etnjh`>SnarOpgu8xv8@WlXnm(Uk~)_3$Sg0vTbU3
z{W!5B(L3{Yy3K5PN<@jEarAtja`}@KYva&<mg(_$O@VX5`i${0FdG$4{}rEJ0`R&Z
zZs#begZtjukzdS}v}xrs@_Gxo!#!cy(lp$QA>zFRF*s+_%jI<i@$eKN=@#NPOmQlJ
z=7^e*>Xh$T(S=an8?=Ry3H*NRqWgsM`<yWowt)b~MiHh~U(61jVh*wRB$%EpguObr
z{C3K9^9C*d4~t4O^w;Si@@(EOQBj0^AR@&Z$?J2;l@0mka+vG&V0u~tGhp2HcU9Vc
z(3Q+dYiLv8D}k6It5K+SSFp1a{3+y+@59Qw$=A%>&!#|@kf1>=4q%bFw7^Rhz!z5I
z<ebaYnWhT}|MWO3GSGz>yI^zU8_R1WN9`88Z=n>pIZQ`Ixr~_9G%Q}@A7rd#*%y7G
zXl^Id=^ZL?Rx}}gWXCqzj9C6;x(~mAH|$JteXa1MH<6UQig@!Hf~t}B%tP0I|H&;y
zO6N0}svOa1a^PyP9N5?4W6VF%=Bj{qHUgc8@siw4bafT=UPFSoQqKgyUX>sXTBZ=x
zOh^Ad!{kOM9v{%5y}`-8u*T&C7Vq6mD%GR}UeU(*epO&qgC-CkD;%=l)ZuinSzHM`
z{@`j&_vC6dDe{Yb9k@1zeV_K6!l(@=6ucoI=R^cH=6{i71%4W3$J-?<8Qn#$-DMtA
z6Qqi)t?4ifrt%3jSA#6ji#{f(($KBL-iQh-xrC||3U3lq`9>r)>X%oLvtimuHW-)}
zy}>9~|M>w4eES`g7;iBM%Se5-OP%1U6gNWp3AZqT8C6OlFFfQ$|7LL;tBV)(qlp4K
z<dPx#CSC1=4n%oyXOigA4XSj3{aKc{){yJp5b`oNF2J2BrG6uS^Wrd-BJ{m_yWEZS
zk$9>ruar^K8FnJN3@_}B;G`a~H`t|3+6d>q3#`ctTkE-D^1#d9NalQ04lH*qUW2!V
zhk7#z8OwHhSl8w14;KctfO8ubZJ4$dEdpXE78wABz<AT^6SV|+Ync#@d!bkI5#JQU
z3b`Q?>=n5*=q9ex3S}`e7x~~V-jmHOhtX2*n+pBslo3uosdE7xABK=V#-t{1Hd~?i
z{i~%Bw6NYF+F$aK$M`r#xe=NxhA5=p%i7!$);sd>Q}#`G<UXGdHa#qs#Rtzk+he;v
z4Ks`bftVt<iTnIwWOp`bWnAf#a4QJhA<;EY5}#bKSqFZX;m+%6+z%P;2Yl?&Agk1r
z-FB=A3bmYe`>?Q~fygrMXmZw?0#5#17W}6Tj+&kFexG{!mYl5FoA99}3G9l;3lVQ^
z48^~gsVppE*x91WheqI(A%F0Z#$#1UJP1R12Mj9r)y(A?a+iquX+d8WD4WAQJ_!oq
z9rTISr7bPd(GTP57xm$}C}&kjMivi;zi^Y9g3&<wLZq73hQe~~EfZyl=aX?g0t?D2
zuuy~aVnthj6OZffoHY=Ney162uSvLAYB#m|BM1I?^kCc74K{CyWT=18^#bi7yWdqK
z!tys-h@#h{nW16VYPjpSZ)_p2X!N3=_}w$e7u=7yM8();wZR{HMXtR9?DA?=-1gS@
zV{;f*zEJNvVC-`tLihb~EGUE~uzf@bO1mi5Vws1@4E@|vc=oz}2Hi}mt-rzkrwa@c
zTP3Pj(}xZE?_Uu*D~crlZ$|NVYVkj-I4D{I<idgn>X0A;ovdJ?{%_wHgt%%9P&N4H
z^<Cu!JQ@8%Oe0#*=_(Uo!{omudXfnuD0~$Q^uY=X?SIduxBllBv?2xNtuX=k96+2-
zBp~RTFo4VXFEWAD)|mjYULe19RluniXnb88!0Qd7*$@O+dV|b1i~twDe>XzV(uNA4
zAP`hgP6BEN5`YXh|DF~6Pud?~gWfhUKoP<JH*Q+UKj+gXFJLY5FH(cvB9K5vTTFnV
zsDH9@OA6o+_YdP@aX|FjOaPO_f6`-H8qk>X4>z|}0aocC&K+AoV%|SX*N!wGq3|y<
zg4lP(04XIPmt6}$N!dTk+pZv>u;MTB{L4hp9uXk7>aS!6jqM2lVr%{)H3$O127TSZ
z0x9hi0k-P?nWFdQ0K`pykqUIT&jD~B0tHP{ffS(}fZ(aW$oBWTSfHO!A^><6v<S5V
R_{@Vu|29OF7ypyz{{qB}Ob!45

delta 8722
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 41dfb879..aa991fce 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index c53aefaa..1b6c7873 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright � 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions �$var�, �${var}�, �${var:-default}�, �${var+SET}�,
-#           �${var#prefix}�, �${var%suffix}�, and �$( cmd )�;
-#         * compound commands having a testable exit status, especially �case�;
-#         * various built-in commands including �command�, �set�, and �ulimit�.
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #

From ba5ec138733dcdf7be4e49d6a1e6fb20c2e5b658 Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Tue, 17 May 2022 01:52:01 +0800
Subject: [PATCH 20/20] change: Bump version for release

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 85f64a06..6110f3ac 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,7 +7,7 @@ org.gradle.jvmargs=-Xmx1G
     loader_version=0.14.4
 
 # Mod Properties
-    mod_version=0.4.3
+    mod_version=0.4.4
     maven_group=me.flashyreese.mods
     archives_base_name=sodium-extra