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

# Conflicts: # mods/ImmediatelyFast-NeoForge-1.6.2+1.21.1.jar # mods/watermedia-2.1.22.jar
2025-03-20 19:47:46 +01:00 · 2025-03-20 19:47:46 +01:00 · 516901ae85
commit 516901ae85
parent 58c6302bb7 0c4e32d68f
20 changed files with 0 additions and 0 deletions
--- a/mods/Cobblemon_MegaShowdown-6.5.0-beta-hotfix-neoforge.jar
+++ b/mods/Cobblemon_MegaShowdown-6.5.0-beta-hotfix-neoforge.jar
--- a/mods/Cobblemon_MegaShowdown-7.0.0-release-neoforge.jar
+++ b/mods/Cobblemon_MegaShowdown-7.0.0-release-neoforge.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/artifacts-neoforge-12.1.0.jar
+++ b/mods/artifacts-neoforge-12.1.0.jar
--- a/mods/balm-neoforge-1.21.1-21.0.33.jar
+++ b/mods/balm-neoforge-1.21.1-21.0.33.jar
--- a/mods/charta-1.0.4-neoforge.jar
+++ b/mods/charta-1.0.4-neoforge.jar
--- a/mods/fusion-1.2.5-neoforge-mc1.21.jar
+++ b/mods/fusion-1.2.5-neoforge-mc1.21.jar
--- a/mods/fzzy_config-0.6.6+1.21+neoforge.jar
+++ b/mods/fzzy_config-0.6.6+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/immersive_aircraft-1.2.2+1.21.1-neoforge.jar
+++ b/mods/immersive_aircraft-1.2.2+1.21.1-neoforge.jar
--- a/mods/journeymap-neoforge-1.21.1-6.0.0-beta.41.jar
+++ b/mods/journeymap-neoforge-1.21.1-6.0.0-beta.41.jar
--- a/mods/journeymap-webmap-neoforge-1.21.4-1.0.3.jar
+++ b/mods/journeymap-webmap-neoforge-1.21.4-1.0.3.jar
--- a/mods/lctech-1.21-0.2.1.15a.jar
+++ b/mods/lctech-1.21-0.2.1.15a.jar
--- a/mods/lightmanscurrency-1.21-2.2.4.5.jar
+++ b/mods/lightmanscurrency-1.21-2.2.4.5.jar
--- a/mods/man_of_many_planes-0.2.1+1.21.1-neoforge.jar
+++ b/mods/man_of_many_planes-0.2.1+1.21.1-neoforge.jar
--- a/mods/owo-lib-neoforge-0.12.15.1-beta.2+1.21.jar
+++ b/mods/owo-lib-neoforge-0.12.15.1-beta.2+1.21.jar
--- a/mods/sophisticatedbackpacks-1.21.1-3.24.1.1212.jar
+++ b/mods/sophisticatedbackpacks-1.21.1-3.24.1.1212.jar
--- a/mods/sophisticatedcore-1.21.1-1.3.3.903.jar
+++ b/mods/sophisticatedcore-1.21.1-1.3.3.903.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/waystones-neoforge-1.21.1-21.1.13.jar
+++ b/mods/waystones-neoforge-1.21.1-21.1.13.jar