Flemmli97 df3f4eb088 Merge remote-tracking branch 'origin/1.18-dev' into 1.18 ... # Conflicts: # forge/src/main/java/io/github/flemmli97/flan/forgeevent/BlockInteractEventsForge.java		2022-01-30 18:33:53 +01:00
..
src/main	Merge remote-tracking branch 'origin/1.18-dev' into 1.18	2022-01-30 18:33:53 +01:00
build.gradle	update versions to 1.18.1	2022-01-09 16:19:50 +01:00
gradle.properties	architectury	2021-06-11 20:33:10 +02:00