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
..
bedrock	Set 1.16.220 as the default Geyser version and fix crafting (#2108)	2021-04-08 19:32:06 -04:00
languages@e1e8fd6c2b	Update MCProtocolLib + PacketLib (#2211)	2021-05-23 15:55:01 -04:00
mappings@53e13b7a0d	Interact with an optional resource pack to add more features (#2176)	2021-05-10 00:48:01 -04:00
config.yml	Merge remote-tracking branch 'origin/master' into floodgate-2.0	2021-05-01 12:16:25 +02:00