Merge branch 'master' of https://github.com/Anuken/Mindustry

2021-08-04 11:35:19 -04:00
parent 3b7afec360 a9412c4f62
commit cfa844f960
2 changed files with 2 additions and 1 deletions
--- a/core/src/mindustry/game/Schematics.java
+++ b/core/src/mindustry/game/Schematics.java
@@ -114,6 +114,7 @@ public class Schematics implements Loadable{
        target.tiles.addAll(newSchematic.tiles);
        target.width = newSchematic.width;
        target.height = newSchematic.height;
+        newSchematic.labels = target.labels;
        newSchematic.tags.putAll(target.tags);
        newSchematic.file = target.file;

--- a/servers_v6.json
+++ b/servers_v6.json
@@ -77,7 +77,7 @@
  },
  {
    "name": "TSR", 
-    "address": ["de15-3.falix.gg:27422"]
+    "address": ["ult4.falix.gg:26904"]
  },
  {
    "name": "Sakura",