Tim203 3b9674ac29 Merge remote-tracking branch 'origin/master' into floodgate-2.0 ... # Conflicts: # connector/src/main/java/org/geysermc/connector/dump/BootstrapDumpInfo.java # connector/src/main/java/org/geysermc/connector/dump/DumpInfo.java # connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java # connector/src/main/java/org/geysermc/connector/network/translators/java/JavaJoinGameTranslator.java # connector/src/main/java/org/geysermc/connector/utils/SettingsUtils.java		2021-05-01 12:16:25 +02:00
..
src	Merge remote-tracking branch 'origin/master' into floodgate-2.0	2021-05-01 12:16:25 +02:00
pom.xml	Merge branch 'master' of https://github.com/GeyserMC/Geyser into floodgate-2.0	2021-04-06 00:52:09 -04:00