Andrew Steinborn b1b3882fab Merge branch 'Xernium-future/1.17' into dev/3.0.0 ...

# Conflicts:
#	api/src/main/java/com/velocitypowered/api/proxy/ProxyServer.java
#	proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java

2021-06-06 03:48:49 -04:00

..

src

Merge branch 'Xernium-future/1.17' into dev/3.0.0

2021-06-06 03:48:49 -04:00

build.gradle

We don't rely on kyori/event any more

2021-05-23 15:52:09 -04:00