GeyserMC/bootstrap
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
..
bungeecord Merge remote-tracking branch 'origin/master' into floodgate-2.0 2021-05-26 02:17:33 +02:00
spigot Merge remote-tracking branch 'origin/master' into floodgate-2.0 2021-05-26 02:17:33 +02:00
sponge 1.16.220 support (#2105) 2021-04-06 00:14:06 -04:00
standalone 1.16.220 support (#2105) 2021-04-06 00:14:06 -04:00
velocity Merge remote-tracking branch 'origin/master' into floodgate-2.0 2021-05-26 02:17:33 +02:00
pom.xml 1.16.220 support (#2105) 2021-04-06 00:14:06 -04:00