Merge remote-tracking branch 'origin/dev/2.1.1' into feature/cumulus-1.1

# Conflicts:
#	build-logic/src/main/kotlin/Versions.kt

api/src/main/java/org/geysermc/floodgate/api/inject/InjectorAddon.java

@@ -34,7 +34,7 @@ public interface InjectorAddon {
      * used for third party things.
      *
      * @param channel  the channel that the injector is injecting
-     * @param toServer if the the connection is between a proxy and a server
+     * @param toServer if the connection is between a proxy and a server
      */
     void onInject(Channel channel, boolean toServer);
 
@@ -43,7 +43,7 @@ public interface InjectorAddon {
      * closed connection (if it is injected), so it'll also run this method for closed connections
      * between a server and the proxy (when Floodgate is running on a proxy).
      *
-     * @param channel the channel that the injecor injected
+     * @param channel the channel that the injector injected
      */
     default void onChannelClosed(Channel channel) {
     }

api/src/main/java/org/geysermc/floodgate/api/player/PropertyKey.java

@@ -51,7 +51,7 @@ public class PropertyKey {
         this.removable = removable;
     }
 
-    public Result isAddAllowed(Object obj) { //todo use for add and remove
+    public Result isAddAllowed(Object obj) {
         if (obj instanceof PropertyKey) {
             PropertyKey propertyKey = (PropertyKey) obj;