Merge branch 'master' of https://github.com/Anuken/Mindustry

build.gradle

@@ -9,7 +9,7 @@ buildscript{
 
     dependencies{
         classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.6'
-        classpath "com.badlogicgames.gdx:gdx-tools:1.9.9"
+        classpath "com.badlogicgames.gdx:gdx-tools:1.9.10"
         classpath "com.badlogicgames.packr:packr:2.1-SNAPSHOT"
     }
 }
@@ -22,7 +22,7 @@ allprojects{
         versionModifier = 'beta'
         if(!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
-        gdxVersion = '1.9.9'
+        gdxVersion = '1.9.10'
         roboVMVersion = '2.3.6'
         arcHash = null
 

core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java

@@ -349,6 +349,6 @@ public class PlacementFragment extends Fragment{
 
     /** Returns the block currently being hovered over in the world. */
     Block tileDisplayBlock(){
-        return hoverTile == null ? null : hoverTile.block().synthetic() ? hoverTile.block() : hoverTile.overlay().itemDrop != null ? hoverTile.overlay() : null;
+        return hoverTile == null ? null : hoverTile.block().synthetic() ? hoverTile.block() : hoverTile.drop() != null ? hoverTile.overlay().itemDrop != null ? hoverTile.overlay() : hoverTile.floor() : null;
     }
 }

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

@@ -96,6 +96,7 @@ public class IOSLauncher extends IOSApplication.Delegate{
             FileHandle file = Core.files.absolute(getDocumentsDirectory()).child(url.getLastPathComponent());
             Core.files.absolute(url.getPath()).copyTo(file);
 
+            //TODO detect if it's a map or save
             if(file.extension().equalsIgnoreCase(saveExtension)){ //open save
 
                 if(SaveIO.isSaveValid(file)){