Merge branch 'master' into schematic

2020-09-23 16:29:41 +02:00
parent 1e10817708 8ed83964a2
commit d0c6f3274b
563 changed files with 30174 additions and 22699 deletions
--- a/core/src/mindustry/game/Rules.java
+++ b/core/src/mindustry/game/Rules.java
@@ -91,9 +91,6 @@ public class Rules{
    public boolean enemyLights = true;
    /** Ambient light color, used when lighting is enabled. */
    public Color ambientLight = new Color(0.01f, 0.01f, 0.04f, 0.99f);
-    /** Multiplier for solar panel power output.
-    negative = use ambient light if lighting is enabled. */
-    public float solarPowerMultiplier = -1f;
    /** team of the player by default */
    public Team defaultTeam = Team.sharded;
    /** team of the enemy in waves/sectors */