TheMode 14879636f1 Merge branch 'master' into new-block-api ... # Conflicts: # .gitignore # build.gradle # code-generators/build.gradle # code-generators/src/main/java/net/minestom/codegen/Generators.java # code-generators/src/main/java/net/minestom/codegen/MinestomCodeGenerator.java # code-generators/src/main/java/net/minestom/codegen/blocks/BlockGenerator.java # gradle.properties # src/autogenerated/java/net/minestom/server/instance/block/Block.java # src/autogenerated/java/net/minestom/server/registry/Registries.java # src/generators/java/net/minestom/codegen/AllGenerators.java # src/generators/java/net/minestom/codegen/RegistriesGenerator.java # src/generators/java/net/minestom/codegen/items/ItemEnumGenerator.java # src/main/java/net/minestom/server/entity/Player.java		2021-06-10 16:05:19 +02:00
..
entity	Use minestom-data to generate our enums.	2021-06-03 12:11:42 +02:00
fluid	Use minestom-data to generate our enums.	2021-06-03 12:11:42 +02:00
instance/block	Remove jang lang import.	2021-06-04 08:51:40 +02:00
item	Use minestom-data to generate our enums.	2021-06-03 12:11:42 +02:00
particle	Use minestom-data to generate our enums.	2021-06-03 12:11:42 +02:00
potion	Make sure we stay in the potion ID range.	2021-06-07 17:36:29 +02:00
registry	Use minestom-data to generate our enums.	2021-06-03 12:11:42 +02:00
sound	Use minestom-data to generate our enums.	2021-06-03 12:11:42 +02:00
statistic	Use minestom-data to generate our enums.	2021-06-03 12:11:42 +02:00