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

Browse Source

# Conflicts:
#	mods/iris-neoforge-1.8.12+mc1.21.1.jar
#	mods/iris-neoforge-1.8.12+mc1.21.1.jar.disable
#	mods/iris-neoforge-1.8.12+mc1.21.1.jar.disabled

...

This commit is contained in:

SFKao committed 2026-05-17 18:27:58 +02:00

2 parents 776f95d4d7 66448032a1

commit c17e549f34

5 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

mods/create-1.21.1-6.0.10-with-random-patch.jar

BIN

Binary file not shown.

mods/create-1.21.1-6.0.10.jar → mods/create-1.21.1-6.0.10.jar.disable

File renamed without changes.

mods/iris-neoforge-1.8.12+mc1.21.1.jar.disable → mods/iris-neoforge-1.8.12+mc1.21.1.jar.disabled

File renamed without changes.

mods/watermedia-2.1.37.jar → mods/watermedia-2.1.37.jar.clientonly

File renamed without changes.

mods/watermedia_youtube_plugin-2.1.2.jar → mods/watermedia_youtube_plugin-2.1.2.jar.clientonly

File renamed without changes.