Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle.properties

@@ -652,6 +652,8 @@ bullet.homing = [stat]homing
 bullet.shock = [stat]shock
 bullet.frag = [stat]frag
 bullet.knockback = [stat]{0}[lightgray] knockback
+bullet.pierce = [stat]{0}[lightgray] pierce
+bullet.infinitepierce = [stat]pierce
 bullet.freezing = [stat]freezing
 bullet.tarred = [stat]tarred
 bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier

core/src/mindustry/world/blocks/ItemSelection.java

@@ -15,6 +15,10 @@ public class ItemSelection{
     private static float scrollPos = 0f;
 
     public static <T extends UnlockableContent> void buildTable(Table table, Seq<T> items, Prov<T> holder, Cons<T> consumer){
+        buildTable(table, items, holder, consumer, true);
+    }
+    
+    public static <T extends UnlockableContent> void buildTable(Table table, Seq<T> items, Prov<T> holder, Cons<T> consumer, boolean closeSelect){
 
         ButtonGroup<ImageButton> group = new ButtonGroup<>();
         group.setMinCheckCount(0);
@@ -26,7 +30,9 @@ public class ItemSelection{
         for(T item : items){
             if(!item.unlockedNow()) continue;
 
-            ImageButton button = cont.button(Tex.whiteui, Styles.clearToggleTransi, 24, () -> control.input.frag.config.hideConfig()).group(group).get();
+            ImageButton button = cont.button(Tex.whiteui, Styles.clearToggleTransi, 24, () -> {
+                if(closeSelect) control.input.frag.config.hideConfig();
+            }).group(group).get();
             button.changed(() -> consumer.get(button.isChecked() ? item : null));
             button.getStyle().imageUp = new TextureRegionDrawable(item.icon(Cicon.small));
             button.update(() -> button.setChecked(holder.get() == item));

core/src/mindustry/world/meta/values/AmmoListValue.java

@@ -50,6 +50,10 @@ public class AmmoListValue<T extends UnlockableContent> implements StatValue{
                     sep(bt, Core.bundle.format("bullet.knockback", Strings.fixed(type.knockback, 1)));
                 }
 
+                if(type.pierce || type.pierceCap != -1){
+                    sep(bt, type.pierceCap == -1 ? "@bullet.infinitepierce" : Core.bundle.format("bullet.pierce", type.pierceCap));
+                }
+
                 if((type.status == StatusEffects.burning || type.status == StatusEffects.melting) || type.incendAmount > 0){
                     sep(bt, "@bullet.incendiary");
                 }

servers.json

@@ -35,6 +35,9 @@
   {
     "address": "aamindustry.play.ai:6568"
   },
+  {
+    "address": "aamindustry.play.ai:6569"
+  },
   {
     "address": "aamindustry.play.ai:6570"
   },
@@ -73,5 +76,11 @@
   },
   {
     "address": "pandorum.su:9999"
+  },
+  {
+    "address": "mindustryranked.ddns.net"
+  },
+  {
+    "address": "attack.pearkin.net"
   }
 ]

servers_be.json

@@ -8,7 +8,13 @@
   {
     "address": "md.surrealment.com"
   },
+  {
+    "address": "routerchain.ddns.net"
+  },
   {
     "address": "mindustry.pl:6660"
+  },
+  {
+    "address": "be.wayzer.cf"
   }
 ]