Andrew Steinborn c2b82f878b Merge branch 'dev/1.1.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:12:31 -04:00
..
main	Merge branch 'dev/1.1.0' into dev/3.0.0	2021-06-12 20:12:31 -04:00
test/java/com/velocitypowered/proxy	Merge branch 'Xernium-future/1.17' into dev/3.0.0	2021-06-06 03:48:49 -04:00