Andrew Steinborn 699147c916 Merge branch 'dev/1.1.0' into dev/2.0.0 ... # Conflicts: # api/build.gradle # api/src/main/java/com/velocitypowered/api/proxy/connection/Player.java # api/src/main/java/com/velocitypowered/api/proxy/player/TabList.java # build.gradle # proxy/build.gradle # proxy/src/main/java/com/velocitypowered/proxy/Velocity.java # proxy/src/main/java/com/velocitypowered/proxy/command/CommandNodeFactory.java # proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BackendPlaySessionHandler.java # proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BungeeCordMessageResponder.java # proxy/src/main/java/com/velocitypowered/proxy/connection/backend/VelocityServerConnection.java # proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java # proxy/src/main/java/com/velocitypowered/proxy/network/packet/clientbound/ClientboundAvailableCommandsPacket.java # proxy/src/main/java/com/velocitypowered/proxy/network/packet/clientbound/ClientboundJoinGamePacket.java # proxy/src/main/java/com/velocitypowered/proxy/network/packet/clientbound/ClientboundRespawnPacket.java # proxy/src/main/java/com/velocitypowered/proxy/network/pipeline/MinecraftDecoder.java # proxy/src/main/java/com/velocitypowered/proxy/protocol/MinecraftPacket.java # proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/EncryptionResponse.java # proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/HeaderAndFooter.java # proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/LoginPluginMessage.java # proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/PluginMessage.java # proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/ServerLogin.java # proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/StatusPing.java # proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/StatusRequest.java # proxy/src/main/java/com/velocitypowered/proxy/tablist/VelocityTabList.java # proxy/src/main/java/com/velocitypowered/proxy/tablist/VelocityTabListLegacy.java # proxy/src/test/java/com/velocitypowered/proxy/command/CommandManagerTests.java		2021-02-21 17:56:40 -05:00
..
src	Merge branch 'dev/1.1.0' into dev/2.0.0	2021-02-21 17:56:40 -05:00
build.gradle	Merge branch 'dev/1.1.0' into dev/2.0.0	2021-02-21 17:56:40 -05:00