Merge branch 'main' into server

# Conflicts: # mods/ImmediatelyFast-NeoForge-1.6.6+1.21.1.jar # mods/watermedia-2.1.30.jar
2025-08-18 13:59:28 +02:00 · 2025-08-18 13:59:28 +02:00 · f8f2af651b
commit f8f2af651b
parent fc93ed868b 3e83a0e050
106 changed files with 1 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -4,7 +4,7 @@
 ## MC Version: 1.21.1
-## Neoforge Version: 21.1.133
+## Neoforge Version: 21.1.200
 Instrucciones para cambiar la version [pirata](https://git.sfkao.net/SFKao/Las_3000-modpack/wiki/Actualizar-version-modloader-pirata) y [comprado](https://git.sfkao.net/SFKao/Las_3000-modpack/wiki/Actualizar-version-modloader-comprado)
--- a/datapacks/AllTheMons
+++ b/datapacks/AllTheMons
--- a/mods/Cobblemon_MegaShowdown-8.2.1-release-neoforge.jar
+++ b/mods/Cobblemon_MegaShowdown-8.2.1-release-neoforge.jar
--- a/datapacks/MythsAndLegends-Datapack-v1.0.5.zip
+++ b/datapacks/MythsAndLegends-Datapack-v1.0.5.zip
--- a/datapacks/MythsandLegends-Datapack-v1.0.4(1.21.1).zip
+++ b/datapacks/MythsandLegends-Datapack-v1.0.4(1.21.1).zip
--- a/mods/BiomesOPlenty-neoforge-1.21.1-21.1.0.12.jar
+++ b/mods/BiomesOPlenty-neoforge-1.21.1-21.1.0.12.jar
--- a/mods/Cobblemon-Utility+-neoforge-1.5.jar
+++ b/mods/Cobblemon-Utility+-neoforge-1.5.jar
--- a/mods/Cobblemon-Utility+-neoforge-1.6.1.jar
+++ b/mods/Cobblemon-Utility+-neoforge-1.6.1.jar
--- a/mods/Cobblemon_MegaShowdown-10.0.6-release-neoforge.jar
+++ b/mods/Cobblemon_MegaShowdown-10.0.6-release-neoforge.jar
--- a/mods/Cobbreeding-neoforge-1.8.10.jar
+++ b/mods/Cobbreeding-neoforge-1.8.10.jar
--- a/mods/Cobbreeding-neoforge-1.9.1.jar
+++ b/mods/Cobbreeding-neoforge-1.9.1.jar
--- a/mods/CreativeCore_NEOFORGE_v2.13.9_mc1.21.1.jar
+++ b/mods/CreativeCore_NEOFORGE_v2.13.9_mc1.21.1.jar
--- a/mods/FarmersDelight-1.21.1-1.2.8.jar
+++ b/mods/FarmersDelight-1.21.1-1.2.8.jar
--- a/mods/FramedBlocks-10.4.0.jar
+++ b/mods/FramedBlocks-10.4.0.jar
--- a/mods/LittleTiles_BETA_v1.6.0-pre174_mc1.21.1.jar
+++ b/mods/LittleTiles_BETA_v1.6.0-pre174_mc1.21.1.jar
--- a/mods/MythsAndLegends-neoforge-1.7.2-Hotfix.jar
+++ b/mods/MythsAndLegends-neoforge-1.7.2-Hotfix.jar
--- a/mods/MythsAndLegends-neoforge-1.8.0.jar
+++ b/mods/MythsAndLegends-neoforge-1.8.0.jar
--- a/mods/Powah-6.2.6.jar
+++ b/mods/Powah-6.2.6.jar
--- a/mods/PuzzlesLib-v21.1.38-1.21.1-NeoForge.jar
+++ b/mods/PuzzlesLib-v21.1.38-1.21.1-NeoForge.jar
--- a/mods/SimpleTMs-neoforge-2.1.2.jar
+++ b/mods/SimpleTMs-neoforge-2.1.2.jar
--- a/Drawers-neoforge-1.21-13.8.5.jar
+++ b/Drawers-neoforge-1.21-13.8.5.jar
--- a/mods/StorageDrawers-neoforge-1.21.1-13.10.0.jar
+++ b/mods/StorageDrawers-neoforge-1.21.1-13.10.0.jar
--- a/mods/YungsApi-1.21.1-NeoForge-5.1.6.jar
+++ b/mods/YungsApi-1.21.1-NeoForge-5.1.6.jar
--- a/mods/YungsBetterNetherFortresses-1.21.1-NeoForge-3.1.5.jar
+++ b/mods/YungsBetterNetherFortresses-1.21.1-NeoForge-3.1.5.jar
--- a/mods/addonslib-neoforge-1.21.1-1.6.1.jar
+++ b/mods/addonslib-neoforge-1.21.1-1.6.1.jar
--- a/mods/ae2wtlib-19.2.2.jar
+++ b/mods/ae2wtlib-19.2.2.jar
--- a/mods/ae2wtlib-19.2.5.jar
+++ b/mods/ae2wtlib-19.2.5.jar
--- a/mods/aeinfinitybooster-neoforge-1.21.1-1.0.0.49.jar
+++ b/mods/aeinfinitybooster-neoforge-1.21.1-1.0.0.49.jar
--- a/mods/aeinfinitybooster-neoforge-1.21.1-1.0.0.52.jar
+++ b/mods/aeinfinitybooster-neoforge-1.21.1-1.0.0.52.jar
--- a/mods/amendments-1.21-1.2.24-neoforge.jar
+++ b/mods/amendments-1.21-1.2.24-neoforge.jar
--- a/mods/appleskin-neoforge-mc1.21-3.0.7.jar
+++ b/mods/appleskin-neoforge-mc1.21-3.0.7.jar
--- a/mods/appliedenergistics2-19.2.15.jar
+++ b/mods/appliedenergistics2-19.2.15.jar
--- a/mods/artifacts-neoforge-12.1.4.jar
+++ b/mods/artifacts-neoforge-12.1.4.jar
--- a/mods/artifacts-neoforge-13.0.7.jar
+++ b/mods/artifacts-neoforge-13.0.7.jar
--- a/mods/athena-neoforge-1.21-4.0.2.jar
+++ b/mods/athena-neoforge-1.21-4.0.2.jar
--- a/mods/badgebox-neoforge-1.3.0.jar
+++ b/mods/badgebox-neoforge-1.3.0.jar
--- a/mods/balm-neoforge-1.21.1-21.0.34.jar
+++ b/mods/balm-neoforge-1.21.1-21.0.34.jar
--- a/mods/balm-neoforge-1.21.1-21.0.49.jar
+++ b/mods/balm-neoforge-1.21.1-21.0.49.jar
--- a/mods/charta-1.1.0-neoforge-1.21.1.jar
+++ b/mods/charta-1.1.0-neoforge-1.21.1.jar
--- a/mods/cobblemonintegrations-neoforge-1.21.1-1.1.3.jar
+++ b/mods/cobblemonintegrations-neoforge-1.21.1-1.1.3.jar
--- a/mods/cobblenav-neoforge-2.1.0.jar
+++ b/mods/cobblenav-neoforge-2.1.0.jar
--- a/mods/cobblenav-neoforge-2.2.3.jar
+++ b/mods/cobblenav-neoforge-2.2.3.jar
--- a/mods/cobbleride-neoforge-0.2.2+1.21.1.jar
+++ b/mods/cobbleride-neoforge-0.2.2+1.21.1.jar
--- a/mods/cobbleride-neoforge-0.3.3+1.21.1.jar
+++ b/mods/cobbleride-neoforge-0.3.3+1.21.1.jar
--- a/mods/comforts-neoforge-9.0.4+1.21.1.jar
+++ b/mods/comforts-neoforge-9.0.4+1.21.1.jar
--- a/mods/connector-2.0.0-beta.8+1.21.1-full.jar
+++ b/mods/connector-2.0.0-beta.8+1.21.1-full.jar
--- a/mods/create-1.21.1-6.0.6.jar
+++ b/mods/create-1.21.1-6.0.6.jar
--- a/mods/curios-neoforge-9.5.1+1.21.1.jar
+++ b/mods/curios-neoforge-9.5.1+1.21.1.jar
--- a/mods/dynamic-fps-3.9.5+minecraft-1.21.0-neoforge.jar
+++ b/mods/dynamic-fps-3.9.5+minecraft-1.21.0-neoforge.jar
--- a/mods/easy-villagers-neoforge-1.21.1-1.1.35.jar
+++ b/mods/easy-villagers-neoforge-1.21.1-1.1.35.jar
--- a/mods/emi-1.1.22+1.21.1+neoforge.jar
+++ b/mods/emi-1.1.22+1.21.1+neoforge.jar
--- a/mods/emi_loot-0.7.5+1.21+neoforge.jar
+++ b/mods/emi_loot-0.7.5+1.21+neoforge.jar
--- a/mods/emi_loot-0.7.6+1.21+neoforge.jar
+++ b/mods/emi_loot-0.7.6+1.21+neoforge.jar
--- a/mods/entityculling-neoforge-1.7.4-mc1.21.jar
+++ b/mods/entityculling-neoforge-1.7.4-mc1.21.jar
--- a/mods/entityculling-neoforge-1.8.2-mc1.21.jar
+++ b/mods/entityculling-neoforge-1.8.2-mc1.21.jar
--- a/mods/farmersexpanse-0.0.7c.jar
+++ b/mods/farmersexpanse-0.0.7c.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/forgified-fabric-api-0.115.6+2.1.1+1.21.1.jar
+++ b/mods/forgified-fabric-api-0.115.6+2.1.1+1.21.1.jar
--- a/mods/framework-neoforge-1.21.1-0.9.6.jar
+++ b/mods/framework-neoforge-1.21.1-0.9.6.jar
--- a/mods/fusion-1.2.10-neoforge-mc1.21.jar
+++ b/mods/fusion-1.2.10-neoforge-mc1.21.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/fzzy_config-0.7.2+1.21+neoforge.jar
+++ b/mods/fzzy_config-0.7.2+1.21+neoforge.jar
--- a/mods/geckolib-neoforge-1.21.1-4.7.5.1.jar
+++ b/mods/geckolib-neoforge-1.21.1-4.7.5.1.jar
--- a/mods/gravestone-neoforge-1.21.1-1.0.32.jar
+++ b/mods/gravestone-neoforge-1.21.1-1.0.32.jar
--- a/mods/guideme-21.1.14.jar
+++ b/mods/guideme-21.1.14.jar
--- a/mods/handcrafted-neoforge-1.21.1-4.0.3.jar
+++ b/mods/handcrafted-neoforge-1.21.1-4.0.3.jar
--- a/mods/immersive_aircraft-1.3.3+1.21.1-neoforge.jar
+++ b/mods/immersive_aircraft-1.3.3+1.21.1-neoforge.jar
--- a/mods/iris-neoforge-1.8.12+mc1.21.1.jar
+++ b/mods/iris-neoforge-1.8.12+mc1.21.1.jar
--- a/mods/jei-1.21.1-neoforge-19.22.1.316.jar
+++ b/mods/jei-1.21.1-neoforge-19.22.1.316.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-neoforge-1.21.1-6.0.0-beta.52.jar
+++ b/mods/journeymap-neoforge-1.21.1-6.0.0-beta.52.jar
--- a/mods/journeymap-webmap-neoforge-1.21.4-1.0.9.jar
+++ b/mods/journeymap-webmap-neoforge-1.21.4-1.0.9.jar
--- a/mods/kotlinforforge-5.7.0-all.jar
+++ b/mods/kotlinforforge-5.7.0-all.jar
--- a/mods/kotlinforforge-5.9.0-all.jar
+++ b/mods/kotlinforforge-5.9.0-all.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.6.2b.jar
+++ b/mods/lightmanscurrency-1.21-2.2.6.2b.jar
--- a/mods/mcw-bridges-3.1.1-mc1.21.1neoforge.jar
+++ b/mods/mcw-bridges-3.1.1-mc1.21.1neoforge.jar
--- a/mods/mcw-doors-1.1.2-mc1.21.1neoforge.jar
+++ b/mods/mcw-doors-1.1.2-mc1.21.1neoforge.jar
--- a/mods/mcw-fences-1.2.0-1.21.1neoforge.jar
+++ b/mods/mcw-fences-1.2.0-1.21.1neoforge.jar
--- a/mods/mcw-furniture-3.3.0-mc1.21.1neoforge.jar
+++ b/mods/mcw-furniture-3.3.0-mc1.21.1neoforge.jar
--- a/mods/mcw-holidays-1.1.0-mc1.21.1neoforge.jar
+++ b/mods/mcw-holidays-1.1.0-mc1.21.1neoforge.jar
--- a/mods/mcw-lights-1.1.2-mc1.21.1neoforge.jar
+++ b/mods/mcw-lights-1.1.2-mc1.21.1neoforge.jar
--- a/mods/mcw-paintings-1.0.5-1.21.1neoforge.jar
+++ b/mods/mcw-paintings-1.0.5-1.21.1neoforge.jar
--- a/mods/mcw-paths-1.1.0neoforge-mc1.21.1.jar
+++ b/mods/mcw-paths-1.1.0neoforge-mc1.21.1.jar
--- a/mods/mcw-roofs-2.3.2-mc1.21.1neoforge.jar
+++ b/mods/mcw-roofs-2.3.2-mc1.21.1neoforge.jar
--- a/mods/mcw-stairs-1.0.1-1.21.1neoforge.jar
+++ b/mods/mcw-stairs-1.0.1-1.21.1neoforge.jar
--- a/mods/mcw-trapdoors-1.1.4-mc1.21.1neoforge.jar
+++ b/mods/mcw-trapdoors-1.1.4-mc1.21.1neoforge.jar
--- a/mods/mcw-windows-2.4.0-1.21.1neoforge.jar
+++ b/mods/mcw-windows-2.4.0-1.21.1neoforge.jar
--- a/mods/mcwbiomesoplenty-neoforge-1.21.1-1.2.jar
+++ b/mods/mcwbiomesoplenty-neoforge-1.21.1-1.2.jar
--- a/mods/merequester-neoforge-1.21.1-1.2.0.jar
+++ b/mods/merequester-neoforge-1.21.1-1.2.0.jar
--- a/mods/modernfix-neoforge-5.24.3+mc1.21.1.jar
+++ b/mods/modernfix-neoforge-5.24.3+mc1.21.1.jar
--- a/mods/moonlight-1.21-2.20.7-neoforge.jar
+++ b/mods/moonlight-1.21-2.20.7-neoforge.jar
--- a/mods/moredelight-25.07.28a-1.21-neoforge.jar
+++ b/mods/moredelight-25.07.28a-1.21-neoforge.jar
--- a/mods/oritech-neoforge-0.17.3.jar
+++ b/mods/oritech-neoforge-0.17.3.jar
--- a/mods/owo-lib-neoforge-0.12.15.5-beta.1+1.21.jar
+++ b/mods/owo-lib-neoforge-0.12.15.5-beta.1+1.21.jar
--- a/mods/polymorph-neoforge-1.1.0+1.21.1.jar
+++ b/mods/polymorph-neoforge-1.1.0+1.21.1.jar
--- a/mods/refurbished_furniture-neoforge-1.21.1-1.0.16.jar
+++ b/mods/refurbished_furniture-neoforge-1.21.1-1.0.16.jar
--- a/mods/releaserewards-neoforge-2.2.0.jar
+++ b/mods/releaserewards-neoforge-2.2.0.jar
--- a/mods/sophisticatedbackpacks-1.21.1-3.24.20.1306.jar
+++ b/mods/sophisticatedbackpacks-1.21.1-3.24.20.1306.jar
--- a/mods/sophisticatedbackpacks-1.21.1-3.24.3.1216.jar
+++ b/mods/sophisticatedbackpacks-1.21.1-3.24.3.1216.jar
--- a/Show More
+++ b/Show More