From 4c6ae83d4ba828e805e9e76c8140ea9123b1aa7e Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 24 May 2018 11:19:03 -0400
Subject: [PATCH] Build 40 release

---
 build.gradle                                  | 4 ++--
 core/src/io/anuke/mindustry/Vars.java         | 9 +++++++--
 core/src/io/anuke/mindustry/core/Control.java | 6 ++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 96a02e20d7..25abcc51af 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ allprojects {
         gdxVersion = '1.9.8'
         roboVMVersion = '2.3.0'
         aiVersion = '1.8.1'
-        uCoreVersion = '55f0d90'
+        uCoreVersion = 'd5af97f93813d8767423521b1fcc5a5e0f7241d9'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
@@ -152,7 +152,7 @@ project(":core") {
     apply plugin: "java"
 
     dependencies {
-        boolean comp = false//System.properties["release"] == null || System.properties["release"] == "false"
+        boolean comp = System.properties["release"] == null || System.properties["release"] == "false"
 
         if(!comp){
             println("NOTICE: Compiling release build.")
diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java
index a026256eae..ff6a0c9bd2 100644
--- a/core/src/io/anuke/mindustry/Vars.java
+++ b/core/src/io/anuke/mindustry/Vars.java
@@ -18,6 +18,7 @@ import io.anuke.ucore.entities.EffectEntity;
 import io.anuke.ucore.entities.Entities;
 import io.anuke.ucore.entities.EntityGroup;
 import io.anuke.ucore.scene.ui.layout.Unit;
+import io.anuke.ucore.util.OS;
 
 import java.util.Locale;
 
@@ -51,10 +52,14 @@ public class Vars{
 	public static final String releasesURL = "https://api.github.com/repos/Anuken/Mindustry/releases";
 	//directory for user-created map data
 	public static final FileHandle customMapDirectory = gwt ? null : UCore.isAssets() ?
-			Gdx.files.local("../../desktop/mindustry-maps") : Gdx.files.local("mindustry-maps/");
+			Gdx.files.local("../../desktop/mindustry-maps") :
+			OS.isMac ? (Gdx.files.absolute(UCore.getProperty("user.home") + "/Library/Application Support/").child("Mindustry/maps/")) :
+					Gdx.files.local("mindustry-maps/");
 	//save file directory
 	public static final FileHandle saveDirectory = gwt ? null : UCore.isAssets() ?
-			Gdx.files.local("../../desktop/mindustry-saves") : Gdx.files.local("mindustry-saves/");
+			Gdx.files.local("../../desktop/mindustry-saves") :
+			OS.isMac ? (Gdx.files.absolute(UCore.getProperty("user.home") + "/Library/Application Support/").child("Mindustry/saves/")) :
+			Gdx.files.local("mindustry-saves/");
 	//scale of the font
 	public static float fontscale = Math.max(Unit.dp.scl(1f)/2f, 0.5f);
 	//camera zoom displayed on startup
diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java
index 3c67a53230..c319cc7e0e 100644
--- a/core/src/io/anuke/mindustry/core/Control.java
+++ b/core/src/io/anuke/mindustry/core/Control.java
@@ -24,7 +24,9 @@ import io.anuke.ucore.core.Inputs.DeviceType;
 import io.anuke.ucore.entities.Entities;
 import io.anuke.ucore.modules.Module;
 import io.anuke.ucore.scene.ui.layout.Unit;
-import io.anuke.ucore.util.*;
+import io.anuke.ucore.util.Atlas;
+import io.anuke.ucore.util.InputProxy;
+import io.anuke.ucore.util.Mathf;
 
 import static io.anuke.mindustry.Vars.*;
 
@@ -384,7 +386,7 @@ public class Control extends Module{
 
 				if(respawntime > 0){
 
-					respawntime -= delta();
+					respawntime -= Timers.delta();
 
 					if(respawntime <= 0){
 						player.set(world.getSpawnX(), world.getSpawnY());