Tim203 dab61ac41a Merge remote-tracking branch 'origin/master' into feature/floodgate-merge ... # Conflicts: # bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java # bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java # core/src/main/java/org/geysermc/geyser/configuration/GeyserConfiguration.java # core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCustomPayloadTranslator.java # core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginTranslator.java		2023-10-12 21:10:01 +02:00
..
main	Merge remote-tracking branch 'origin/master' into feature/floodgate-merge	2023-10-12 21:10:01 +02:00