Tim203 107cd5bd5a Merge remote-tracking branch 'origin/master' into floodgate-2.0 ... # Conflicts: # connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java		2021-03-23 01:35:02 +01:00
..
java/org/geysermc/platform/spigot	Merge remote-tracking branch 'origin/master' into floodgate-2.0	2021-03-23 01:35:02 +01:00
resources	Fixes issue when both Geyser and Floodgate are on the same server	2021-02-25 20:55:00 +01:00