IThundxr 42290b207f Merge remote-tracking branch 'upstream/1.20/dev' into feat/multi-loader-1.21 ... # Conflicts: # buildSrc/build.gradle.kts # buildSrc/src/main/kotlin/dev/engine_room/gradle/subproject/SubprojectPlugin.kt # forge/build.gradle.kts # gradle.properties # gradle/wrapper/gradle-wrapper.properties		2024-09-14 08:57:52 -04:00
..
src	Merge remote-tracking branch 'upstream/1.20/dev' into feat/multi-loader-1.21	2024-09-14 08:57:52 -04:00
build.gradle.kts	Use better method for telling loom to remap api artifacts	2024-05-17 08:43:56 -07:00