diff --git a/.gitignore b/.gitignore
index 4df4d45ed..e624c32e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,7 @@ fancymenu_data/last_world.fmdata
profile.json
screenshots/*
emi.json
+servers.dat
+servers.dat_old
+.sl_password
+cherishedworlds-favorites.dat
diff --git a/config/MouseTweaks.cfg b/config/MouseTweaks.cfg
new file mode 100644
index 000000000..81190ac8e
--- /dev/null
+++ b/config/MouseTweaks.cfg
@@ -0,0 +1,8 @@
+RMBTweak=1
+LMBTweakWithItem=1
+LMBTweakWithoutItem=1
+WheelTweak=1
+WheelSearchOrder=1
+WheelScrollDirection=0
+ScrollItemScaling=0
+Debug=0
diff --git a/config/NoChatReports/NCR-Client.json b/config/NoChatReports/NCR-Client.json
new file mode 100644
index 000000000..ab1934454
--- /dev/null
+++ b/config/NoChatReports/NCR-Client.json
@@ -0,0 +1,20 @@
+{
+ "defaultSigningMode": "PROMPT",
+ "enableMod": true,
+ "showNCRButton": true,
+ "showReloadButton": true,
+ "verifiedIconEnabled": true,
+ "showServerSafety": true,
+ "hideInsecureMessageIndicators": true,
+ "hideModifiedMessageIndicators": true,
+ "hideSystemMessageIndicators": true,
+ "hideWarningToast": true,
+ "hideSigningRequestMessage": false,
+ "alwaysHideReportButton": false,
+ "skipRealmsWarning": false,
+ "disableTelemetry": true,
+ "removeTelemetryButton": true,
+ "demandOnServer": false,
+ "verifiedIconOffsetX": 0,
+ "verifiedIconOffsetY": 0
+}
\ No newline at end of file
diff --git a/config/NoChatReports/NCR-Common.json b/config/NoChatReports/NCR-Common.json
new file mode 100644
index 000000000..f79a76ab9
--- /dev/null
+++ b/config/NoChatReports/NCR-Common.json
@@ -0,0 +1,7 @@
+{
+ "demandOnClientMessage": "You do not have No Chat Reports, and this server is configured to require it on client!",
+ "demandOnClient": false,
+ "convertToGameMessage": true,
+ "addQueryData": true,
+ "enableDebugLog": false
+}
\ No newline at end of file
diff --git a/config/NoChatReports/NCR-Encryption.json b/config/NoChatReports/NCR-Encryption.json
new file mode 100644
index 000000000..295af7691
--- /dev/null
+++ b/config/NoChatReports/NCR-Encryption.json
@@ -0,0 +1,28 @@
+{
+ "skipWarning": false,
+ "enableEncryption": false,
+ "encryptPublic": true,
+ "showEncryptionButton": true,
+ "showEncryptionIndicators": true,
+ "encryptionKey": "blfrngArk3chG6wzncOZ5A\u003d\u003d",
+ "encryptionPassphrase": "",
+ "algorithmName": "AES/CFB8+Base64",
+ "encryptableCommands": [
+ "msg:1",
+ "w:1",
+ "whisper:1",
+ "tell:1",
+ "r:0",
+ "dm:1",
+ "me:0",
+ "m:1",
+ "t:1",
+ "pm:1",
+ "emsg:1",
+ "epm:1",
+ "etell:1",
+ "ewhisper:1",
+ "message:1",
+ "reply:0"
+ ]
+}
\ No newline at end of file
diff --git a/config/NoChatReports/NCR-ServerPreferences.json b/config/NoChatReports/NCR-ServerPreferences.json
new file mode 100644
index 000000000..2762d0fd8
--- /dev/null
+++ b/config/NoChatReports/NCR-ServerPreferences.json
@@ -0,0 +1,3 @@
+{
+ "signingModes": {}
+}
\ No newline at end of file
diff --git a/config/NoChatReports/README.md b/config/NoChatReports/README.md
new file mode 100644
index 000000000..33141b5aa
--- /dev/null
+++ b/config/NoChatReports/README.md
@@ -0,0 +1,3 @@
+# No Chat Reports
+You can find updated documentation of configuration files on the wiki:
+https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/Configuration-Files
diff --git a/config/balm-common.toml b/config/balm-common.toml
new file mode 100644
index 000000000..afab694fd
--- /dev/null
+++ b/config/balm-common.toml
@@ -0,0 +1,19 @@
+#This is an example boolean property
+exampleBoolean = true
+#Range: > -2147483648
+exampleInt = 42
+exampleString = "Hello World"
+exampleMultilineString = "Hello World"
+#Allowed Values: Hello, World
+exampleEnum = "Hello"
+exampleStringList = ["Hello", "World"]
+exampleIntList = [12, 24]
+exampleEnumList = ["Hello", "World"]
+
+[exampleCategory]
+ #This is an example category
+ #This is an example string inside a category
+ innerField = "I am inside"
+ #Range: -3.4028234663852886E38 ~ 3.4028234663852886E38
+ exampleFloat = 42.84000015258789
+
diff --git a/config/clienttweaks-common.toml b/config/clienttweaks-common.toml
new file mode 100644
index 000000000..f1b147a21
--- /dev/null
+++ b/config/clienttweaks-common.toml
@@ -0,0 +1,49 @@
+
+[tweaks]
+ #This option will let you climb ladders automatically by just looking upwards, rather than requiring a key to be held down.
+ autoClimbLadder = false
+ #This prevents the last torch in the offhand from being placed.
+ doNotUseLastTorch = false
+ #This option will hide your offhand item. It can be toggled via an optional key binding.
+ hideOffhandItem = false
+ #This option will hide your own potion particle effects for your client (other players will still see them).
+ hideOwnParticleEffects = false
+ #This option will hide your shield unless you are holding a weapon.
+ hideShieldUnlessHoldingWeapon = true
+ #This prevents torches from being placed from your offhand at all.
+ noOffhandTorchAtAll = false
+ #This prevents torches from being placed from your offhand if you have a block in your main hand.
+ noOffhandTorchWithBlock = true
+ #This prevents torches from being placed from your offhand if you have food in your main hand.
+ noOffhandTorchWithFood = true
+ #This prevents torches from being placed from your off hand if you have an empty main hand.
+ noOffhandTorchWithEmptyHand = false
+ #This restricts torches to be placed from the offhand only when you're holding a tool in your main hand.
+ offhandTorchWithToolOnly = false
+ #This prevents fireworks from being launched from your off hand if you are wearing an Elytra, unless you're flying.
+ noOffhandFireworksWithElytra = true
+ #This option will disable step assist added by other mods.
+ disableStepAssist = false
+ #This option will disable log stripping.
+ disableLogStripping = false
+ #This adds back the master volume slider to the options screen. Saves you a click!
+ masterVolumeSlider = true
+ #This adds back the music volume slider to the options screen. Saves you a click!
+ musicVolumeSlider = true
+ #This option will make iron fences and glass panes have a bigger hitbox while placing them, making it easier to aim.
+ paneBuildingSupport = true
+ #This option makes the recipe book not shift the inventory when opened. Works best with smaller GUI scales / bigger resolutions.
+ noRecipeBookShifting = false
+
+[customization]
+ #Items that count as torches for the offhand-torch tweak options.
+ torchItems = ["minecraft:torch", "minecraft:soul_torch", "tconstruct:stone_torch"]
+ #Items that are allowed to place torches from the offhand if offhandTorchWithToolOnly is enabled.
+ torchTools = ["minecraft:wooden_pickaxe", "minecraft:stone_pickaxe", "minecraft:iron_pickaxe", "minecraft:golden_pickaxe", "minecraft:diamond_pickaxe", "minecraft:netherite_pickaxe", "tconstruct:pickaxe", "tconstruct:hammer"]
+ #Items that count as weapons for the offhand-shield hiding tweak options.
+ shieldWeapons = ["tetra:modular_sword"]
+ #Items that count as shields for the offhand-shield hiding tweak options.
+ shieldItems = ["basicshields:wooden_shield", "basicshields:golden_shield", "basicshields:diamond_shield", "basicshields:netherite_shield"]
+ #Items that count as fireworks for the offhand-firework tweak options.
+ fireworkItems = ["minecraft:firework_rocket"]
+
diff --git a/config/heracles/groups.txt b/config/heracles/groups.txt
new file mode 100644
index 000000000..c098216e7
--- /dev/null
+++ b/config/heracles/groups.txt
@@ -0,0 +1 @@
+Main
diff --git a/config/heracles/tutorial.html b/config/heracles/tutorial.html
new file mode 100644
index 000000000..61cacc13e
--- /dev/null
+++ b/config/heracles/tutorial.html
@@ -0,0 +1,9 @@
+Tutorial
+Quests are a way to guide you through the progression. They are a way to help you learn about things and the world around you.
+Quests are split into groups. Each group has a set of quests that you can complete. You can complete quests in any order you want, but some quests may require you to complete other quests first.
+
+
+ You can change this file in the tutorial.html file in the Heracles config folder.
+
+
+Happy Questing!
diff --git a/config/jade/plugins.json b/config/jade/plugins.json
index 7c0ec4f3b..ee3ae5a89 100644
--- a/config/jade/plugins.json
+++ b/config/jade/plugins.json
@@ -102,6 +102,17 @@
"electric_container_provider": true,
"controllable_provider": true
},
+ "create": {
+ "filter": true,
+ "backtank_capacity": true,
+ "goggles.requires_goggles": true,
+ "goggles": false,
+ "blaze_burner": true,
+ "exact_block": true,
+ "crafting_blueprint": true,
+ "goggles.detailed": false,
+ "placard": true
+ },
"jade": {
"coordinates.rel": false,
"distance": false,
@@ -110,17 +121,6 @@
"registry_name": "OFF",
"mod_name": true
},
- "create": {
- "filter": true,
- "goggles.requires_goggles": true,
- "goggles": false,
- "copper_backtank": true,
- "blaze_burner": true,
- "exact_block": true,
- "crafting_blueprint": true,
- "goggles.detailed": false,
- "placard": true
- },
"ae2": {
"part_icon": true,
"charger": true,
diff --git a/config/jade/sort-order.json b/config/jade/sort-order.json
index 6031ca791..babecfe8f 100644
--- a/config/jade/sort-order.json
+++ b/config/jade/sort-order.json
@@ -208,7 +208,7 @@
"ae2:part_tooltip": null,
"ae2:part_mod_name": null,
"create:blaze_burner": null,
- "create:copper_backtank": null,
+ "create:backtank_capacity": null,
"create:contraption_inv": null,
"lootr:inventory": null,
"create:hide_boiler_tanks": null,
diff --git a/config/modernfix-mixins.properties b/config/modernfix-mixins.properties
index d1fb39ab8..9f84f8c7a 100644
--- a/config/modernfix-mixins.properties
+++ b/config/modernfix-mixins.properties
@@ -24,6 +24,7 @@
# mixin.bugfix.packet_leak=false # (default)
# mixin.bugfix.paper_chunk_patches=true # (default)
# mixin.bugfix.recipe_book_type_desync=true # (default)
+# mixin.bugfix.removed_dimensions=true # (default)
# mixin.bugfix.unsafe_modded_shape_caches=true # (default)
# mixin.bugfix.world_leaks=true # (default)
# mixin.bugfix.world_screen_skipped=true # (default)
@@ -33,6 +34,7 @@
# mixin.feature.disable_unihex_font=false # (default)
# mixin.feature.integrated_server_watchdog=true # (default)
# mixin.feature.measure_time=true # (default)
+# mixin.feature.registry_event_progress=false # (default)
# mixin.feature.snapshot_easter_egg=true # (default)
# mixin.feature.spam_thread_dump=false # (default)
# mixin.feature.spark_profile_launch=false # (default)
@@ -41,6 +43,7 @@
# mixin.perf.blast_search_trees=true # (default)
# mixin.perf.cache_blockstate_cache_arrays=true # (default)
# mixin.perf.cache_model_materials=true # (default)
+# mixin.perf.cache_profile_texture_url=true # (default)
# mixin.perf.cache_strongholds=true # (default)
# mixin.perf.cache_upgraded_structures=true # (default)
# mixin.perf.clear_mixin_classinfo=false # (default)
@@ -55,7 +58,6 @@
# mixin.perf.dynamic_entity_renderers=false # (default)
# mixin.perf.dynamic_resources=false # (default)
# mixin.perf.dynamic_resources.ctm=true # (default)
-# mixin.perf.dynamic_resources.diagonalfences=true # (default)
# mixin.perf.dynamic_resources.rs=true # (default)
# mixin.perf.dynamic_resources.supermartijncore=true # (default)
# mixin.perf.dynamic_sounds=true # (default)
diff --git a/heracles_options.json b/heracles_options.json
new file mode 100644
index 000000000..5facee3ed
--- /dev/null
+++ b/heracles_options.json
@@ -0,0 +1,4 @@
+{
+ "pinnedIndex": 0,
+ "showTutorial": true
+}
\ No newline at end of file
diff --git a/mods/MouseTweaks-forge-mc1.20-2.25.jar b/mods/MouseTweaks-forge-mc1.20-2.25.jar
new file mode 100644
index 000000000..68587015b
Binary files /dev/null and b/mods/MouseTweaks-forge-mc1.20-2.25.jar differ
diff --git a/mods/NoChatReports-FORGE-1.20.1-v2.2.2.jar b/mods/NoChatReports-FORGE-1.20.1-v2.2.2.jar
new file mode 100644
index 000000000..ae8075a6a
Binary files /dev/null and b/mods/NoChatReports-FORGE-1.20.1-v2.2.2.jar differ
diff --git a/mods/SimpleLogin-1.20.1-1.0.2-all.jar b/mods/SimpleLogin-1.20.1-1.0.2-all.jar
new file mode 100644
index 000000000..6e56acbe0
Binary files /dev/null and b/mods/SimpleLogin-1.20.1-1.0.2-all.jar differ
diff --git a/mods/balm-forge-1.20.1-7.1.4.jar b/mods/balm-forge-1.20.1-7.1.4.jar
new file mode 100644
index 000000000..e64f50a25
Binary files /dev/null and b/mods/balm-forge-1.20.1-7.1.4.jar differ
diff --git a/mods/cherishedworlds-forge-6.1.4+1.20.1.jar b/mods/cherishedworlds-forge-6.1.4+1.20.1.jar
new file mode 100644
index 000000000..dfc2ce88b
Binary files /dev/null and b/mods/cherishedworlds-forge-6.1.4+1.20.1.jar differ
diff --git a/mods/clienttweaks-forge-1.20-11.1.0.jar b/mods/clienttweaks-forge-1.20-11.1.0.jar
new file mode 100644
index 000000000..ac676fc2c
Binary files /dev/null and b/mods/clienttweaks-forge-1.20-11.1.0.jar differ