Geyser/bootstrap/spigot
Tim203 1ded2086e3
Merge remote-tracking branch 'origin/floodgate-2.0' into feature/1.17
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java
2021-06-06 01:16:57 +02:00
..
src/main Merge remote-tracking branch 'origin/floodgate-2.0' into feature/1.17 2021-06-06 01:16:57 +02:00
pom.xml Merge remote-tracking branch 'origin/floodgate-2.0' into feature/1.17 2021-06-06 01:16:57 +02:00