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
..
java/com/velocitypowered/proxy	Merge branch 'dev/1.1.0' into future/1.16-velocity-1.1.0	2020-06-21 13:40:19 -04:00
resources	Update TerminalConsoleAppender to 1.2.0	2019-07-21 16:51:08 +02:00