RednedEpic 43f23674d6 Merge branch 'master' into feature/extensions ... # 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/configuration/GeyserJacksonConfiguration.java # core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java # core/src/main/java/org/geysermc/geyser/session/GeyserSession.java # core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockFilterTextTranslator.java # pom.xml		2022-04-24 11:23:26 -05:00
..
main	Merge branch 'master' into feature/extensions	2022-04-24 11:23:26 -05:00
test/java/org/geysermc/geyser	We're in 2022 now	2022-01-01 20:03:05 +01:00