AJ Ferguson 9008036ee4 Merge remote-tracking branch 'remotes/upstream/master' into chunk-fix ... # Conflicts: # connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java # connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaChunkDataTranslator.java # connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java # connector/src/main/java/org/geysermc/connector/utils/Toolbox.java		2020-02-10 17:38:56 -09:00
..
src/main	Merge remote-tracking branch 'remotes/upstream/master' into chunk-fix	2020-02-10 17:38:56 -09:00
pom.xml	Add support for Minecraft 1.15.2 and fix kick with villager (Fixes #138)	2020-01-22 20:28:08 -06:00