Merge branch 'master' into future

src/main/java/carpet/commands/SpawnCommand.java

@@ -22,6 +22,7 @@ import net.minecraft.util.DyeColor;
 import net.minecraft.util.math.BlockPos;
 
 import java.util.Arrays;
+import java.util.Locale;
 import java.util.stream.Collectors;
 
 import static com.mojang.brigadier.arguments.IntegerArgumentType.getInteger;
@@ -111,7 +112,7 @@ public class SpawnCommand
         {
             throw new SimpleCommandExceptionType(Messenger.c("r Wrong mob type: "+string+" should be "+ Arrays.stream(SpawnGroup.values()).map(SpawnGroup::getName).collect(Collectors.joining(", ")))).create();
         }
-        return SpawnGroup.valueOf(string.toUpperCase());
+        return SpawnGroup.byName(string.toLowerCase(Locale.ROOT));
     }
 
 

src/main/java/carpet/commands/TestCommand.java

@@ -15,7 +15,7 @@ public class TestCommand
 {
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher)
     {
-        dispatcher.register(literal("test").
+        dispatcher.register(literal("testcarpet").
                 then(literal("dump").
                         executes((c) -> CarpetServer.settingsManager.printAllRulesToLog(null)).
                         then(argument("category", word()).