Tim203 4229db0a2f Merge remote-tracking branch 'origin/server-inventory' into floodgate-2.0 ... # Conflicts: # connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java		2021-03-10 20:46:50 +01:00
..
bedrock	1.16.210 support (#2019)	2021-03-09 12:51:48 -05:00
languages@3d3b60de72	Update languages submodule (#2002)	2021-03-06 13:35:17 -05:00
mappings@216e900867	Merge branch 'master' of https://github.com/GeyserMC/Geyser into server-inventory	2021-03-09 14:45:04 -05:00
config.yml	Merge remote-tracking branch 'origin/master' into floodgate-2.0	2021-02-25 02:28:48 +01:00