1.1.2

This reverts commit 90d863bd25.

Caused an unexpected client-server incompatiblity

README.md

@@ -7,7 +7,7 @@ This modpack contains a [custom mod](https://patience.nearmisses.xyz/patience/mc
 Packed in Modrinth format, because [Modrinth](https://modrinth.com) is the superior mod hosting platform.
 
 # Installing
-1. Download the latest version [here](https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/releases/download/test-build/Tinker%27s%20tinkering.mrpack)
+1. Download the latest version [here](https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/releases/)
 2. Drag into your mod loader of choice
 
 # Development
@@ -15,16 +15,3 @@ Packed in Modrinth format, because [Modrinth](https://modrinth.com) is the super
 To create a release, run [./export-pack.sh](export-pack.sh)
 
 * It will be generated in [release/Tinker's tinkering.mrpack](Tinker's%20tinkering.mrpack)
-
-### Saving login details
-This script clones the [mc_rebalance](https://patience.nearmisses.xyz/patience/mc_rebalance) and [mc_rebalance_datapack](https://patience.nearmisses.xyz/SergeantAcoustic/mc_rebalance_datapack) repos, so you will need to provide login credentials to git twice every time you run the script.
-
-To solve this, consider one of the following:
-
-#### SSH mode
-Refer to [this guide](https://docs.codeberg.org/security/ssh-key/) on how to set up SSH key authentication
-
-#### HTTPS mode
-* To clone the repositories in HTTPS mode, run the script with any data at the end i.e. `./export-pack.sh 1`
-* Running `git config --global credential.helper store` will save your credentials to your global git config directory
-  * **Beware that this is stored in plaintext, so only do it on a private device**

export-pack.sh

@@ -23,10 +23,12 @@ pack_repo="$repo_prefix/SergeantAcoustic/mc_rebalance_datapack.git"
 git clone "$mod_repo" "$basedir/deps/mc_rebalance" || (cd "$basedir/deps/mc_rebalance"; git pull) || exit 1
 git clone "$pack_repo" "$basedir/overrides/global_packs/required_data/mc_rebalance_datapack/" || (cd "$basedir/overrides/global_packs/required_data/mc_rebalance_datapack/"; git pull) || exit 1
 
+rm "$basedir/deps/mc_rebalance/build/libs/mc_rebalance-"*".jar"
 (cd "$basedir"/deps/mc_rebalance/ && ./gradlew build)
 
 (cd "$basedir/overrides/global_packs/required_data/mc_rebalance_datapack/assets/minecraft/lang/" && ./gen-langs.sh)
 
+rm "$basedir/overrides/mods/mc_rebalance-"*".jar"
 cp "$basedir/deps/mc_rebalance/build/libs/mc_rebalance-"*".jar" "$basedir/overrides/mods"
 
 # Final path for the modpack

modrinth.index.json

@@ -6,7 +6,7 @@
   "formatVersion": 1,
   "game": "minecraft",
   "name": "MC Rebalanced",
-  "versionId": "1.0.1",
+  "versionId": "1.1.2",
   "files": [
     {
       "downloads": [
@@ -1358,6 +1358,21 @@
       },
       "path": "mods/particular-1.20.1-Forge-1.2.7.jar"
     },
+    {
+      "downloads": [
+        "https://cdn.modrinth.com/data/8fDygXCb/versions/KQWm3NrZ/pause-day-cycle-1.1.1.jar"
+      ],
+      "env": {
+        "client": "required",
+        "server": "required"
+      },
+      "fileSize": 402185,
+      "hashes": {
+        "sha1": "76d53c6b414ac5fba219d9d13677662c9b0fc9de",
+        "sha512": "d1f4c6768bdd9811d4b1be8752f3321ffa53c351ce31cb6ec126b27200838a8d6edf8faef69252b36277c3d1238775cf0f591eada7f3e2479cf3f251f7504091"
+      },
+      "path": "mods/pause-day-cycle-1.1.1.jar"
+    },
     {
       "downloads": [
         "https://cdn.modrinth.com/data/awAq0lbu/versions/I4zGB3WZ/paxelsfordummies-0.1.0%2Bmc1.20.1-forge.jar"
@@ -1508,6 +1523,21 @@
       },
       "path": "mods/spyglass_of_curios-forge-1.20.1-1.7.3.jar"
     },
+    {
+      "downloads": [
+        "https://cdn.modrinth.com/data/HmH1GVFY/versions/RZufy53V/spyglass_of_curios-forge-1.20.1-1.7.2.jar"
+      ],
+      "env": {
+        "client": "required",
+        "server": "required"
+      },
+      "fileSize": 58007,
+      "hashes": {
+        "sha1": "33a2a73972bd8e73a7799a99491713026c99c473",
+        "sha512": "a498cd593a90c8119a0541187d6cd74c2cbec2a026827e27b496186739bb4cb359b7aabf67cb46b2eb81c513e04ee6a25e17b0e058d2e9b707b83f14fab58529"
+      },
+      "path": "mods/spyglass_of_curios-forge-1.20.1-1.7.2.jar.disabled"
+    },
     {
       "downloads": [
         "https://cdn.modrinth.com/data/4KjqhPc9/versions/He3qmLL0/surveyor-0.6.26%2B1.20.jar"

overrides/config/SkeletonsReworked-data.toml

@@ -5,7 +5,7 @@
 	"Chest Slot" = ["minecraft:leather_chestplate|35", "minecraft:chainmail_chestplate|25", "minecraft:iron_chestplate|10", "advanced_copper:copper_armor_chestplate|15"]
 	"Legs Slot" = ["minecraft:leather_leggings|35", "minecraft:chainmail_leggings|25", "minecraft:iron_leggings|10", "advanced_copper:copper_armor_leggings|15"]
 	"Boots Slot" = ["minecraft:leather_boots|35", "minecraft:chainmail_boots|25", "minecraft:iron_boots|10", "advanced_copper:copper_armor_boots|15"]
-	"Main Hand Slot" = ["minecraft:bow|2000", "minecraft:wooden_sword|250", "minecraft:stone_sword|50", "minecraft:iron_sword|10"]
+	"Main Hand Slot" = ["minecraft:bow|2000", "minecraft:stone_sword|50", "minecraft:iron_sword|10"]
 	#Default true
 	"Should skeletons spawn with more armor and tools and more commonly" = true
 	#Default 250

overrides/config/ZombiesReworked-data.toml

@@ -5,7 +5,7 @@
 	"Chest Slot" = ["minecraft:iron_chestplate|100", "minecraft:chainmail_chestplate|175", "minecraft:leather_chestplate|250", "advanced_copper:copper_armor_chestplate|100"]
 	"Legs Slot" = ["minecraft:iron_leggings|100", "minecraft:chainmail_leggings|175", "minecraft:leather_leggings|250", "advanced_copper:copper_armor_leggings|100"]
 	"Boots Slot" = ["minecraft:iron_boots|100", "minecraft:chainmail_boots|175", "minecraft:leather_boots|250", "advanced_copper:copper_armor_boots|100"]
-	"Main Hand Slot" = ["minecraft:iron_sword|100", "minecraft:stone_sword|250", "minecraft:wooden_sword|400"]
+	"Main Hand Slot" = ["minecraft:iron_sword|100", "minecraft:stone_sword|250"]
 	"Off Hand Slot" = ["minecraft:shield|100"]
 	#Default true
 	"Should zombies spawn with more armor and tools and more commonly" = true

overrides/config/defaultoptions/keybindings.txt

@@ -11,7 +11,7 @@ key_key.do_a_barrel_roll.pitch_up:key.keyboard.unknown
 key_key.do_a_barrel_roll.roll_left:key.keyboard.unknown
 key_key.do_a_barrel_roll.roll_right:key.keyboard.unknown
 key_key.do_a_barrel_roll.thrust_backward:key.keyboard.unknown
-key_key.do_a_barrel_roll.thrust_forward:key.keyboard.w
+key_key.do_a_barrel_roll.thrust_forward:key.keyboard.unknown
 key_key.do_a_barrel_roll.toggle_enabled:key.keyboard.i
 key_key.do_a_barrel_roll.toggle_thrust:key.keyboard.unknown
 key_key.do_a_barrel_roll.yaw_left:key.keyboard.a
@@ -84,8 +84,8 @@ key_key.spectatorOutlines:key.keyboard.unknown
 key_key.sprint:key.keyboard.left.control
 key_key.spyglass_of_curios.use:key.keyboard.c
 key_key.swapOffhand:key.keyboard.f
-key_key.tconstruct.helmet_interact:key.keyboard.z
-key_key.tconstruct.leggings_interact:key.keyboard.i
+key_key.tconstruct.helmet_interact:key.keyboard.unknown
+key_key.tconstruct.leggings_interact:key.keyboard.unknown
 key_key.togglePerspective:key.keyboard.f5
 key_key.use:key.mouse.right
 key_keybind.invmove.toggleMove:key.keyboard.unknown

overrides/config/hide_key_binding-client.toml

@@ -1,6 +1,10 @@
 #Key bindings listed here will be hidden from the key bindings menu.
 #Use this to hide key bindings that are not used by the player.
 hide_key_bindings = [
+  "key.do_a_barrel_roll.thrust_backward",
+  "key.do_a_barrel_roll.thrust_forward",
+  "key.do_a_barrel_roll.toggle_thrust",
+  "key.entityculling.toggle",
   "key.horsecombatcontrols.toggle",
   "key.jei.bookmark",
   "key.jei.cheatItemStack",
@@ -33,6 +37,8 @@ hide_key_bindings = [
   "key.jei.toggleOverlay",
   "key.jei.toggleWildcardHideIngredient",
   "key.jei.transferRecipeBookmark",
+  "key.tconstruct.helmet_interact",
+  "key.tconstruct.leggings_interact",
   "quark.emote.cheer",
   "quark.emote.clap",
   "quark.emote.facepalm",
@@ -52,4 +58,3 @@ hide_key_bindings = [
   "quark.keybind.patreon_emote.tpose",
   "quark.keybind.patreon_emote.zombie"
 ]
-

overrides/config/quark-common.toml

@@ -774,7 +774,7 @@
 	Corundum = false
 	"Fairy Rings" = false
 	"Fallen Logs" = true
-	"Glimmering Weald" = true
+	"Glimmering Weald" = false
 	"Monster Box" = false
 	"Nether Obsidian Spikes" = false
 	"New Stone Types" = true
@@ -1608,7 +1608,7 @@
 
 	[client.improved_tooltips]
 		"Attribute Tooltips" = true
-		"Food Tooltips" = true
+		"Food Tooltips" = false
 		"Shulker Tooltips" = true
 		"Map Tooltips" = true
 		"Enchanting Tooltips" = true

overrides/config/tconjei-client.toml

@@ -0,0 +1,3 @@
+#Enable tooltip under Tinker's materials
+enable_tooltip = false
+