Skip to content

fabric-20.2.361

Compare
Choose a tag to compare
@spiralhalo spiralhalo released this 05 Jun 07:32
Merge remote-tracking branch 'origin/1.20.1' into 1.20.2

# Conflicts:
#	common/src/main/java/io/vram/frex/mixin/MixinSpriteSourceList.java
#	fabric/build.gradle
#	fabric/src/main/resources/fabric.mod.json
#	fabric/src/main/resources/frex.common.json
#	gradle/wrapper/gradle-wrapper.properties
#	gruntle.sh
#	gruntle_common.gradle
#	project_common.gradle