Merge branch 'master' into future

# Conflicts:
#	gradle.properties
#	src/main/java/carpet/script/annotation/AnnotationParser.java
#	src/main/java/carpet/script/utils/BiomeInfo.java
#	src/main/resources/fabric.mod.json

src/main/java/carpet/commands/PlayerCommand.java

@@ -299,6 +299,9 @@ public class PlayerCommand
         {
             // Force override flying to true for spectator players, or they will fell out of the world.
             flying = true;
+        } else if(mode.isSurvivalLike()){
+            // Force override flying to false for survival-like players, or they will fly too
+            flying = false;
         }
         String playerName = StringArgumentType.getString(context, "player");
         if (playerName.length()>maxPlayerLength(source.getServer()))

src/main/java/carpet/commands/TickCommand.java

@@ -51,10 +51,10 @@ public class TickCommand
                             then(literal("deep").executes( (c)-> setFreeze(c.getSource(), true, true)))).
                         then(literal("off").executes( (c) -> setFreeze(c.getSource(), false, false)))).
                 then(literal("step").
-                        executes((c) -> step(1)).
+                        executes((c) -> step(c.getSource(), 1)).
                         then(argument("ticks", integer(1,72000)).
                                 suggests( (c, b) -> suggestMatching(new String[]{"20"},b)).
-                                executes((c) -> step(getInteger(c,"ticks"))))).
+                                executes((c) -> step(c.getSource(), getInteger(c,"ticks"))))).
                 then(literal("superHot").executes( (c)-> toggleSuperHot(c.getSource()))).
                 then(literal("health").
                         executes( (c) -> healthReport(c.getSource(), 100)).
@@ -130,9 +130,10 @@ public class TickCommand
         return setFreeze(source, isDeep, !TickSpeed.isPaused());
     }
 
-    private static int step(int advance)
+    private static int step(ServerCommandSource source, int advance)
     {
         TickSpeed.add_ticks_to_run_in_pause(advance);
+        Messenger.m(source, "gi Stepping " + advance + " tick" + (advance != 1 ? "s" : ""));
         return 1;
     }