Andrew Steinborn 62d3f61a77 Merge branch 'dev/1.1.0' into decode-multiple ... # Conflicts: # proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java		2020-05-25 13:27:44 -04:00
..
main	Merge branch 'dev/1.1.0' into decode-multiple	2020-05-25 13:27:44 -04:00
test/java/com/velocitypowered/proxy	Fix regressions with plugin dependency loading from #272	2020-02-16 03:19:13 -05:00