From 2f57705f13e3adf608d41004a2e65cd1e2448db9 Mon Sep 17 00:00:00 2001 From: Arik Date: Wed, 4 Aug 2021 06:27:01 -0700 Subject: [PATCH 1/2] Fix saving tags of overwritten schematic (#5696) --- core/src/mindustry/game/Schematics.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/mindustry/game/Schematics.java b/core/src/mindustry/game/Schematics.java index d1eefe211f..0a91c9d1b3 100644 --- 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; From a9412c4f6246a907ed9523d76fcee5e22c202143 Mon Sep 17 00:00:00 2001 From: GaviTSRA <61122293+GaviTSRA@users.noreply.github.com> Date: Wed, 4 Aug 2021 15:27:21 +0200 Subject: [PATCH 2/2] Updated hub ip of TSR Server (#5698) --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index 8dd970c796..f702e643a6 100644 --- 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",