Merge remote-tracking branch 'origin/master'

core/src/mindustry/mod/Mods.java

@@ -1173,6 +1173,7 @@ public class Mods implements Loadable{
 
         //removes all colors
         public void cleanup(){
+            if(name != null) name = Strings.stripColors(name);
             if(displayName != null) displayName = Strings.stripColors(displayName);
             if(author != null) author = Strings.stripColors(author);
             if(description != null) description = Strings.stripColors(description);

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

@@ -82,17 +82,6 @@ public class ItemTurret extends Turret{
     }
 
     public class ItemTurretBuild extends TurretBuild{
-
-        @Override
-        public void onProximityAdded(){
-            super.onProximityAdded();
-
-            //add first ammo item to cheaty blocks so they can shoot properly
-            if(cheating() && ammoTypes.size > 0){
-                handleItem(this, ammoTypes.entries().next().key);
-            }
-        }
-
         @Override
         public void updateTile(){
             unit.ammo((float)unit.type().ammoCapacity * totalAmmo / maxAmmo);