Jozufozu 6fc8d8dcdb Merge branch '1.20.1/dev' into 1.21.1/dev ... # Conflicts: # neoforge/build.gradle.kts # vanillinNeoForge/build.gradle.kts		2025-01-21 17:26:30 -06:00
..
src	Merge remote-tracking branch 'upstream/1.20.1/dev' into feat/multi-loader-1.21	2025-01-17 19:46:01 -05:00
build.gradle.kts	Merge branch '1.20.1/dev' into 1.21.1/dev	2025-01-21 17:26:30 -06:00
gradle.properties	Minor clean up and fixes	2024-05-17 08:43:56 -07:00