Merge branch 'master' of https://github.com/Anuken/Mindustry into mechs-balance-altfire

# Conflicts:
#	core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java

core/src/io/anuke/mindustry/entities/Player.java

@@ -702,7 +702,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
         dead = true;
         trail.clear();
         health = maxHealth();
-        mech = (mobile ? Mechs.starterMobile : Mechs.starterDesktop);
+        mech = (isMobile ? Mechs.starterMobile : Mechs.starterDesktop);
         placeQueue.clear();
 
         add();

core/src/io/anuke/mindustry/entities/units/BaseUnit.java

@@ -320,7 +320,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
 
         if(target != null) behavior();
 
-        if(!isWave){
+        if(!isWave && !isFlying()){
             x = Mathf.clamp(x, 0, world.width() * tilesize);
             y = Mathf.clamp(y, 0, world.height() * tilesize);
         }