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

..

src

Merge branch 'dev/1.1.0' into dev/3.0.0

2021-06-12 20:12:31 -04:00

build.gradle

Bump Gson version

2021-06-06 04:22:08 -04:00

HEADER.txt

Relicense the Velocity proxy under the terms of GPLv3 (#448)

2021-03-31 16:04:06 -04:00

LICENSE

Relicense the Velocity proxy under the terms of GPLv3 (#448)

2021-03-31 16:04:06 -04:00