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
..
java/io/github/flemmli97/flan	Merge remote-tracking branch 'origin/1.18-dev' into 1.18	2022-01-30 18:33:53 +01:00
resources	separate block and item-on-block interaction again cause it causing issues but still use the callback	2022-01-12 18:34:19 +01:00