Andrew Steinborn a5565847d1 Merge branch 'dev/1.1.0' into dev/2.0.0 ... # Conflicts: # proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java		2021-04-22 11:21:33 -04:00
..
src	Merge branch 'dev/1.1.0' into dev/2.0.0	2021-04-22 11:21:33 -04:00
build.gradle	Merge branch 'dev/1.1.0' into dev/2.0.0	2021-04-16 04:02:01 -04:00