Andrew Steinborn 91743aaa9d Merge branch 'dev/1.1.0' into future/1.16-velocity-1.1.0 ...

# Conflicts:
#	proxy/build.gradle

2020-06-21 13:40:19 -04:00

..

main

Merge branch 'dev/1.1.0' into future/1.16-velocity-1.1.0

2020-06-21 13:40:19 -04:00

test/java/com/velocitypowered/proxy

Fix regressions with plugin dependency loading from #272

2020-02-16 03:19:13 -05:00