Commit graph

5 commits

Author SHA1 Message Date
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
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
Jozufozu
df8c749033 Fix vanillin dependency type declarations 2025-01-21 15:01:49 -06:00
IThundxr
1b8668c910
h 2025-01-17 20:29:01 -05:00
IThundxr
73030c7456
more fixes 2025-01-17 20:22:26 -05:00