Geyser/bootstrap/spigot
Tim203 b8f398aa3c
Merge remote-tracking branch 'origin/master' into floodgate-2.0
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/GeyserConnector.java
#	connector/src/main/java/org/geysermc/connector/network/translators/java/JavaJoinGameTranslator.java
2020-11-18 19:45:25 +01:00
..
src/main Merge remote-tracking branch 'origin/master' into floodgate-2.0 2020-11-18 19:45:25 +01:00
pom.xml Update to Bedrock 1.16.100 (#1552) 2020-11-17 11:03:12 -06:00