diff --git a/build.gradle b/build.gradle index 2455ca1b60..b6d07527ab 100644 --- a/build.gradle +++ b/build.gradle @@ -5,12 +5,13 @@ buildscript{ google() maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" } jcenter() + maven{ url 'https://jitpack.io' } } dependencies{ - classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.8-SNAPSHOT' + classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.7' classpath "com.badlogicgames.gdx:gdx-tools:1.9.10" - classpath "com.badlogicgames.packr:packr:2.1-SNAPSHOT" + classpath "com.github.anuken:packr:-SNAPSHOT" } } @@ -25,7 +26,7 @@ allprojects{ if(!project.hasProperty("versionType")) versionType = 'official' appName = 'Mindustry' gdxVersion = '1.9.10' - roboVMVersion = '2.3.8-SNAPSHOT' + roboVMVersion = '2.3.7' steamworksVersion = '1.8.0' arcHash = null diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index 08302458d2..e5d5b2b9ce 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -29,8 +29,8 @@ import java.text.*; import java.util.*; import static io.anuke.arc.Core.*; -import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.net; +import static io.anuke.mindustry.Vars.*; /** * Control module. diff --git a/core/src/io/anuke/mindustry/game/SpawnGroup.java b/core/src/io/anuke/mindustry/game/SpawnGroup.java index 4637ba4bfd..e799e26c40 100644 --- a/core/src/io/anuke/mindustry/game/SpawnGroup.java +++ b/core/src/io/anuke/mindustry/game/SpawnGroup.java @@ -3,6 +3,7 @@ package io.anuke.mindustry.game; import io.anuke.arc.util.serialization.Json; import io.anuke.arc.util.serialization.Json.Serializable; import io.anuke.arc.util.serialization.JsonValue; +import io.anuke.mindustry.content.*; import io.anuke.mindustry.entities.type.BaseUnit; import io.anuke.mindustry.type.*; @@ -84,6 +85,7 @@ public class SpawnGroup implements Serializable{ @Override public void read(Json json, JsonValue data){ type = content.getByName(ContentType.unit, data.getString("type", "dagger")); + if(type == null) type = UnitTypes.dagger; begin = data.getInt("begin", 0); end = data.getInt("end", never); spacing = data.getInt("spacing", 1); diff --git a/gradle.properties b/gradle.properties index 105ea9a7a4..7c8749e926 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=b87d817844e1da093b31da06870c0970176648a9 +archash=411d2784f538dfc10db2962a62833938029dafdd