Tim203 643098e09e Merge remote-tracking branch 'origin/master' into floodgate-2.0 ... # Conflicts: # 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/translators/bedrock/BedrockServerSettingsRequestTranslator.java		2021-03-10 20:42:37 +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-03-10 20:42:37 +01:00
sponge	[ci skip] Fixed if spacing (#1941)	2021-02-16 20:09:18 -05:00
standalone	Fix up some SpotBugs suggestions (#1911)	2021-02-16 16:25:46 -05:00
velocity	Send message to Java if command is Bedrock-only (#1834)	2021-01-16 22:18:13 -05:00
pom.xml	Remove MD-5 repository (#2007)	2021-03-06 13:18:54 -05:00