Tim203 d4ecd2bd72 Merge remote-tracking branch 'origin/master' into feature/cumulus-1.1 ... # Conflicts: # ap/pom.xml # api/base/pom.xml # api/geyser/pom.xml # api/pom.xml # bootstrap/bungeecord/pom.xml # bootstrap/pom.xml # bootstrap/spigot/pom.xml # bootstrap/sponge/pom.xml # bootstrap/standalone/pom.xml # bootstrap/velocity/pom.xml # common/pom.xml # core/pom.xml # core/src/main/java/org/geysermc/geyser/session/cache/AdvancementsCache.java # core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCustomPayloadTranslator.java # core/src/main/java/org/geysermc/geyser/util/LoginEncryptionUtils.java # pom.xml		2022-05-28 17:09:20 +02:00
..
geysermc	Merge remote-tracking branch 'origin/master' into feature/cumulus-1.1	2022-05-28 17:09:20 +02:00