Andrew Steinborn 5ff36f1ae7 Merge branch 'master' into plugin-message-event ... # Conflicts: # proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BackendPlaySessionHandler.java # proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java		2018-09-16 02:35:38 -04:00
..
ap	Add plugin description	2018-08-21 23:13:25 +02:00
main/java/com/velocitypowered/api	Merge branch 'master' into plugin-message-event	2018-09-16 02:35:38 -04:00
test/java/com/velocitypowered/api/util	Convert into a multi-module project.	2018-07-31 16:12:41 -04:00