Tim203 cd13e03730 Merge remote-tracking branch 'origin/master' into floodgate-2.0 ... # Conflicts: # connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java # connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockNetworkStackLatencyTranslator.java # connector/src/main/java/org/geysermc/connector/network/translators/java/JavaJoinGameTranslator.java # connector/src/main/java/org/geysermc/connector/utils/SettingsUtils.java		2020-12-15 22:06:59 +01:00
..
org/geysermc/platform/bungeecord	Merge remote-tracking branch 'origin/master' into floodgate-2.0	2020-12-15 22:06:59 +01:00