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

# Conflicts: # mods/watermedia-2.1.23.jar
Updated mods
2025-03-27 20:11:42 +01:00 · 2025-03-27 20:10:32 +01:00
10 changed files with 0 additions and 0 deletions
--- a/mods/Cobblemon_MegaShowdown-8.1.0-release-neoforge.jar
+++ b/mods/Cobblemon_MegaShowdown-8.1.0-release-neoforge.jar
--- a/mods/artifacts-neoforge-12.1.1.jar
+++ b/mods/artifacts-neoforge-12.1.1.jar
--- a/mods/charta-1.0.5-neoforge.jar
+++ b/mods/charta-1.0.5-neoforge.jar
--- a/mods/curios-neoforge-9.4.0+1.21.1.jar
+++ b/mods/curios-neoforge-9.4.0+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/entityculling-neoforge-1.7.4-mc1.21.jar
+++ b/mods/entityculling-neoforge-1.7.4-mc1.21.jar
--- a/mods/journeymap-neoforge-1.21.1-6.0.0-beta.43.jar
+++ b/mods/journeymap-neoforge-1.21.1-6.0.0-beta.43.jar
--- a/mods/lootr-neoforge-1.21-1.10.35.91.jar
+++ b/mods/lootr-neoforge-1.21-1.10.35.91.jar
--- a/mods/resourcefullib-neoforge-1.21-3.0.12.jar
+++ b/mods/resourcefullib-neoforge-1.21-3.0.12.jar
--- a/mods/sophisticatedcore-1.21.1-1.3.4.904.jar
+++ b/mods/sophisticatedcore-1.21.1-1.3.4.904.jar
Author	SHA1	Message	Date
SFKao	beeb8d4874	Merge remote-tracking branch 'origin/main' into server # Conflicts: # mods/watermedia-2.1.23.jar	2025-03-27 20:11:42 +01:00
SFKao	cf22fcdfe7	Updated mods	2025-03-27 20:10:32 +01:00