Andrew Steinborn 35856fec04 Merge branch 'dev/1.1.0' into natives-java-improvements ...

# Conflicts:
#	native/src/main/java/com/velocitypowered/natives/encryption/JavaVelocityCipher.java

2019-09-07 00:06:13 -04:00

..

main

Merge branch 'dev/1.1.0' into natives-java-improvements

2019-09-07 00:06:13 -04:00

test/java/com/velocitypowered/proxy

Remove protocol linking (#212)

2019-06-02 19:44:23 -04:00