Merge upstream

patches/0001-Use-PATCHED-versioning.patch

@@ -5,15 +5,15 @@ Subject: [PATCH] Use -PATCHED versioning
 
 
 diff --git a/gradle.properties b/gradle.properties
-index 70e3c27546bb00ee7ac51036049d3bf9cb81ce4e..e49aca874610f99d5de249d8907fd33dd9eb4193 100644
+index d6d8df85c7626591475f72eaf61b7a6589293e7d..df29ae3b3df50bcad02997cffa401c95a6ae7e75 100644
 --- a/gradle.properties
 +++ b/gradle.properties
 @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3072M
 
  archives_base_name=civmodern
  maven_group=sh.okx.civmodern
--mod_version=1.6.2
-+mod_version=1.6.2-PATCHED
+-mod_version=1.6.3
++mod_version=1.6.3-PATCHED
  mod_description=Civ Modern
  copyright_licence=GPLv3
  mod_home_url=https://github.com/okx-code/civmodern

patches/0002-Make-CivMC-specific.patch

@@ -8,18 +8,18 @@ diff --git a/civmc b/civmc
 deleted file mode 100644
 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
 diff --git a/common/src/main/java/sh/okx/civmodern/common/radar/Radar.java b/common/src/main/java/sh/okx/civmodern/common/radar/Radar.java
-index f62e3cdca8d0a6efa00fc9fbe9b4f99ac622d240..2354ee0cec414372c7dbc29022c85fed994b2a8a 100644
+index 2f1653ef51b0920dcb8a0d6769559e97feb6b1dd..610ad6730b13fd01f8b73558cd5fca98ea39d2c8 100644
 --- a/common/src/main/java/sh/okx/civmodern/common/radar/Radar.java
 +++ b/common/src/main/java/sh/okx/civmodern/common/radar/Radar.java
-@@ -46,7 +46,6 @@ import sh.okx.civmodern.common.events.ClientTickEvent;
+@@ -45,7 +45,6 @@ import sh.okx.civmodern.common.events.ClientTickEvent;
  import sh.okx.civmodern.common.events.EventBus;
  import sh.okx.civmodern.common.events.PostRenderGameOverlayEvent;
 
 -import java.net.URL;
  import java.util.Collections;
  import java.util.HashSet;
  import java.util.Random;
-@@ -56,18 +55,6 @@ import java.util.UUID;
+@@ -55,18 +54,6 @@ import java.util.UUID;
  import static org.lwjgl.opengl.GL11.*;
 
  public class Radar {
@@ -38,7 +38,7 @@ index f62e3cdca8d0a6efa00fc9fbe9b4f99ac622d240..2354ee0cec414372c7dbc29022c85fed
      private final EventBus eventBus;
      private final ColourProvider colourProvider;
      private final CivMapConfig config;
-@@ -97,7 +84,7 @@ public class Radar {
+@@ -96,7 +83,7 @@ public class Radar {
      }
 
      private boolean hideY() {

patches/0003-Add-auto-run-macro.patch

@@ -38,7 +38,7 @@ index 6182ea076d8296b9bd4ccd4a53b7f0fa482f37f4..71c23dac30df9c8c6b45077dd4f31ee8
          this.attackMacro = new AttackMacro(this, this.attackBinding, options.keyAttack);
      }
 diff --git a/common/src/main/resources/assets/civmodern/lang/en_us.json b/common/src/main/resources/assets/civmodern/lang/en_us.json
-index 56791d67771c47a65570606b196620b1f09910f1..61c55e1b5c88affb814e5c4337d9e0cd75032d0b 100644
+index ecdac5dcb066e86e004dc500867d901b87169b73..445b1cb034c052dea88e8f3b932fa29dd0877f59 100644
 --- a/common/src/main/resources/assets/civmodern/lang/en_us.json
 +++ b/common/src/main/resources/assets/civmodern/lang/en_us.json
 @@ -1,6 +1,7 @@

patches/0004-Add-show-item-repair-level-option.patch

@@ -223,7 +223,7 @@ index 1c234ad8c6fdb49bfbf818df01f24e867bc10c0f..640395fdfe7d3747ea54cd40b4a96a3e
 +    }
  }
 diff --git a/common/src/main/resources/assets/civmodern/lang/en_us.json b/common/src/main/resources/assets/civmodern/lang/en_us.json
-index 61c55e1b5c88affb814e5c4337d9e0cd75032d0b..9a70c15e6a49c4546562681da0bf91b89f6ac8cd 100644
+index 445b1cb034c052dea88e8f3b932fa29dd0877f59..40903ee08e0f973d544190ad2926d6de7b7d59a4 100644
 --- a/common/src/main/resources/assets/civmodern/lang/en_us.json
 +++ b/common/src/main/resources/assets/civmodern/lang/en_us.json
 @@ -27,6 +27,8 @@
@@ -233,8 +233,8 @@ index 61c55e1b5c88affb814e5c4337d9e0cd75032d0b..9a70c15e6a49c4546562681da0bf91b8
 +    "civmodern.screen.items.showRepair": "Show repair level",
 +    "civmodern.screen.items.showRepair.tooltip": "Whether to show the item's base repair level. This ISN'T the total repair cost in an Anvil! The total cost is typically level+2.",
      "civmodern.screen.ice.title": "Civ Modern Config (Ice Road Macro)",
-     "civmodern.screen.ice.cardinal.pitch.enable": "Snap pitch to cardinal: Enabled",
-     "civmodern.screen.ice.cardinal.pitch.disable": "Snap pitch to cardinal: Disabled",
+     "civmodern.screen.ice.cardinal.pitch.enable": "Snap pitch: Enabled",
+     "civmodern.screen.ice.cardinal.pitch.disable": "Snap pitch: Disabled",
 @@ -38,5 +40,7 @@
      "civmodern.screen.ice.stop.disable": "Stop on low food: Disabled",
      "civmodern.radar.enter" : "§r%s §eappeared at §b[%s§b]",
@@ -244,4 +244,3 @@ index 61c55e1b5c88affb814e5c4337d9e0cd75032d0b..9a70c15e6a49c4546562681da0bf91b8
 +    "civmodern.repair.level": "§fRepair level: %s",
 +    "civmodern.button.toggle": "%s: %s"
  }
-\ No newline at end of file

patches/0005-Add-toggle-sneak-macro.patch

@@ -153,7 +153,7 @@ index b479941e8c4381c114d302f9a15ab362e941aa4b..e829d2b897a16cdc6569f8b21d010494
 +    @NotNull InputConstants.Key getKey();
  }
 diff --git a/common/src/main/resources/assets/civmodern/lang/en_us.json b/common/src/main/resources/assets/civmodern/lang/en_us.json
-index 9a70c15e6a49c4546562681da0bf91b89f6ac8cd..fee19b39fe44a79924a974eec81393ad60481770 100644
+index 40903ee08e0f973d544190ad2926d6de7b7d59a4..35b7129c6bf7b90f21e474e0a5a5ae7588b676be 100644
 --- a/common/src/main/resources/assets/civmodern/lang/en_us.json
 +++ b/common/src/main/resources/assets/civmodern/lang/en_us.json
 @@ -2,6 +2,7 @@