mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-02-18 14:12:18 -08:00
Code Issues 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
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.width = newSchematic.width;
target.height = newSchematic.height;
newSchematic.labels = target.labels;
newSchematic.tags.putAll(target.tags);
newSchematic.file = target.file;

2
servers_v6.json
View file

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