diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index 678b7dab66..942f95cdd1 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -844,7 +844,7 @@ public class ContentParser{ FieldMetadata metadata = fields.get(child.name().replace(" ", "_")); if(metadata == null){ if(ignoreUnknownFields){ - Log.warn("@: Ignoring unknown field: " + child.name + " (" + type.getName() + ")", object); + Log.warn("[@]: Ignoring unknown field: @ (@)", currentContent.minfo.sourceFile.name(), child.name, type.getSimpleName()); continue; }else{ SerializationException ex = new SerializationException("Field not found: " + child.name + " (" + type.getName() + ")"); diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java index a52f59d7b6..20f0fd5165 100644 --- a/core/src/mindustry/ui/dialogs/ModsDialog.java +++ b/core/src/mindustry/ui/dialogs/ModsDialog.java @@ -246,9 +246,9 @@ public class ModsDialog extends BaseDialog{ text.add("[accent]" + Strings.stripColors(item.meta.displayName()) + "\n" + (shortDesc.length() > 0 ? "[lightgray]" + shortDesc + "\n" : "") - + "[gray]v" + Strings.stripColors(trimText(item.meta.version)) - + (item.enabled() || hideDisabled ? "" : "\n" + Core.bundle.get("mod.disabled") + "")) - + //so does anybody care about version? + //+ "[gray]v" + Strings.stripColors(trimText(item.meta.version)) + "\n" + + (item.enabled() || hideDisabled ? "" : Core.bundle.get("mod.disabled") + "")) .wrap().top().width(300f).growX().left(); text.row(); diff --git a/core/src/mindustry/world/blocks/distribution/DuctRouter.java b/core/src/mindustry/world/blocks/distribution/DuctRouter.java index ad4c0cf0bd..ff2d65ae34 100644 --- a/core/src/mindustry/world/blocks/distribution/DuctRouter.java +++ b/core/src/mindustry/world/blocks/distribution/DuctRouter.java @@ -61,6 +61,12 @@ public class DuctRouter extends Block{ Draw.rect(topRegion, plan.drawx(), plan.drawy(), plan.rotation * 90); } + @Override + public int minimapColor(Tile tile){ + var build = (DuctRouterBuild)tile.build; + return build == null || build.sortItem == null ? 0 : build.sortItem.color.rgba(); + } + @Override public boolean rotatedOutput(int x, int y){ return false; diff --git a/gradle.properties b/gradle.properties index e012c127c1..9555d7213f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,4 +25,4 @@ org.gradle.caching=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=de2c33931c +archash=9f57abe6d4