themode 60d17175e6 Merge branch 'master' into gen-api ... # Conflicts: # demo/src/main/java/net/minestom/demo/PlayerInit.java # gradle/libs.versions.toml # src/main/java/net/minestom/server/entity/Player.java # src/main/java/net/minestom/server/instance/AnvilLoader.java # src/main/java/net/minestom/server/instance/DynamicChunk.java # src/main/java/net/minestom/server/instance/Instance.java # src/main/java/net/minestom/server/instance/InstanceContainer.java # src/main/java/net/minestom/server/instance/Section.java # src/main/java/net/minestom/server/instance/palette/PaletteImpl.java # src/main/java/net/minestom/server/world/DimensionType.java		2022-01-12 10:17:26 +01:00
..
src/main/java/net/minestom/demo	Merge branch 'master' into gen-api	2022-01-12 10:17:26 +01:00
build.gradle.kts	Change shadowJar archive name	2022-01-10 16:51:21 +01:00