Andrew Steinborn ada35ff286 Merge branch 'Xernium-future/1.16' into future/1.16-velocity-1.1.0 ... # Conflicts: # .travis.yml # api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java # build.gradle # proxy/build.gradle # proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java # proxy/src/main/java/com/velocitypowered/proxy/connection/backend/VelocityServerConnection.java # proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java # proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java # proxy/src/main/java/com/velocitypowered/proxy/network/netty/DiscardHandler.java # proxy/src/main/java/com/velocitypowered/proxy/protocol/ProtocolUtils.java # proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java # proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftCompressDecoder.java # proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftDecoder.java # proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/JoinGame.java # proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/Respawn.java # proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/ServerLoginSuccess.java # proxy/src/test/java/com/velocitypowered/proxy/plugin/util/PluginDependencyUtilsTest.java		2020-06-20 23:24:32 -04:00
..
java/com/velocitypowered/proxy	Merge branch 'Xernium-future/1.16' into future/1.16-velocity-1.1.0	2020-06-20 23:24:32 -04:00
resources	Update TerminalConsoleAppender to 1.2.0	2019-07-21 16:51:08 +02:00