Merge remote-tracking branch 'origin/master'

build.gradle

@@ -26,7 +26,7 @@ allprojects {
         appName = 'Mindustry'
         gdxVersion = '1.9.8'
         roboVMVersion = '2.3.0'
-        uCoreVersion = '9969ed07b1'
+        uCoreVersion = 'd30ec505beb78da25fea3a5aa78f79260f2fb65b'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
@@ -167,7 +167,6 @@ project(":core") {
         build.finalizedBy(finish)
 
         def comp = System.properties["release"] == null || System.properties["release"] == "false"
-
         if(!comp) println("Note: Compiling release build.")
 
         if(new File(projectDir.parent, '../uCore').exists() && comp){
@@ -193,7 +192,9 @@ project(":server") {
     apply plugin: "java"
 
     configurations {
-        compile.exclude module: android
+        if(findProject(":android") != null){
+            compile.exclude module: android
+        }
     }
     
     dependencies {