From 4b1554db5497225f8febb5b1c835f9d7c885d609 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 17 Dec 2020 10:46:49 -0500 Subject: [PATCH] arc --- .../blocks/power/solar-panel-large.png | Bin 1583 -> 1578 bytes core/assets/maps/fungalPass.msav | Bin 10885 -> 10868 bytes core/src/mindustry/world/Block.java | 2 +- gradle.properties | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/assets-raw/sprites/blocks/power/solar-panel-large.png b/core/assets-raw/sprites/blocks/power/solar-panel-large.png index d520d3cbf5f4f359cbd379b02bdedf02c60171eb..60526693a6e6ca614cdff4aa2c72229247a04605 100644 GIT binary patch delta 1548 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 literal 10885 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 bi2b?s!zd|LT(~{s{pziE&L#gJGDHAPnJ`}E diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index 59a48777b4..fd5382305e 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -145,7 +145,7 @@ public class Block extends UnlockableContent{ public boolean conveyorPlacement; /** * The color of this block when displayed on the minimap or map preview. - * Do not set manually! This is overriden when loading for most blocks. + * Do not set manually! This is overridden when loading for most blocks. */ public Color mapColor = new Color(0, 0, 0, 1); /** Whether this block has a minimap color. */ diff --git a/gradle.properties b/gradle.properties index 9574a5fa32..a02eb131d9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=b35bc6c3431e51204335b9b9378451cc320df575 +archash=dceddb4ef95457fa391562dd1a23ee6071ebce68