TheMode 911c983957 Merge branch 'master' into event-api ... # Conflicts: # src/main/java/net/minestom/server/entity/Player.java # src/main/java/net/minestom/server/event/player/UpdateTagListEvent.java # src/main/java/net/minestom/server/instance/Chunk.java		2021-06-14 00:11:41 +02:00
..
java	Merge branch 'master' into event-api	2021-06-14 00:11:41 +02:00
resources	Fix extension subdependencies not being loaded + Test that J9 modules are supported	2021-02-04 20:40:12 +01:00