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 d520d3cbf5..60526693a6 100644 Binary files a/core/assets-raw/sprites/blocks/power/solar-panel-large.png and b/core/assets-raw/sprites/blocks/power/solar-panel-large.png differ diff --git a/core/assets/maps/fungalPass.msav b/core/assets/maps/fungalPass.msav index 53dd6935f2..2b593a2482 100644 Binary files a/core/assets/maps/fungalPass.msav and b/core/assets/maps/fungalPass.msav differ 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