mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-07-10 15:57:37 +07:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
@ -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;
|
||||||
|
@ -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. */
|
||||||
|
Reference in New Issue
Block a user