Merge remote-tracking branch 'origin/master'

# Conflicts:
#	core/src/mindustry/entities/Damage.java

core/src/mindustry/world/blocks/payloads/UnitPayload.java

@@ -94,7 +94,7 @@ public class UnitPayload implements Payload{
             if(solid.solid(tx, ty)) return false;
         }
 
-        //cannnot dump when there's a lot of overlap going on
+        //cannot dump when there's a lot of overlap going on
         if(!unit.type.flying && Units.count(unit.x, unit.y, unit.physicSize(), o -> o.isGrounded() && (o.type.allowLegStep == unit.type.allowLegStep)) > 0){
             return false;
         }