Merge remote-tracking branch 'PixelsV3/PixelatedDev' into PixelatedDev

Browse Source

# Conflicts:
#	core/src/main/java/com/volmit/iris/core/pregenerator/TurboPregenerator.java

...

This commit is contained in:

RePixelatedMC committed 2023-12-30 14:31:22 +01:00

2 parents 8ec1ac9875 9421d788f3

commit 02c7ab71d4

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

Diff Content Not Available