Tim203 cd13e03730 Merge remote-tracking branch 'origin/master' into floodgate-2.0 ...

# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
#	connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockNetworkStackLatencyTranslator.java
#	connector/src/main/java/org/geysermc/connector/network/translators/java/JavaJoinGameTranslator.java
#	connector/src/main/java/org/geysermc/connector/utils/SettingsUtils.java

2020-12-15 22:06:59 +01:00

..

bungeecord

Merge remote-tracking branch 'origin/master' into floodgate-2.0

2020-12-15 22:06:59 +01:00

spigot

Merge remote-tracking branch 'origin/master' into floodgate-2.0

2020-12-15 22:06:59 +01:00

sponge

Added IGeyserPingPassthrough#getPingInformation(InetSocketAddress) to make logging of the pinging IPs possible (#1633)

2020-12-07 14:04:50 -05:00

standalone

GUI: Don't exit if there is a config error (#1600)

2020-11-27 18:55:33 -05:00

velocity

Fix Netty dependency usage on Velocity (#1672)

2020-12-13 23:03:11 -05:00

pom.xml

Update to Bedrock 1.16.100 (#1552)

2020-11-17 11:03:12 -06:00