Tim203 b8f398aa3c 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/network/translators/java/JavaJoinGameTranslator.java		2020-11-18 19:45:25 +01:00
..
bedrock	Update to Bedrock 1.16.100 (#1552)	2020-11-17 11:03:12 -06:00
languages@bf4b0b7103	Add support for passing config options as arguments (#1506)	2020-11-07 13:17:17 -06:00
mappings@618a9b9813	Fix regressions from 1.16.100 (#1558)	2020-11-18 01:10:49 -05:00
config.yml	Merge remote-tracking branch 'origin/master' into floodgate-2.0	2020-11-18 19:45:25 +01:00