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 to Caffeine 3	2021-06-06 08:09:42 -04:00