Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Conflicts: gradle.properties
2021-07-09 19:48:35 -04:00
parent baabf49fba effe2312e0
commit 5ceb8e2b48
167 changed files with 17 additions and 1083 deletions
@@ -14,7 +14,7 @@ public class Attribute{
    spores = add("spores"),
    /** Water content. Used for water extractor yield. */
    water = add("water"),
-    /** Oil content. Used for  oil extractor yield. */
+    /** Oil content. Used for oil extractor yield. */
    oil = add("oil"),
    /** Light coverage. Negative values decrease solar panel efficiency. */
    light = add("light"),