diff --git a/build.gradle b/build.gradle index e2d68cc020..5651870151 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ allprojects { appName = 'Mindustry' gdxVersion = '1.9.8' roboVMVersion = '2.3.0' - uCoreVersion = '115a42ff7d5bca0a6073b5f1e0b67cc4464c560e' + uCoreVersion = '1a357ce1714f20663ec1680f64f4ff43631de07d' getVersionString = { String buildVersion = getBuildVersion() @@ -92,7 +92,7 @@ project(":desktop") { dependencies { compile project(":core") compile project(":kryonet") - if(new File(projectDir.parent, '../debug').exists()) compile project(":debug") + if(new File(projectDir.parent, '../debug').exists() && System.properties["release"] == null) compile project(":debug") compile "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion" compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" diff --git a/core/src/Mindustry.gwt.xml b/core/src/Mindustry.gwt.xml index d6cae53798..828369ac80 100644 --- a/core/src/Mindustry.gwt.xml +++ b/core/src/Mindustry.gwt.xml @@ -13,6 +13,8 @@ + + diff --git a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java index 2ce4171a44..e9dd5628ef 100644 --- a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java @@ -78,7 +78,10 @@ public abstract class GroundUnit extends BaseUnit{ }, patrol = new UnitState(){ public void update(){ - //TODO + target = getClosestCore(); + if(target != null){ + //circle(60f + Mathf.absin(Timers.time() + id*23525, 70f, 1200f)); + } } }, retreat = new UnitState(){ diff --git a/desktop/build.gradle b/desktop/build.gradle index 1c0e693bea..6e1edc8d82 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -98,6 +98,7 @@ task packrCmd() { "--jdk", PACKR_DIR + "jdk-" + getPlatform() + ".zip", "--icon", ICON_DIR.getAbsolutePath(), "--vmargs", (getPlatform().equals("mac") ? "XstartOnFirstThread" : "Xms256m"), + "Djava.net.preferIPv4Stack=true", "--classpath", "--", PACKR_DIR + "config.json") } }