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

Browse Source

# Conflicts:
#	mods/ImmediatelyFast-NeoForge-1.6.5+1.21.1.jar

...

This commit is contained in:

SFKao committed 2025-04-06 13:05:23 +02:00

2 parents 7fd57a4a24 503b623df3

commit fc93ed868b

28 files changed

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

datapacks/Cobblemon Utility+ Recipes 1.5.zip

BIN

Binary file not shown.

mods/Cobblemon-Utility+-neoforge-1.5.jar

BIN

Binary file not shown.

mods/Cobblemon_MegaShowdown-8.2.0-release-neoforge.jar → mods/Cobblemon_MegaShowdown-8.2.1-release-neoforge.jar

BIN

Binary file not shown.

mods/Controlling-neoforge-1.21.1-19.0.4.jar → mods/Controlling-neoforge-1.21.1-19.0.5.jar

BIN

Binary file not shown.

mods/CreativeCore_NEOFORGE_v2.12.32_mc1.21.1.jar

BIN

Binary file not shown.

mods/CreativeCore_NEOFORGE_v2.13.0_mc1.21.1.jar

BIN

Binary file not shown.

mods/LittleTiles_BETA_v1.6.0-pre157_mc1.21.1.jar → mods/LittleTiles_BETA_v1.6.0-pre158_mc1.21.1.jar

BIN

Binary file not shown.

mods/appliedenergistics2-19.2.6-beta.jar → mods/appliedenergistics2-19.2.7.jar

BIN

Binary file not shown.

mods/artifacts-neoforge-12.1.2.jar → mods/artifacts-neoforge-12.1.4.jar

BIN

Binary file not shown.

mods/curios-neoforge-9.4.0+1.21.1.jar → mods/curios-neoforge-9.4.1+1.21.1.jar

BIN

Binary file not shown.

mods/easy-villagers-neoforge-1.21.1-1.1.23.jar → mods/easy-villagers-neoforge-1.21.1-1.1.24.jar

BIN

Binary file not shown.

mods/emi-1.1.20+1.21.1+neoforge.jar → mods/emi-1.1.21+1.21.1+neoforge.jar

BIN

Binary file not shown.

mods/farmersexpanse-0.0.6.jar

BIN

Binary file not shown.

mods/farmersexpanse-0.0.7b.jar

BIN

Binary file not shown.

mods/forgified-fabric-api-0.107.0+2.0.25+1.21.1.jar → mods/forgified-fabric-api-0.107.0+2.0.26+1.21.1.jar

BIN

Binary file not shown.

mods/fzzy_config-0.6.7+1.21+neoforge.jar → mods/fzzy_config-0.6.8+1.21+neoforge.jar

BIN

Binary file not shown.

mods/guideme-21.1.6.jar → mods/guideme-21.1.7.jar

BIN

Binary file not shown.

mods/journeymap-neoforge-1.21.1-6.0.0-beta.43.jar → mods/journeymap-neoforge-1.21.1-6.0.0-beta.44.jar

BIN

Binary file not shown.

mods/journeymap-webmap-neoforge-1.21.4-1.0.3.jar → mods/journeymap-webmap-neoforge-1.21.4-1.0.6.jar

BIN

Binary file not shown.

mods/lctech-1.21-0.2.1.15a.jar → mods/lctech-1.21-0.2.1.16a.jar

BIN

Binary file not shown.

mods/lightmanscurrency-1.21-2.2.4.5.jar → mods/lightmanscurrency-1.21-2.2.5.0.jar

BIN

Binary file not shown.

mods/polymorph-neoforge-1.0.7+1.21.1.jar → mods/polymorph-neoforge-1.0.8+1.21.1.jar

BIN

Binary file not shown.

mods/releaserewards-neoforge-2.1.0.jar

BIN

Binary file not shown.

mods/sodium-neoforge-0.6.9+mc1.21.1.jar → mods/sodium-neoforge-0.6.13+mc1.21.1.jar

BIN

Binary file not shown.

mods/sophisticatedbackpacks-1.21.1-3.24.1.1212.jar → mods/sophisticatedbackpacks-1.21.1-3.24.3.1216.jar

BIN

Binary file not shown.

mods/sophisticatedcore-1.21.1-1.3.4.904.jar → mods/sophisticatedcore-1.21.1-1.3.19.935.jar

BIN

Binary file not shown.

mods/waterframes-NEOFORGE-mc1.21.1-v2.1.12.jar

BIN

Binary file not shown.

mods/waterframes-NEOFORGE-mc1.21.1-v2.1.14.jar

BIN

Binary file not shown.