Merge branch 'master' of https://github.com/Anuken/Mindustry

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)  
 |---	|---	|---	|---	|

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<String, Func<String[], LStatement>> customParsers = new ObjectMap<>();
-    public static final int maxTokenLength = 40;
+    public static final int maxTokenLength = 36;
 
     private int lastVar;
     /** Maps names to variable IDs. */

core/src/mindustry/ui/Bar.java

@@ -29,7 +29,11 @@ public class Bar extends Element{
 
     public Bar(Prov<String> name, Prov<Color> 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();

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.",
@@ -15,6 +19,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"
   }