Andrew Steinborn a083dfd3a4 Merge branch 'master' into reload-command ...

# Conflicts:
#	proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java

2018-11-24 21:41:12 -05:00

..

java/com/velocitypowered/proxy

Merge branch 'master' into reload-command

2018-11-24 21:41:12 -05:00

resources

Reformat with Google code style and enforce Checkstyle.

2018-10-27 23:45:36 -04:00