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
..
bedrock	Support 1.17-pre3 and Bedrock 1.17.0.58	2021-06-01 21:12:58 -04:00
languages@e1e8fd6c2b	Update MCProtocolLib + PacketLib (#2211)	2021-05-23 15:55:01 -04:00
mappings@bcb49d0e46	Update mappings submodule	2021-06-05 13:36:47 -04:00
config.yml	Merge remote-tracking branch 'origin/floodgate-2.0' into feature/1.17	2021-06-06 01:16:57 +02:00