Merged current master to branch

build.gradle

@@ -20,11 +20,11 @@ allprojects {
     ext {
         versionNumber = '4'
         versionModifier = 'alpha'
-        versionType = 'official'
+        if (!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
         gdxVersion = '1.9.9'
         roboVMVersion = '2.3.0'
-        uCoreVersion = '3dfb820142a0fc583ad19413a24fc5038aa29d89'
+        uCoreVersion = '5871d2d0385370bc937fed3e5e301d6962a50476'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
@@ -104,17 +104,19 @@ project(":ios") {
     apply plugin: "robovm"
 
     task copyGen{
-        copy{
-            from ("core/build/classes/java/main/io/anuke/mindustry/gen/"){
-                include "**/*.java"
-            }
+        doLast {
+            copy {
+                from("../core/build/classes/java/main/io/anuke/mindustry/gen/") {
+                    include "**/*.java"
+                }
 
-            into "core/src/io/anuke/mindustry/gen"
+                into "../core/src/io/anuke/mindustry/gen"
+            }
         }
 
         doFirst{
             delete{
-                delete "core/src/io/anuke/mindustry/gen/"
+                delete "../core/src/io/anuke/mindustry/gen/"
             }
         }
     }
@@ -132,7 +134,7 @@ project(":ios") {
         props['app.mainclass'] = 'io.anuke.mindustry.IOSLauncher'
         props['app.executable'] = 'IOSLauncher'
         props['app.name'] = 'Mindustry'
-        props['app.build'] = (!props.hasProperty("app.build") ? 40 : props['app.build'].toInteger() + 1)+""
+        props['app.build'] = (!props.containsKey("app.build") ? 40 : props['app.build'].toInteger() + 1)+""
         props.store(vfile.newWriter(), null)
     }
 
@@ -148,7 +150,7 @@ project(":ios") {
         compile "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion"
         compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios"
         compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-ios"
-        compileOnly project(":annotations")
+        //compileOnly project(":annotations")
     }
 }