Tim203 5ad2510b87 Merge remote-tracking branch 'origin/master' into floodgate-2.0 ... # Conflicts: # connector/src/main/java/org/geysermc/connector/command/defaults/SettingsCommand.java # connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java # connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java # connector/src/main/java/org/geysermc/connector/network/session/cache/WindowCache.java # connector/src/main/java/org/geysermc/connector/utils/LoginEncryptionUtils.java # connector/src/main/java/org/geysermc/connector/utils/StatisticsUtils.java		2021-02-01 12:02:49 +01:00
..
bungeecord	Merge remote-tracking branch 'origin/master' into floodgate-2.0	2021-02-01 12:02:49 +01:00
spigot	Merge remote-tracking branch 'origin/master' into floodgate-2.0	2021-02-01 12:02:49 +01:00
sponge	Send message to Java if command is Bedrock-only (#1834)	2021-01-16 22:18:13 -05:00
standalone	Send message to Java if command is Bedrock-only (#1834)	2021-01-16 22:18:13 -05:00
velocity	Send message to Java if command is Bedrock-only (#1834)	2021-01-16 22:18:13 -05:00
pom.xml	Update to Bedrock 1.16.100 (#1552)	2020-11-17 11:03:12 -06:00