Andrew Steinborn
|
a4e91793ca
|
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
# build.gradle
# proxy/src/main/java/com/velocitypowered/proxy/command/builtin/VelocityCommand.java
# proxy/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java
# proxy/src/main/java/com/velocitypowered/proxy/connection/client/StatusSessionHandler.java
# proxy/src/main/java/com/velocitypowered/proxy/network/pipeline/MinecraftCompressEncoder.java
# proxy/src/main/java/com/velocitypowered/proxy/network/pipeline/MinecraftCompressorAndLengthEncoder.java
# proxy/src/test/java/com/velocitypowered/proxy/command/CommandManagerTests.java
|
2021-05-09 03:51:54 -04:00 |
|