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

update mod metadata

2022-01-08 18:18:52 +01:00