Geyser/bootstrap/spigot
Tim203 5b317ec595
Merge remote-tracking branch 'origin/master' into floodgate-2.0
# Conflicts:
#	bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeeConfiguration.java
#	bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotConfiguration.java
#	connector/src/main/java/org/geysermc/connector/GeyserConnector.java
#	connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
2020-09-19 14:40:12 +02:00
..
src/main Merge remote-tracking branch 'origin/master' into floodgate-2.0 2020-09-19 14:40:12 +02:00
pom.xml Update to 1.16.3 (#1272) 2020-09-10 10:30:56 -05:00