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

Conflicts: core/src/mindustry/type/UnitType.java gradle.properties
2021-11-04 19:39:16 -04:00
parent c43ca32b7d 7884bbd299
commit 5e534822b8
31 changed files with 285 additions and 94 deletions
--- a/core/src/mindustry/game/Teams.java
+++ b/core/src/mindustry/game/Teams.java
@@ -234,8 +234,6 @@ public class Teams{
        public Queue<BlockPlan> blocks = new Queue<>();
        /** The current command for units to follow. */
        public UnitCommand command = UnitCommand.attack;
-        /** Target items to mine. */
-        public Seq<Item> mineItems = Seq.with(Items.copper, Items.lead, Items.titanium, Items.thorium);

        /** Quadtree for all buildings of this team. Null if not active. */
        @Nullable
@@ -373,4 +371,4 @@ public class Teams{
            '}';
        }
    }
-}
+}