Merge branch 'master' into 1.16

# Conflicts:
#	src/main/java/carpet/script/bundled/Module.java

src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java

@@ -117,7 +117,7 @@ public abstract class MinecraftServer_tickspeedMixin extends ReentrantThreadExec
             this.startMonitor(tickDurationMonitor);
             this.profiler.startTick();
             this.profiler.push("tick");
-            this.tick(TickSpeed.time_warp_start_time != 0 ? ()->true : this::shouldKeepTicking);
+            this.tick(TickSpeed.time_warp_start_time != 0 ? ()->!hasRunningTasks() : this::shouldKeepTicking);
             this.profiler.swap("nextTickWait");
             this.waitingForNextTick = true;
             this.field_19248 = Math.max(Util.getMeasuringTimeMs() + /*50L*/ msThisTick, this.timeReference);