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

Merge remote-tracking branch 'origin/sho-create'
# Conflicts: # mods/balm-neoforge-1.21.1-21.0.49.jar
2025-08-18 18:36:22 +02:00 · 2025-08-18 18:35:54 +02:00 · 2025-08-18 18:34:32 +02:00 · 2025-08-18 18:31:09 +02:00 · 2025-08-18 18:26:16 +02:00 · 2025-08-18 18:23:38 +02:00
14 changed files with 0 additions and 0 deletions
--- 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/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/SimpleTMs-neoforge-2.1.2.jar
+++ b/mods/SimpleTMs-neoforge-2.1.2.jar
--- a/mods/badgebox-neoforge-1.3.0.jar
+++ b/mods/badgebox-neoforge-1.3.0.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/jei-1.21.1-neoforge-19.22.1.316.jar
+++ b/mods/jei-1.21.1-neoforge-19.22.1.316.jar
--- a/mods/releaserewards-neoforge-2.2.0.jar
+++ b/mods/releaserewards-neoforge-2.2.0.jar
Author	SHA1	Message	Date
SFKao	8109d6f937	Merge remote-tracking branch 'origin/main' into server	2025-08-18 18:36:22 +02:00
SFKao	b13d4a1fa5	Merge remote-tracking branch 'origin/sho-create' # Conflicts: # mods/balm-neoforge-1.21.1-21.0.49.jar	2025-08-18 18:35:54 +02:00
Eloy Garcia	f09fdee961	AllTheMons	2025-08-18 18:34:32 +02:00
Eloy Garcia	04db45b050	Cobble Addons	2025-08-18 18:31:09 +02:00
Eloy Garcia	5a8c892f75	Mega Showdown	2025-08-18 18:26:16 +02:00
Eloy Garcia	f678ae2586	Parting Gifts	2025-08-18 18:23:38 +02:00
Eloy Garcia	0fd15ea8bc	Ride On	2025-08-18 18:20:28 +02:00
Eloy Garcia	667b3772c6	SimpleTMs	2025-08-18 18:14:43 +02:00