Tim203 c16c66b860 Merge remote-tracking branch 'origin/master' into floodgate-2.0 ... # Conflicts: # connector/pom.xml # connector/src/main/java/org/geysermc/connector/GeyserConnector.java # 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/skin/SkinProvider.java # connector/src/main/java/org/geysermc/connector/utils/SettingsUtils.java		2021-02-25 02:28:48 +01:00
..
src/main	Merge remote-tracking branch 'origin/master' into floodgate-2.0	2021-02-25 02:28:48 +01:00
pom.xml	Fix several world-related errors on Spigot 1.12 (#1886)	2021-02-03 19:54:12 -05:00