mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-25 10:25:42 +07:00
Code Issues Packages Projects Releases Wiki Activity

arc

Browse Source
This commit is contained in:
Anuken 2020-12-17 10:46:49 -05:00
parent b8efed9eaf
commit 4b1554db54
4 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/power/solar-panel-large.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
core/assets/maps/fungalPass.msav
View File

Binary file not shown.

2
core/src/mindustry/world/Block.java
View File

@ -145,7 +145,7 @@ public class Block extends UnlockableContent{
public boolean conveyorPlacement; public boolean conveyorPlacement;
/** /**
* The color of this block when displayed on the minimap or map preview. * 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); public Color mapColor = new Color(0, 0, 0, 1);
/** Whether this block has a minimap color. */ /** Whether this block has a minimap color. */

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=b35bc6c3431e51204335b9b9378451cc320df575 archash=dceddb4ef95457fa391562dd1a23ee6071ebce68