TheMode de22a76e9f Merge branch 'master' into new-block-api ... # Conflicts: # build.gradle		2021-06-17 13:58:01 +02:00
..
src/main/java/net/minestom/codegen	Update BlockGenerator and add the 1.17 blocks.	2021-06-11 17:47:26 +02:00
build.gradle	Fix dependency	2021-06-17 12:23:16 +02:00
minestom_checks.xml	Fix jitpack build (hopefully)	2021-06-06 14:54:01 +02:00