Merge branch 'master' into 1.17

# Conflicts:
#	src/main/java/carpet/utils/WoolTool.java

src/main/java/carpet/commands/CounterCommand.java

@@ -53,7 +53,7 @@ public class CounterCommand
     {
         if (color == null)
         {
-            HopperCounter.resetAll(source.getMinecraftServer());
+            HopperCounter.resetAll(source.getMinecraftServer(), false);
             Messenger.m(source, "w Restarted all counters");
         }
         else

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

@@ -181,7 +181,7 @@ public class SpawnCommand
         //counter reset
         if (counter == null)
         {
-            HopperCounter.resetAll(source.getMinecraftServer());
+            HopperCounter.resetAll(source.getMinecraftServer(), false);
         }
         else
         {