Geyser/bootstrap
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
..
bungeecord Merge remote-tracking branch 'upstream/master' into feature/extensions 2022-08-02 00:01:05 -04:00
spigot Merge remote-tracking branch 'upstream/master' into feature/extensions 2022-08-02 00:01:05 -04:00
sponge Compiles; bump version 2022-07-27 16:38:51 -04:00
standalone Merge remote-tracking branch 'upstream/master' into feature/extensions 2022-08-02 00:01:05 -04:00
velocity Merge remote-tracking branch 'upstream/master' into feature/extensions 2022-08-02 00:01:05 -04:00