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

api/src/main/java/com/velocitypowered/api/proxy/Player.java

@@ -237,4 +237,12 @@ public interface Player extends CommandSource, Identified, InboundConnection,
     return HoverEvent.showEntity(op.apply(HoverEvent.ShowEntity.of(this, getUniqueId(),
             Component.text(getUsername()))));
   }
+
+
+  /**
+   * Gets the player's client brand.
+   *
+   * @return the player's client brand
+   */
+  @Nullable String getClientBrand();
 }