Andrew Steinborn c33f9e0466 Merge remote-tracking branch 'origin/dev/3.0.0' into dev/3.0.0 ... # Conflicts: # api/src/main/java/com/velocitypowered/api/proxy/Player.java # proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java		2021-06-12 20:13:52 -04:00
..
ap	Relicense the Velocity proxy under the terms of GPLv3 (#448)	2021-03-31 16:04:06 -04:00
main/java/com/velocitypowered/api	Merge remote-tracking branch 'origin/dev/3.0.0' into dev/3.0.0	2021-06-12 20:13:52 -04:00
test/java/com/velocitypowered/api	Remove text 3.x API and associated deprecated APIs	2021-05-23 14:13:51 -04:00