Tim203 776fc4e933 Merge remote-tracking branch 'origin/master' into floodgate-2.0 ... # Conflicts: # connector/src/main/java/org/geysermc/connector/GeyserConnector.java # connector/src/main/java/org/geysermc/connector/utils/SettingsUtils.java		2021-05-26 02:17:33 +02:00
..
java/org/geysermc/platform/spigot	Merge remote-tracking branch 'origin/master' into floodgate-2.0	2021-05-26 02:17:33 +02:00
resources	Fixes issue when both Geyser and Floodgate are on the same server	2021-02-25 20:55:00 +01:00