diff --git a/core/src/io/anuke/mindustry/mod/ContentParser.java b/core/src/io/anuke/mindustry/mod/ContentParser.java index c4347b2fb2..286e2d62e0 100644 --- a/core/src/io/anuke/mindustry/mod/ContentParser.java +++ b/core/src/io/anuke/mindustry/mod/ContentParser.java @@ -343,7 +343,7 @@ public class ContentParser{ init(); } - JsonValue value = parser.fromJson(null, Jval.read(json).toString(JsonFormat.plain)); + JsonValue value = parser.fromJson(null, Jval.read(json).toString(Jformat.plain)); if(!parsers.containsKey(type)){ throw new SerializationException("No parsers for content type '" + type + "'"); } diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java index 1ce411d804..1bea20db40 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java @@ -35,7 +35,6 @@ import java.util.*; import static io.anuke.mindustry.Vars.*; - public class DesktopLauncher extends ClientLauncher{ public final static String discordID = "610508934456934412"; diff --git a/gradle.properties b/gradle.properties index 3b325baee5..cbbc607927 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=38f358dd20dd3ec6e97eb11bac3e6e45785ac3da +archash=622a939452951e165007ff976f58bda85f739bc0