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/ui/dialogs/SchematicsDialog.java
+++ b/core/src/mindustry/ui/dialogs/SchematicsDialog.java
@@ -10,7 +10,6 @@ import arc.scene.ui.*;
 import arc.scene.ui.ImageButton.*;
 import arc.scene.ui.TextButton.*;
 import arc.scene.ui.layout.*;
-import arc.struct.*;
 import arc.util.*;
 import mindustry.Vars;
 import mindustry.game.*;
@@ -342,7 +341,7 @@ public class SchematicsDialog extends BaseDialog{
            cont.add(new SchematicImage(schem)).maxSize(800f);
            cont.row();

-            Seq<ItemStack> arr = schem.requirements();
+            ItemSeq arr = schem.requirements();
            cont.table(r -> {
                int i = 0;
                for(ItemStack s : arr){