From 3819e327e9e0d0098e66edd3a9244fa0e366eae2 Mon Sep 17 00:00:00 2001 From: "Matthew (or Maya) Peng" <54301439+MEEPofFaith@users.noreply.github.com> Date: Mon, 29 Nov 2021 18:15:15 -0800 Subject: [PATCH 01/20] Grammar (#6383) * Grammar * English is a terrible language --- core/src/mindustry/type/Liquid.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/type/Liquid.java b/core/src/mindustry/type/Liquid.java index e62805e60b..7e41551f84 100644 --- a/core/src/mindustry/type/Liquid.java +++ b/core/src/mindustry/type/Liquid.java @@ -13,7 +13,7 @@ public class Liquid extends UnlockableContent{ public @Nullable Color barColor; /** Color used to draw lights. Note that the alpha channel is used to dictate brightness. */ public Color lightColor = Color.clear.cpy(); - /** 0-1, 0 is completely inflammable, anything above that may catch fire when exposed to heat, 0.5+ is very flammable. */ + /** 0-1, 0 is completely not flammable, anything above that may catch fire when exposed to heat, 0.5+ is very flammable. */ public float flammability; /** temperature: 0.5 is 'room' temperature, 0 is very cold, 1 is molten hot */ public float temperature = 0.5f; From 8cb830ba419182908ddcf5b5b33d50bfcbcd2f08 Mon Sep 17 00:00:00 2001 From: "Matthew (or Maya) Peng" <54301439+MEEPofFaith@users.noreply.github.com> Date: Mon, 29 Nov 2021 20:05:35 -0800 Subject: [PATCH 02/20] Make `MoveLightningAbility` alternating a boolean (#6390) * Revert "BlueWolf does not want MoveLightningAbility to mirror (#6376)" This reverts commit e1685ef46c0376140a7a15f27547e58fc0a5f23e. * boolean `alternate` * Better Javadoc description --- .../entities/abilities/MoveLightningAbility.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/entities/abilities/MoveLightningAbility.java b/core/src/mindustry/entities/abilities/MoveLightningAbility.java index d91a0d6cc8..5b74b73570 100644 --- a/core/src/mindustry/entities/abilities/MoveLightningAbility.java +++ b/core/src/mindustry/entities/abilities/MoveLightningAbility.java @@ -14,7 +14,7 @@ import mindustry.gen.*; public class MoveLightningAbility extends Ability{ /** Lightning damage */ public float damage = 35f; - /** Chance of firing every tick. Set >= 1 to always fire lightning every tick at max speed. */ + /** Chance of firing every tick. Set >= 1 to always fire lightning every tick at max speed */ public float chance = 0.15f; /** Length of the lightning. <= 0 to disable */ public int length = 12; @@ -24,8 +24,10 @@ public class MoveLightningAbility extends Ability{ public Color color = Color.valueOf("a9d8ff"); /** Shifts where the lightning spawns along the Y axis */ public float offset = 0f; - /** Offset along the X axis. */ + /** Offset along the X axis */ public float width = 0f; + /** Whether the spawn side alternates */ + public boolean alternate = true; /** Jittering heat sprite like the shield on v5 Javelin */ public String heatRegion = "error"; /** Bullet type that is fired. Can be null */ @@ -36,6 +38,8 @@ public class MoveLightningAbility extends Ability{ public Effect shootEffect = Fx.sparkShoot; public boolean parentizeEffects; public Sound shootSound = Sounds.spark; + + protected float side = 1f; MoveLightningAbility(){} @@ -64,10 +68,10 @@ public class MoveLightningAbility extends Ability{ public void update(Unit unit){ float scl = Mathf.clamp((unit.vel().len() - minSpeed) / (maxSpeed - minSpeed)); if(Mathf.chance(Time.delta * chance * scl)){ - float x = unit.x + Angles.trnsx(unit.rotation, offset, width), y = unit.y + Angles.trnsy(unit.rotation, offset, width); + float x = unit.x + Angles.trnsx(unit.rotation, offset, width * side), y = unit.y + Angles.trnsy(unit.rotation, offset, width * side); shootEffect.at(x, y, unit.rotation, color, parentizeEffects ? unit : null); - shootSound.at(unit); + shootSound.at(x, y); if(length > 0){ Lightning.create(unit.team, color, damage, x + unit.vel.x, y + unit.vel.y, unit.rotation, length); @@ -76,6 +80,8 @@ public class MoveLightningAbility extends Ability{ if(bullet != null){ bullet.create(unit, unit.team, x, y, unit.rotation + bulletAngle + Mathf.range(bulletSpread)); } + + if(alternate) side *= -1f; } } From 5ea4688e8800050847aff26b24344f08a0bb0041 Mon Sep 17 00:00:00 2001 From: "Matthew (or Maya) Peng" <54301439+MEEPofFaith@users.noreply.github.com> Date: Thu, 2 Dec 2021 12:43:31 -0800 Subject: [PATCH 03/20] get by name (#6396) --- core/src/mindustry/core/ContentLoader.java | 26 +++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/core/ContentLoader.java b/core/src/mindustry/core/ContentLoader.java index 715c22a89b..7d738135cd 100644 --- a/core/src/mindustry/core/ContentLoader.java +++ b/core/src/mindustry/core/ContentLoader.java @@ -264,6 +264,10 @@ public class ContentLoader{ return getByID(ContentType.item, id); } + public Item item(String name){ + return getByName(ContentType.item, name); + } + public Seq liquids(){ return getBy(ContentType.liquid); } @@ -272,6 +276,10 @@ public class ContentLoader{ return getByID(ContentType.liquid, id); } + public Liquid liquid(String name){ + return getByName(ContentType.liquid, name); + } + public Seq bullets(){ return getBy(ContentType.bullet); } @@ -284,10 +292,18 @@ public class ContentLoader{ return getBy(ContentType.status); } + public StatusEffect statusEffect(String name){ + return getByName(ContentType.status, name); + } + public Seq sectors(){ return getBy(ContentType.sector); } + public SectorPreset sector(String name){ + return getByName(ContentType.sector, name); + } + public Seq units(){ return getBy(ContentType.unit); } @@ -296,7 +312,15 @@ public class ContentLoader{ return getByID(ContentType.unit, id); } + public UnitType unit(String name){ + return getByName(ContentType.unit, name); + } + public Seq planets(){ return getBy(ContentType.planet); } -} + + public Planet planet(String name){ + return getByName(ContentType.planet, name); + } +} \ No newline at end of file From adb03c465b224dd91edb5611c5b51ba64098ee5d Mon Sep 17 00:00:00 2001 From: alex <67626131+alexpvpmindustry@users.noreply.github.com> Date: Fri, 3 Dec 2021 08:24:44 +0800 Subject: [PATCH 04/20] add v7 servers for alex servers (#6393) * Update v6 servers for alex servers * Update servers_v7.json alex v7 server --- servers_v7.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 6178f0da0f..8f9812946d 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -74,5 +74,9 @@ { "name": "LostDustry", "address": ["lostdustry.northeurope.cloudapp.azure.com:6568", "lostdustry.northeurope.cloudapp.azure.com:6569", "lostdustry.northeurope.cloudapp.azure.com:6570"] - } + }, + { + "name": "ALEX", + "address": ["dogemindustry.ddns.net:25588"] + } ] From 5c3ecaabb5173efc83bac8e167dd45d169a99583 Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Sat, 4 Dec 2021 20:41:29 -0500 Subject: [PATCH 05/20] Fix incorrect return value (#6401) * Fix incorrect return value the javadoc is a lie * Update Administration.java --- core/src/mindustry/net/Administration.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java index 98f8b02429..68736ffd37 100644 --- a/core/src/mindustry/net/Administration.java +++ b/core/src/mindustry/net/Administration.java @@ -302,11 +302,13 @@ public class Administration{ public boolean adminPlayer(String id, String usid){ PlayerInfo info = getCreateInfo(id); + var wasAdmin = info.admin; + info.adminUsid = usid; info.admin = true; save(); - return true; + return wasAdmin; } /** From a3385df88be5c82e64d9586bb05f241285f707ab Mon Sep 17 00:00:00 2001 From: Alexander397172YT <76264974+Alexander397172YT@users.noreply.github.com> Date: Sun, 5 Dec 2021 21:39:02 +0400 Subject: [PATCH 06/20] new createdustry IP (#6406) --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index d9295c19c9..12100bb87a 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -101,7 +101,7 @@ }, { "name": "CreateDustry", - "address": ["144.76.120.74:18645"] + "address": ["129.151.66.139:26032"] }, { "name": "NukeDustry", From 76af0228c13f49d7e5406de33678ecae34fd9b1d Mon Sep 17 00:00:00 2001 From: Rex <77251557+Rex-Hm@users.noreply.github.com> Date: Sun, 5 Dec 2021 18:00:37 -0300 Subject: [PATCH 07/20] Update servers_v6.json (#6407) * Update servers_v6.json * Update servers_v6.json --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index 12100bb87a..f549b49a9e 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -97,7 +97,7 @@ }, { "name": "Mindustry Español", - "address": ["panel.mindustry.me:2011", "yeeth.mindustry.me:6573", "panel.mindustry.me:2000", "panel.mindustry.me:2026"] + "address": ["yeeth.mindustry.me:6578", "yeeth.mindustry.me:6573", "yeeth.mindustry.me:6577", "yeeth.mindustry.me:6576"] }, { "name": "CreateDustry", From 8e89b24e5b93cbbc7856925784af0168e7c985ba Mon Sep 17 00:00:00 2001 From: "Matthew (or Maya) Peng" <54301439+MEEPofFaith@users.noreply.github.com> Date: Tue, 7 Dec 2021 21:02:52 -0800 Subject: [PATCH 08/20] unprivate countOre (#6410) --- core/src/mindustry/world/blocks/production/Drill.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/production/Drill.java b/core/src/mindustry/world/blocks/production/Drill.java index d31a130f96..2b25a41067 100644 --- a/core/src/mindustry/world/blocks/production/Drill.java +++ b/core/src/mindustry/world/blocks/production/Drill.java @@ -169,7 +169,7 @@ public class Drill extends Block{ return new TextureRegion[]{region, rotatorRegion, topRegion}; } - void countOre(Tile tile){ + protected void countOre(Tile tile){ returnItem = null; returnCount = 0; From b70c08c2ecf38ee738d69955ea8f2d1e70f0338d Mon Sep 17 00:00:00 2001 From: "Matthew (or Maya) Peng" <54301439+MEEPofFaith@users.noreply.github.com> Date: Tue, 7 Dec 2021 21:03:11 -0800 Subject: [PATCH 09/20] Removes -> Destroys (#6409) * Removes -> Destroys * inputed * bad language design TM english sucks --- core/assets/bundles/bundle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 56b938a3e2..2c15b6b123 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1468,9 +1468,9 @@ block.incinerator.description = Vaporizes any item or liquid it receives. block.power-void.description = Voids all power inputted. Sandbox only. block.power-source.description = Infinitely outputs power. Sandbox only. block.item-source.description = Infinitely outputs items. Sandbox only. -block.item-void.description = Destroys any items. Sandbox only. +block.item-void.description = Destroys inputted items. Sandbox only. block.liquid-source.description = Infinitely outputs liquids. Sandbox only. -block.liquid-void.description = Removes any liquids. Sandbox only. +block.liquid-void.description = Destroys inputted liquids. Sandbox only. block.payload-source.description = Infinitely outputs payloads. Sandbox only. block.payload-void.description = Destroys any payloads. Sandbox only. block.copper-wall.description = Protects structures from enemy projectiles. From 3a91460e2487b76b21609a15f24115d4da8b9313 Mon Sep 17 00:00:00 2001 From: Darkness#3729 <79508138+Darkness6030@users.noreply.github.com> Date: Wed, 8 Dec 2021 18:01:02 +0300 Subject: [PATCH 10/20] Fix (#6414) --- core/src/mindustry/ui/dialogs/LanguageDialog.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/mindustry/ui/dialogs/LanguageDialog.java b/core/src/mindustry/ui/dialogs/LanguageDialog.java index 6504bbe60c..ca46c177f5 100644 --- a/core/src/mindustry/ui/dialogs/LanguageDialog.java +++ b/core/src/mindustry/ui/dialogs/LanguageDialog.java @@ -41,6 +41,7 @@ public class LanguageDialog extends BaseDialog{ "be", "Беларуская", "bg", "Български", "ru", "Русский", + "sr", "Српски", "uk_UA", "Українська (Україна)", "th", "ไทย", "zh_CN", "简体中文", From f4c7637071a310d6ac2572b6db4c28d7c9138f57 Mon Sep 17 00:00:00 2001 From: Volas171 <60143910+Volas171@users.noreply.github.com> Date: Thu, 9 Dec 2021 09:49:11 -0500 Subject: [PATCH 11/20] Update Omega v7 and v6 ips (serverlist) (#6420) * update omega ip * omega v7 ip change * i forgo :skull: --- servers_v6.json | 2 +- servers_v7.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/servers_v6.json b/servers_v6.json index f549b49a9e..72046425cb 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -53,7 +53,7 @@ }, { "name": "Omega", - "address": ["yeeth.mindustry.me:2004","185.86.230.61:25570"] + "address": ["n5.mindustry.me:4001","n4.mindustry.me:4001"] }, { "name": "Obvilion Network", diff --git a/servers_v7.json b/servers_v7.json index 8f9812946d..271b0c861d 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -17,7 +17,7 @@ }, { "name": "Omega", - "address": ["yeeth.mindustry.me", "yeeth.mindustry.me:2006", "yeeth.mindustry.me:2003","yeeth.mindustry.me:2002", "yeeth.mindustry.me:2001", "yeeth.mindustry.me:2007", "yeeth.mindustry.me:2005"] + "address": ["n4.mindustry.me", "n5.mindustry.me:4002", "n5.mindustry.me:4003","n5.mindustry.me:4004", "n5.mindustry.me:4005", "n5.mindustry.me:4006", "n5.mindustry.me:4007"] }, { "name": "MeowLand", From a3100980dca13be38b8e79cb79074a1c3637dfdd Mon Sep 17 00:00:00 2001 From: RebornTrack970 <62565267+RebornTrack970@users.noreply.github.com> Date: Sat, 11 Dec 2021 17:26:38 +0300 Subject: [PATCH 12/20] Fixed 2R2T (#6426) --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index 72046425cb..14f1771ee6 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -53,7 +53,7 @@ }, { "name": "Omega", - "address": ["n5.mindustry.me:4001","n4.mindustry.me:4001"] + "address": ["yeeth.mindustry.me:6568"] }, { "name": "Obvilion Network", From 192588d37327976394b1c08d27da290e4adc8d5e Mon Sep 17 00:00:00 2001 From: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com> Date: Mon, 13 Dec 2021 02:15:26 +0300 Subject: [PATCH 13/20] Update LanguageDialog.java (#6431) --- core/src/mindustry/ui/dialogs/LanguageDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/ui/dialogs/LanguageDialog.java b/core/src/mindustry/ui/dialogs/LanguageDialog.java index ca46c177f5..a124c3896f 100644 --- a/core/src/mindustry/ui/dialogs/LanguageDialog.java +++ b/core/src/mindustry/ui/dialogs/LanguageDialog.java @@ -42,7 +42,7 @@ public class LanguageDialog extends BaseDialog{ "bg", "Български", "ru", "Русский", "sr", "Српски", - "uk_UA", "Українська (Україна)", + "uk_UA", "Українська", "th", "ไทย", "zh_CN", "简体中文", "zh_TW", "正體中文", From 6c26edbd84f47260bb5b14a613ccb4f528489895 Mon Sep 17 00:00:00 2001 From: RebornTrack970 <62565267+RebornTrack970@users.noreply.github.com> Date: Mon, 13 Dec 2021 19:18:53 +0300 Subject: [PATCH 14/20] Fixed Omega Servers on V7 (#6432) * Fixed Omega Servers * 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 271b0c861d..9a2b23ef00 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -17,7 +17,7 @@ }, { "name": "Omega", - "address": ["n4.mindustry.me", "n5.mindustry.me:4002", "n5.mindustry.me:4003","n5.mindustry.me:4004", "n5.mindustry.me:4005", "n5.mindustry.me:4006", "n5.mindustry.me:4007"] + "address": ["yeeth.mindustry.me:5002", "yeeth.mindustry.me:5003", "yeeth.mindustry.me:5004","yeeth.mindustry.me:5005", "yeeth.mindustry.me:5006", "yeeth.mindustry.me:5007", "yeeth.mindustry.me", "yeeth.mindustry.me:4006"] }, { "name": "MeowLand", From b5c1972040a94afe0eb4ed810c137a245d059b73 Mon Sep 17 00:00:00 2001 From: Fancy2209 <64917206+Fancy2209@users.noreply.github.com> Date: Mon, 13 Dec 2021 17:20:30 -0100 Subject: [PATCH 15/20] Update bundle_pt_PT.properties so that the portuguese word for settings is right (#6433) * Update bundle_pt_PT.properties * Fix the other 2 words with -/ I didn't notice --- core/assets/bundles/bundle_pt_PT.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties index 606ebca6f4..cfd53b825d 100644 --- a/core/assets/bundles/bundle_pt_PT.properties +++ b/core/assets/bundles/bundle_pt_PT.properties @@ -96,7 +96,7 @@ database.button = Database savegame = Gravar Jogo loadgame = Carregar Jogo joingame = Entrar no Jogo -customgame = Jogo Customi-/nzado +customgame = Jogo Customizado newgame = Novo Jogo none = none.found = [lightgray] @@ -519,7 +519,7 @@ width = Largura: height = Altura: menu = Menu play = Jogar -campaign = Campa-/nnha +campaign = Campannha load = Carregar save = Gravar fps = FPS: {0} @@ -528,7 +528,7 @@ tps = TPS: {0} memory = Mem: {0}mb memory2 = Mem:\n {0}mb +\n {1}mb language.restart = Por favor, reinicie seu jogo para a tradução tomar efeito. -settings = Configu-/nrações +settings = Configurações tutorial = Tutorial tutorial.retake = Refazer Tutorial editor = Editor From 052b47fbe439154f318b9d7183b2ec172756e6d9 Mon Sep 17 00:00:00 2001 From: "Matthew (or Maya) Peng" <54301439+MEEPofFaith@users.noreply.github.com> Date: Mon, 13 Dec 2021 18:44:10 -0800 Subject: [PATCH 16/20] remove space from perSecond and perMinute (#6435) --- core/src/mindustry/world/meta/StatUnit.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/world/meta/StatUnit.java b/core/src/mindustry/world/meta/StatUnit.java index e35ce74402..e7d4288bd3 100644 --- a/core/src/mindustry/world/meta/StatUnit.java +++ b/core/src/mindustry/world/meta/StatUnit.java @@ -19,8 +19,8 @@ public enum StatUnit{ degrees, seconds, minutes, - perSecond, - perMinute, + perSecond(false), + perMinute(false), perShot(false), timesSpeed(false), percent(false), From 339d87ad789b80ca20ba4e595a2ab182e57e4723 Mon Sep 17 00:00:00 2001 From: "Matthew (or Maya) Peng" <54301439+MEEPofFaith@users.noreply.github.com> Date: Mon, 13 Dec 2021 18:44:54 -0800 Subject: [PATCH 17/20] Check the status, not the bullet (#6434) --- core/src/mindustry/world/meta/StatValues.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java index ba07d8e19d..04f02af137 100644 --- a/core/src/mindustry/world/meta/StatValues.java +++ b/core/src/mindustry/world/meta/StatValues.java @@ -330,7 +330,7 @@ public class StatValues{ } if(type.status != StatusEffects.none){ - sep(bt, (type.minfo.mod == null ? type.status.emoji() : "") + "[stat]" + type.status.localizedName); + sep(bt, (type.status.minfo.mod == null ? type.status.emoji() : "") + "[stat]" + type.status.localizedName); } if(type.fragBullet != null){ From 4b6541ae4ebd8fd3321d09ddb1afe2271d50a84e Mon Sep 17 00:00:00 2001 From: KuhnChris Date: Tue, 14 Dec 2021 18:52:26 +0100 Subject: [PATCH 18/20] Update missing "core launch animation skip" in german translation file (bundle_de) (#6430) * Update settings file (bundle_de) * Update bundle_de.properties --- core/assets/bundles/bundle_de.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 1e86cdd66d..ffabec8ed2 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -860,7 +860,7 @@ category.items = Materialien category.crafting = Erzeugung category.function = Funktion category.optional = Optionale Zusätze -setting.skipcoreanimation.name = Skip Core Launch/Land Animation +setting.skipcoreanimation.name = Kern Start- und Lande-Animation überspringen setting.landscape.name = Landschaft sperren setting.shadows.name = Schatten setting.blockreplace.name = Automatische Blockvorschläge From 7880135824b6dce61bf2411ce2d6dac0a1600b8d Mon Sep 17 00:00:00 2001 From: L0615T1C5-216AC-9437 <60281819+L0615T1C5-216AC-9437@users.noreply.github.com> Date: Fri, 17 Dec 2021 17:13:49 -0500 Subject: [PATCH 19/20] Allow setting to be reset through the use of `config key default` (#6442) --- server/src/mindustry/server/ServerControl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index 230180772d..2a4026d792 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -576,7 +576,9 @@ public class ServerControl implements ApplicationListener{ if(arg.length == 1){ info("'@' is currently @.", c.name(), c.get()); }else{ - if(c.isBool()){ + if (arg[1].equals("default")){ + c.set(c.defaultValue); + }else if(c.isBool()){ c.set(arg[1].equals("on") || arg[1].equals("true")); }else if(c.isNum()){ try{ From 24d3054bac5daf9c41a4331982a1903bf9ca6ba7 Mon Sep 17 00:00:00 2001 From: Valeriy Date: Sat, 18 Dec 2021 23:35:58 +1000 Subject: [PATCH 20/20] End of this nightmare (#6444) SMoA/Skaarj was end of existing --- servers_v7.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/servers_v7.json b/servers_v7.json index 9a2b23ef00..befb1d1637 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -3,10 +3,6 @@ "name": "mindustry.pl", "address": ["0.baseduser.eu.org:6000", "0.baseduser.eu.org:6666", "0.baseduser.eu.org:6966"] }, - { - "name": "SkaarjDustry", - "address": ["skaarjproject.duckdns.org"] - }, { "name": "C.A.M.S.", "address": ["baseduser.eu.org:6569", "v7.thedimas.pp.ua", "yeeth.mindustry.me:7000", "yeeth.mindustry.me:4000", "yeeth.mindustry.me:2000", "yeeth.mindustry.me:3000"]