Merge remote-tracking branch 'origin/master'

core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java

@@ -136,6 +136,7 @@ public class ItemTurret extends Turret{
             }
 
             BulletType type = ammoTypes.get(item);
+            if(type == null) return;
             totalAmmo += type.ammoMultiplier;
 
             //find ammo entry by type

servers_be.json

@@ -12,6 +12,9 @@
     "address": "mindustry.pl:7777"
   },
   {
-    "address": "mindurka.tk:9999"
+    "address": "v7.mindurka.tk:9999"
+  },
+  {
+    "address": "mindustry.me:7000"
   }
 ]

servers_v6.json

@@ -106,5 +106,9 @@
   {
     "name": "MeowLand",
     "address": ["34.134.111.15"]
+  },
+  {
+    "name": "[accent]Mindustry [red]Reborn",
+    "address": ["mindustry.me", "mindustry.me:1000", "mindustry.me:2000", "mindustry.me:3000"]
   }
 ]