From ca29909bec32418f264eb1febedf348ac6a7b30d Mon Sep 17 00:00:00 2001 From: AydenRennaker Date: Thu, 26 Nov 2020 18:32:31 -0800 Subject: [PATCH 1/5] Update servers_v6.json Add Atanner Gaming server back to list. Updates are looking good :) --- servers_v6.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v6.json b/servers_v6.json index c627e00001..3bdbd9bb9e 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -2,6 +2,10 @@ { "name": "mindustry.pl", "address": ["mindustry.pl:6000", "mindustry.pl:6666"] + }, + { + "name": "Atanner", + "address": ["atannergaming.com:13000"] }, { "name": "C.A.M.S.", From 47922834f98481fefa437a8483956dae3722c0a1 Mon Sep 17 00:00:00 2001 From: Leonid Skorospelov Date: Sat, 28 Nov 2020 14:16:30 +0200 Subject: [PATCH 2/5] Update servers_v6.json Ranked 1v1 gradually moving to v6 --- servers_v6.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v6.json b/servers_v6.json index c627e00001..88d00336cd 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -15,6 +15,10 @@ "name": "Chaotic Neutral", "address": ["Chaotic-Neutral.ddns.net:5555", "Chaotic-Neutral.ddns.net:6666"] }, + { + "name": "Ranked", + "address": ["mindustryranked.ddns.net:16567"] + }, { "address": "cheginde.ddns.net" } From e6c99e0c6d4dc08d088a678f39aa02b556de4167 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Nov 2020 10:42:50 -0500 Subject: [PATCH 3/5] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 882d0b15ae..5a87b04c42 100644 --- a/README.md +++ b/README.md @@ -61,5 +61,5 @@ Post feature requests and feedback [here](https://github.com/Anuken/Mindustry-Su ## Downloads -| [![](https://static.itch.io/images/badge.svg)](https://anuke.itch.io/mindustry) | [![](https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png)](https://play.google.com/store/apps/details?id=io.anuke.mindustry) | [![](https://fdroid.gitlab.io/artwork/badge/get-it-on.png)](https://f-droid.org/packages/io.anuke.mindustry) | [![](https://flathub.org/assets/badges/flathub-badge-en.svg)](https://flathub.org/apps/details/com.github.Anuken.Mindustry) | -|--- |--- |--- |--- | +| [![](https://static.itch.io/images/badge.svg)](https://anuke.itch.io/mindustry) | [![](https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png)](https://play.google.com/store/apps/details?id=io.anuke.mindustry) | [![](https://fdroid.gitlab.io/artwork/badge/get-it-on.png)](https://f-droid.org/packages/io.anuke.mindustry) | [![](https://flathub.org/assets/badges/flathub-badge-en.svg)](https://flathub.org/apps/details/com.github.Anuken.Mindustry) | [![](https://tools.applemediaservices.com/api/badges/download-on-the-app-store/black/en-US?size=250x83&releaseDate=1528416000&h=43142217e0fc99956f864865b9d8bc56)](https://apps.apple.com/us/app/mindustry/id1385258906?itsct=apps_box&itscg=30200) +|--- |--- |--- |--- |--- | From 1f1701f1d67409d6fefe37b610f1d29e14dd40fb Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Nov 2020 10:44:14 -0500 Subject: [PATCH 4/5] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5a87b04c42..97aece9742 100644 --- a/README.md +++ b/README.md @@ -61,5 +61,5 @@ Post feature requests and feedback [here](https://github.com/Anuken/Mindustry-Su ## Downloads -| [![](https://static.itch.io/images/badge.svg)](https://anuke.itch.io/mindustry) | [![](https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png)](https://play.google.com/store/apps/details?id=io.anuke.mindustry) | [![](https://fdroid.gitlab.io/artwork/badge/get-it-on.png)](https://f-droid.org/packages/io.anuke.mindustry) | [![](https://flathub.org/assets/badges/flathub-badge-en.svg)](https://flathub.org/apps/details/com.github.Anuken.Mindustry) | [![](https://tools.applemediaservices.com/api/badges/download-on-the-app-store/black/en-US?size=250x83&releaseDate=1528416000&h=43142217e0fc99956f864865b9d8bc56)](https://apps.apple.com/us/app/mindustry/id1385258906?itsct=apps_box&itscg=30200) -|--- |--- |--- |--- |--- | +| [![](https://static.itch.io/images/badge.svg)](https://anuke.itch.io/mindustry) | [![](https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png)](https://play.google.com/store/apps/details?id=io.anuke.mindustry) | [![](https://fdroid.gitlab.io/artwork/badge/get-it-on.png)](https://f-droid.org/packages/io.anuke.mindustry) | [![](https://flathub.org/assets/badges/flathub-badge-en.svg)](https://flathub.org/apps/details/com.github.Anuken.Mindustry) +|--- |--- |--- |--- | From 6e62859d0edc90df66e049077750288f84f3f570 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Nov 2020 11:31:07 -0500 Subject: [PATCH 5/5] Fixed #3644 --- core/src/mindustry/logic/LAssembler.java | 2 +- core/src/mindustry/ui/Bar.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/logic/LAssembler.java b/core/src/mindustry/logic/LAssembler.java index e06927cca2..560ac986ec 100644 --- a/core/src/mindustry/logic/LAssembler.java +++ b/core/src/mindustry/logic/LAssembler.java @@ -14,7 +14,7 @@ import mindustry.world.*; /** "Compiles" a sequence of statements into instructions. */ public class LAssembler{ public static ObjectMap> customParsers = new ObjectMap<>(); - public static final int maxTokenLength = 40; + public static final int maxTokenLength = 36; private int lastVar; /** Maps names to variable IDs. */ diff --git a/core/src/mindustry/ui/Bar.java b/core/src/mindustry/ui/Bar.java index 8051b67678..dbb7e9cc6f 100644 --- a/core/src/mindustry/ui/Bar.java +++ b/core/src/mindustry/ui/Bar.java @@ -29,7 +29,11 @@ public class Bar extends Element{ public Bar(Prov name, Prov color, Floatp fraction){ this.fraction = fraction; - lastValue = value = Mathf.clamp(fraction.get()); + try{ + lastValue = value = Mathf.clamp(fraction.get()); + }catch(Exception e){ //getting the fraction may involve referring to invalid data + lastValue = value = 0f; + } update(() -> { try{ this.name = name.get();