Merge remote-tracking branch 'origin/master'

core/src/io/anuke/mindustry/entities/effect/Decal.java

@@ -33,10 +33,5 @@ public abstract class Decal extends TimedEntity implements BelowLiquidTrait, Dra
         return groundEffectGroup;
     }
 
-    @Override
-    public float fin() {
-        return time / lifetime();
-    }
-
     abstract void drawDecal();
 }

core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java

@@ -134,9 +134,4 @@ public class ItemTransfer extends TimedEntity implements DrawTrait{
     public EntityGroup targetGroup(){
         return effectGroup;
     }
-
-    @Override
-    public float fin(){
-        return time() / lifetime();
-    }
 }

ios/robovm.properties

@@ -2,5 +2,5 @@ app.version=4.0
 app.id=io.anuke.mindustry
 app.mainclass=io.anuke.mindustry.IOSLauncher
 app.executable=IOSLauncher
-app.build=14
+app.build=17
 app.name=Mindustry

ios/src/io/anuke/mindustry/TextFieldDialogListener.java

@@ -26,6 +26,7 @@ public class TextFieldDialogListener {
         });
     }
 
+    @SuppressWarnings("deprecation")
     private static void show(TextField field, int maxLength){
 
         UIAlertViewDelegateAdapter delegate = new UIAlertViewDelegateAdapter() {