Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Anuken
2021-08-04 11:35:19 -04:00
parent 3b7afec360 a9412c4f62
commit cfa844f960
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/game/Schematics.java
View File

@@ -114,6 +114,7 @@ public class Schematics implements Loadable{
target.tiles.addAll(newSchematic.tiles); target.tiles.addAll(newSchematic.tiles);
target.width = newSchematic.width; target.width = newSchematic.width;
target.height = newSchematic.height; target.height = newSchematic.height;
newSchematic.labels = target.labels;
newSchematic.tags.putAll(target.tags); newSchematic.tags.putAll(target.tags);
newSchematic.file = target.file; newSchematic.file = target.file;

2
servers_v6.json
View File

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