Merge remote-tracking branch 'origin/java_omega' into java_omega

# Conflicts:
#	build.gradle
#	coreSubProjects
#	fabric/build.gradle
#	forge/build.gradle
This commit is contained in:
Ran
2024-07-26 00:21:34 +10:00