Andrew Steinborn e32fc42aaf Merge branch 'dev/1.1.0' into dev/2.0.0 ... # Conflicts: # api/src/main/java/com/velocitypowered/api/command/CommandManager.java		2020-10-22 03:02:50 -04:00
..
java/com/velocitypowered/proxy	Merge branch 'dev/1.1.0' into dev/2.0.0	2020-10-22 03:02:50 -04:00
resources	Revert #338	2020-08-22 02:40:35 -04:00