Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-10-19 16:26:03 -04:00
parent 6e8732387b ef0376371d
commit d5fb0e924a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/type/Item.java
View File

@@ -9,7 +9,7 @@ import mindustry.world.meta.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public class Item extends UnlockableContent{ public class Item extends UnlockableContent{
public final Color color; public Color color;
/** how explosive this item is. */ /** how explosive this item is. */
public float explosiveness = 0f; public float explosiveness = 0f;

2
core/src/mindustry/type/Liquid.java
View File

@@ -8,7 +8,7 @@ import mindustry.world.meta.*;
public class Liquid extends UnlockableContent{ public class Liquid extends UnlockableContent{
/** Color used in pipes and on the ground. */ /** Color used in pipes and on the ground. */
public final Color color; public Color color;
/** Color used in bars. */ /** Color used in bars. */
public @Nullable Color barColor; public @Nullable Color barColor;
/** Color used to draw lights. Note that the alpha channel is used to dictate brightness. */ /** Color used to draw lights. Note that the alpha channel is used to dictate brightness. */