diff --git a/core/src/mindustry/io/JsonIO.java b/core/src/mindustry/io/JsonIO.java index e92f59bdb1..497ed7546a 100644 --- a/core/src/mindustry/io/JsonIO.java +++ b/core/src/mindustry/io/JsonIO.java @@ -228,7 +228,12 @@ public class JsonIO{ Item item = Vars.content.getByName(ContentType.item, str); Liquid liquid = Vars.content.getByName(ContentType.liquid, str); Block block = Vars.content.getByName(ContentType.block, str); - return item != null ? item : liquid == null ? block : liquid; + UnitType unit = Vars.content.getByName(ContentType.unit, str); + return + item != null ? item : + block != null ? block : + liquid != null ? liquid : + unit; } }); diff --git a/gradle.properties b/gradle.properties index 47efdec8d7..664e856997 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=430f9146f3c9c34db1f9ad9a8784e71c322246f2 +archash=f106eee2