Merge remote-tracking branch 'origin/dev' into dev

Author: desht

common/src/main/java/dev/ftb/mods/ftblibrary/util/client/ClientUtils.java

@@ -25,8 +25,7 @@
 import java.util.function.BooleanSupplier;
 
 public class ClientUtils {
-    // TODO: @since 21.x? Is moderator really what we define as OP?
-    public static final BooleanSupplier IS_CLIENT_OP = () -> Minecraft.getInstance().player != null && Minecraft.getInstance().player.permissions().hasPermission(Permissions.COMMANDS_MODERATOR);
+    public static final BooleanSupplier IS_CLIENT_OP = () -> Minecraft.getInstance().player != null && Minecraft.getInstance().player.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER);
     public static final List<Runnable> RUN_LATER = new ArrayList<>();
     private static final MethodType EMPTY_METHOD_TYPE = MethodType.methodType(void.class);
     private static final HashMap<String, Optional<MethodHandle>> staticMethodCache = new HashMap<>();