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
..
api/java/dev/engine_room/flywheel/api	Merge remote-tracking branch 'upstream/1.20/dev' into feat/multi-loader-1.21	2024-09-14 08:57:52 -04:00
backend	Merge remote-tracking branch 'upstream/1.20/dev' into feat/multi-loader-1.21	2024-08-22 20:30:26 -04:00
lib	Merge remote-tracking branch 'upstream/1.20/dev' into feat/multi-loader-1.21	2024-09-14 08:57:52 -04:00
main	Merge remote-tracking branch 'upstream/1.20/dev' into feat/multi-loader-1.21	2024-08-22 20:30:26 -04:00
test/java/dev/engine_room/flywheel	Formalize most public API (#253)	2024-07-26 14:21:35 -06:00