GeyserMC/bootstrap/velocity
Tim203 776fc4e933
Merge remote-tracking branch 'origin/master' into floodgate-2.0
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/GeyserConnector.java
#	connector/src/main/java/org/geysermc/connector/utils/SettingsUtils.java
2021-05-26 02:17:33 +02:00
..
src/main/java/org/geysermc/platform/velocity Send message to Java if command is Bedrock-only (#1834) 2021-01-16 22:18:13 -05:00
pom.xml Merge remote-tracking branch 'origin/master' into floodgate-2.0 2021-05-26 02:17:33 +02:00