Geyser/bootstrap
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
..
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/floodgate-2.0' into feature/1.17 2021-06-06 01:16:57 +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