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

 Conflicts:

	core/src/mindustry/core/ContentLoader.java

	core/src/mindustry/world/Block.java

core/src/mindustry/ui/dialogs/SettingsMenuDialog.java

@@ -590,6 +590,30 @@ public class SettingsMenuDialog extends BaseDialog{
             rebuild();
         }
 
+        public void textPref(String name, String def){
+            list.add(new TextSetting(name, def, null));
+            settings.defaults(name, def);
+            rebuild();
+        }
+
+        public void textPref(String name, String def, Cons<String> changed){
+            list.add(new TextSetting(name, def, changed));
+            settings.defaults(name, def);
+            rebuild();
+        }
+
+        public void areaTextPref(String name, String def){
+            list.add(new AreaTextSetting(name, def, null));
+            settings.defaults(name, def);
+            rebuild();
+        }
+
+        public void areaTextPref(String name, String def, Cons<String> changed){
+            list.add(new AreaTextSetting(name, def, changed));
+            settings.defaults(name, def);
+            rebuild();
+        }
+
         public void rebuild(){
             clearChildren();
 
@@ -705,6 +729,67 @@ public class SettingsMenuDialog extends BaseDialog{
                 table.row();
             }
         }
+        
+        public static class TextSetting extends Setting{
+            String def;
+            Cons<String> changed;
 
+            public TextSetting(String name, String def, Cons<String> changed){
+                super(name);
+                this.def = def;
+                this.changed = changed;
+            }
+
+            @Override
+            public void add(SettingsTable table){
+                TextField field = new TextField();
+
+                field.update(() -> field.setText(settings.getString(name)));
+
+                field.changed(() -> {
+                    settings.put(name, field.getText());
+                    if(changed != null){
+                        changed.get(field.getText());
+                    }
+                });
+
+                Table prefTable = table.table().left().padTop(3f).get();
+                prefTable.add(field);
+                prefTable.label(() -> title);
+                addDesc(prefTable);
+                table.row();
+            }
+        }
+
+        public static class AreaTextSetting extends TextSetting{
+            String def;
+            Cons<String> changed;
+    
+            public AreaTextSetting(String name, String def, Cons<String> changed){
+                super(name, def, changed);
+            }
+
+            @Override
+            public void add(SettingsTable table){
+                TextArea area = new TextArea("");
+                area.setPrefRows(5);
+
+                area.update(() -> {
+                    area.setText(settings.getString(name));
+                    area.setWidth(table.getWidth());
+                });
+
+                area.changed(() -> {
+                    settings.put(name, area.getText());
+                    if(changed != null){
+                        changed.get(area.getText());
+                    }
+                });
+
+                addDesc(table.label(() -> title).left().padTop(3f).get());
+                table.row().add(area).left();
+                table.row();
+            }
+        }
     }
 }

core/src/mindustry/ui/fragments/BlockConfigFragment.java

@@ -49,6 +49,7 @@ public class BlockConfigFragment extends Fragment{
     }
 
     public void showConfig(Building tile){
+        if(configTile != null) configTile.onConfigureClosed();
         if(tile.configTapped()){
             configTile = tile;
 
@@ -82,6 +83,7 @@ public class BlockConfigFragment extends Fragment{
     }
 
     public void hideConfig(){
+        if(configTile != null) configTile.onConfigureClosed();
         configTile = null;
         table.actions(Actions.scaleTo(0f, 1f, 0.06f, Interp.pow3Out), Actions.visible(false));
     }