Merge branch '3.2.6' of https://github.com/RePixelatedMC/Iris into PixelatedDev

Browse Source

# Conflicts:
#	core/src/main/java/com/volmit/iris/core/commands/CommandIris.java
#	core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java

...

This commit is contained in:

RePixelatedMC 2024-04-19 15:16:46 +02:00

parent 9a45e0df10 bad547356c

commit 484fbeca7b

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

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

Diff Content Not Available