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

..

gradle/wrapper

port to 1.18

2021-12-03 22:37:35 +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

some mod integration fixes

2022-01-08 17:29:56 +01:00