Jozufozu 1b0e327d7f Merge branch '1.20.1/dev' into 1.21.1/dev ... # Conflicts: # common/build.gradle.kts # gradle.properties # vanillinForge/src/main/java/dev/engine_room/vanillin/VanillinForge.java		2025-01-24 15:54:58 -06:00
..
src/main	Fix vanillin dependency type declarations	2025-01-21 15:01:49 -06:00
build.gradle.kts	Merge branch '1.20.1/dev' into 1.21.1/dev	2025-01-24 15:54:58 -06:00
gradle.properties	more fixes	2025-01-17 20:22:26 -05:00