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
..
java/com/velocitypowered/proxy	Merge branch 'dev/1.1.0' into decode-multiple	2020-05-25 13:27:44 -04:00
resources	Update TerminalConsoleAppender to 1.2.0	2019-07-21 16:51:08 +02:00