From 2941fe83d2e5d2a9e60c67545e83b894a4940b60 Mon Sep 17 00:00:00 2001 From: abcxyzDustry <138785336+abcxyzDustry@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:26:16 +0700 Subject: [PATCH 1/5] Update servers_v7.json (#10115) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 73180988e0..e7e4858d0c 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -246,7 +246,7 @@ }, { "name": "abcxyz remaster", - "address": ["144.76.57.59:30302", "23.88.73.88:16895"] + "address": ["144.76.57.59:35150"] }, { "name": "CroCraft Network", From 4f4370fa15cbee9c658c1e3453d21b366480c92d Mon Sep 17 00:00:00 2001 From: abcxyzDustry <138785336+abcxyzDustry@users.noreply.github.com> Date: Thu, 15 Aug 2024 15:36:27 +0700 Subject: [PATCH 2/5] Update servers_v7.json (#10120) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index e7e4858d0c..fd33709eb3 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -246,7 +246,7 @@ }, { "name": "abcxyz remaster", - "address": ["144.76.57.59:35150"] + "address": ["144.76.57.59:35150", "23.88.73.88:11066", "23.88.73.88:9171"] }, { "name": "CroCraft Network", From b8c2d39c7156ac3b3f4761f5a0b69c134eccecd8 Mon Sep 17 00:00:00 2001 From: abcxyzDustry <138785336+abcxyzDustry@users.noreply.github.com> Date: Fri, 16 Aug 2024 13:21:44 +0700 Subject: [PATCH 3/5] Update servers_v7.json (#10123) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index fd33709eb3..840f4cfca7 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -246,7 +246,7 @@ }, { "name": "abcxyz remaster", - "address": ["144.76.57.59:35150", "23.88.73.88:11066", "23.88.73.88:9171"] + "address": ["144.76.57.59:35150", "23.88.73.88:11066", "23.88.73.88:9171", "23.88.73.88:10911"] }, { "name": "CroCraft Network", From 5cc5bbece5f6da95a1a008dd53158709d1eb9306 Mon Sep 17 00:00:00 2001 From: Valeriy Date: Fri, 16 Aug 2024 19:13:19 +1000 Subject: [PATCH 4/5] Update servers_v7.json (#10118) * Update servers_v7.json * Update servers_v7.json --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 840f4cfca7..6ce665d9ab 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -73,7 +73,7 @@ }, { "name": "SMoke of Anarchy", - "address": ["86.102.97.27"] + "address": ["mindustry.smokeofanarchy.ru", "mindustry.smokeofanarchy.ru:6568", "mindustry.smokeofanarchy.ru:6569", "mindustry.smokeofanarchy.ru:6570", "mindustry.smokeofanarchy.ru:6571", "mindustry.smokeofanarchy.ru:6572", "mindustry.smokeofanarchy.ru:6573", "mindustry.smokeofanarchy.ru:6574", "mindustry.smokeofanarchy.ru:6575", "mindustry.smokeofanarchy.ru:6576"] }, { "name": "Mindustry.pl", From f347dc4c84a44dff6f26aaf170d6e3f355eff22f Mon Sep 17 00:00:00 2001 From: camelStyleUser <124447863+camelStyleUser@users.noreply.github.com> Date: Fri, 16 Aug 2024 22:35:36 +0300 Subject: [PATCH 5/5] Update LAssembler.java (#10126) anook please dont forget --- core/src/mindustry/logic/LAssembler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/logic/LAssembler.java b/core/src/mindustry/logic/LAssembler.java index 37b79e845f..362754afe6 100644 --- a/core/src/mindustry/logic/LAssembler.java +++ b/core/src/mindustry/logic/LAssembler.java @@ -58,7 +58,7 @@ public class LAssembler{ /** @return a variable by name. * This may be a constant variable referring to a number or object. */ public LVar var(String symbol){ - LVar constVar = Vars.logicVars.get(symbol); + LVar constVar = Vars.logicVars.get(symbol, privileged); if(constVar != null) return constVar; symbol = symbol.trim();