Merge remote-tracking branch 'origin/main' into server

# Conflicts: # mods/ImmediatelyFast-NeoForge-1.6.5+1.21.1.jar
2025-04-06 13:05:23 +02:00 · 2025-04-06 13:05:23 +02:00 · fc93ed868b
commit fc93ed868b
parent 7fd57a4a24 503b623df3
28 changed files with 0 additions and 0 deletions
--- a/datapacks/Cobblemon
+++ b/datapacks/Cobblemon
--- a/mods/Cobblemon-Utility+-neoforge-1.5.jar
+++ b/mods/Cobblemon-Utility+-neoforge-1.5.jar
--- a/mods/Cobblemon_MegaShowdown-8.2.1-release-neoforge.jar
+++ b/mods/Cobblemon_MegaShowdown-8.2.1-release-neoforge.jar
--- a/mods/Controlling-neoforge-1.21.1-19.0.5.jar
+++ b/mods/Controlling-neoforge-1.21.1-19.0.5.jar
--- a/mods/CreativeCore_NEOFORGE_v2.12.32_mc1.21.1.jar
+++ b/mods/CreativeCore_NEOFORGE_v2.12.32_mc1.21.1.jar
--- a/mods/CreativeCore_NEOFORGE_v2.13.0_mc1.21.1.jar
+++ b/mods/CreativeCore_NEOFORGE_v2.13.0_mc1.21.1.jar
--- a/mods/LittleTiles_BETA_v1.6.0-pre158_mc1.21.1.jar
+++ b/mods/LittleTiles_BETA_v1.6.0-pre158_mc1.21.1.jar
--- a/mods/appliedenergistics2-19.2.6-beta.jar
+++ b/mods/appliedenergistics2-19.2.6-beta.jar
--- a/mods/artifacts-neoforge-12.1.4.jar
+++ b/mods/artifacts-neoforge-12.1.4.jar
--- a/mods/curios-neoforge-9.4.1+1.21.1.jar
+++ b/mods/curios-neoforge-9.4.1+1.21.1.jar
--- a/mods/easy-villagers-neoforge-1.21.1-1.1.24.jar
+++ b/mods/easy-villagers-neoforge-1.21.1-1.1.24.jar
--- a/mods/emi-1.1.21+1.21.1+neoforge.jar
+++ b/mods/emi-1.1.21+1.21.1+neoforge.jar
--- a/mods/farmersexpanse-0.0.6.jar
+++ b/mods/farmersexpanse-0.0.6.jar
--- a/mods/farmersexpanse-0.0.7b.jar
+++ b/mods/farmersexpanse-0.0.7b.jar
--- a/mods/forgified-fabric-api-0.107.0+2.0.26+1.21.1.jar
+++ b/mods/forgified-fabric-api-0.107.0+2.0.26+1.21.1.jar
--- a/mods/fzzy_config-0.6.8+1.21+neoforge.jar
+++ b/mods/fzzy_config-0.6.8+1.21+neoforge.jar
--- a/mods/guideme-21.1.7.jar
+++ b/mods/guideme-21.1.7.jar
--- a/mods/journeymap-neoforge-1.21.1-6.0.0-beta.44.jar
+++ b/mods/journeymap-neoforge-1.21.1-6.0.0-beta.44.jar
--- a/mods/journeymap-webmap-neoforge-1.21.4-1.0.6.jar
+++ b/mods/journeymap-webmap-neoforge-1.21.4-1.0.6.jar
--- a/mods/lctech-1.21-0.2.1.16a.jar
+++ b/mods/lctech-1.21-0.2.1.16a.jar
--- a/mods/lightmanscurrency-1.21-2.2.5.0.jar
+++ b/mods/lightmanscurrency-1.21-2.2.5.0.jar
--- a/mods/polymorph-neoforge-1.0.8+1.21.1.jar
+++ b/mods/polymorph-neoforge-1.0.8+1.21.1.jar
--- a/mods/releaserewards-neoforge-2.1.0.jar
+++ b/mods/releaserewards-neoforge-2.1.0.jar
--- a/mods/sodium-neoforge-0.6.13+mc1.21.1.jar
+++ b/mods/sodium-neoforge-0.6.13+mc1.21.1.jar
--- a/mods/sophisticatedbackpacks-1.21.1-3.24.3.1216.jar
+++ b/mods/sophisticatedbackpacks-1.21.1-3.24.3.1216.jar
--- a/mods/sophisticatedcore-1.21.1-1.3.19.935.jar
+++ b/mods/sophisticatedcore-1.21.1-1.3.19.935.jar
--- a/mods/waterframes-NEOFORGE-mc1.21.1-v2.1.12.jar
+++ b/mods/waterframes-NEOFORGE-mc1.21.1-v2.1.12.jar
--- a/mods/waterframes-NEOFORGE-mc1.21.1-v2.1.14.jar
+++ b/mods/waterframes-NEOFORGE-mc1.21.1-v2.1.14.jar