Merge branch 'main' into server

# Conflicts: # mods/ImmediatelyFast-NeoForge-1.6.5+1.21.1.jar # mods/watermedia-2.1.23.jar
Revert "CAMBIADO FORGE VERSION, MIRAR GIT PARA COMO CAMBIARLO"
2025-08-18 14:56:20 +02:00 · 2025-08-18 14:55:07 +02:00
78 changed files with 0 additions and 0 deletions
--- a/datapacks/AllTheMons
+++ b/datapacks/AllTheMons
--- 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/Cobblemon_MegaShowdown-8.2.1-release-neoforge.jar
+++ b/mods/Cobblemon_MegaShowdown-8.2.1-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/FarmersDelight-1.21.1-1.2.7.jar
+++ b/mods/FarmersDelight-1.21.1-1.2.7.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.1.jar
+++ b/mods/Powah-6.2.1.jar
--- a/mods/PuzzlesLib-v21.1.33-1.21.1-NeoForge.jar
+++ b/mods/PuzzlesLib-v21.1.33-1.21.1-NeoForge.jar
--- a/mods/SimpleTMs-neoforge-2.0.3.jar
+++ b/mods/SimpleTMs-neoforge-2.0.3.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.4.jar
+++ b/mods/YungsApi-1.21.1-NeoForge-5.1.4.jar
--- a/mods/YungsBetterNetherFortresses-1.21.1-NeoForge-3.1.4.jar
+++ b/mods/YungsBetterNetherFortresses-1.21.1-NeoForge-3.1.4.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/appleskin-neoforge-mc1.21-3.0.5.jar
+++ b/mods/appleskin-neoforge-mc1.21-3.0.5.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.1.jar
+++ b/mods/athena-neoforge-1.21-4.0.1.jar
--- a/mods/badgebox-neoforge-1.2.5.jar
+++ b/mods/badgebox-neoforge-1.2.5.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.2.jar
+++ b/mods/cobblemonintegrations-neoforge-1.21.1-1.1.2.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.3+1.21.1.jar
+++ b/mods/comforts-neoforge-9.0.3+1.21.1.jar
--- a/mods/connector-2.0.0-beta.7+1.21.1-full.jar
+++ b/mods/connector-2.0.0-beta.7+1.21.1-full.jar
--- a/mods/create-1.21.1-6.0.4.jar
+++ b/mods/create-1.21.1-6.0.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/dynamic-fps-3.9.2+minecraft-1.21.0-neoforge.jar
+++ b/mods/dynamic-fps-3.9.2+minecraft-1.21.0-neoforge.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/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.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/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.24.jar
+++ b/mods/gravestone-neoforge-1.21.1-1.0.24.jar
--- a/mods/guideme-21.1.14.jar
+++ b/mods/guideme-21.1.14.jar
--- a/mods/immersive_aircraft-1.2.2+1.21.1-neoforge.jar
+++ b/mods/immersive_aircraft-1.2.2+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.21.0.247.jar
+++ b/mods/jei-1.21.1-neoforge-19.21.0.247.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.6.jar
+++ b/mods/journeymap-webmap-neoforge-1.21.4-1.0.6.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/merequester-neoforge-1.21.1-1.1.8.jar
+++ b/mods/merequester-neoforge-1.21.1-1.1.8.jar
--- a/mods/modernfix-neoforge-5.20.2+mc1.21.1.jar
+++ b/mods/modernfix-neoforge-5.20.2+mc1.21.1.jar
--- a/mods/moredelight-25.01.13a-1.21-neoforge.jar
+++ b/mods/moredelight-25.01.13a-1.21-neoforge.jar
--- a/mods/oritech-neoforge-0.14.5.jar
+++ b/mods/oritech-neoforge-0.14.5.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/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.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/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/mods/waterframes-NEOFORGE-mc1.21.1-v2.1.14.jar
+++ b/mods/waterframes-NEOFORGE-mc1.21.1-v2.1.14.jar
--- a/mods/waystones-neoforge-1.21.1-21.1.13.jar
+++ b/mods/waystones-neoforge-1.21.1-21.1.13.jar
--- a/mods/wthit-neo-12.5.1.jar
+++ b/mods/wthit-neo-12.5.1.jar
--- a/resourcepacks/sus_sand_1.8.zip
+++ b/resourcepacks/sus_sand_1.8.zip
Author	SHA1	Message	Date
SFKao	e3cdbab634	Merge branch 'main' into server # Conflicts: # mods/ImmediatelyFast-NeoForge-1.6.5+1.21.1.jar # mods/watermedia-2.1.23.jar	2025-08-18 14:56:20 +02:00
SFKao	ff9b59bb07	Revert "CAMBIADO FORGE VERSION, MIRAR GIT PARA COMO CAMBIARLO" This reverts commit 3e83a0e0500db79cdd4d93391c63b7eed2f03558.	2025-08-18 14:55:07 +02:00