Konicai aee43e68fa Merge remote-tracking branch 'upstream/master' into feature/extensions ... # Conflicts: # ap/pom.xml # api/base/pom.xml # api/geyser/pom.xml # api/pom.xml # bootstrap/bungeecord/pom.xml # bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java # bootstrap/pom.xml # bootstrap/spigot/pom.xml # bootstrap/sponge/pom.xml # bootstrap/standalone/pom.xml # bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneBootstrap.java # bootstrap/velocity/pom.xml # common/pom.xml # core/pom.xml # core/src/main/java/org/geysermc/geyser/command/CommandManager.java # core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java # core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginTranslator.java # core/src/main/resources/languages # pom.xml		2022-08-02 00:01:05 -04:00
..
src/main	Merge remote-tracking branch 'upstream/master' into feature/extensions	2022-08-02 00:01:05 -04:00
build.gradle.kts	Custom item support for extensions (#2822)	2022-07-02 12:50:16 -04:00