Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle.properties

@@ -2372,7 +2372,7 @@ lglobal.@clientLocale = Locale of the client running the code. For example: en_U
 lglobal.@clientUnit = Unit of client running the code
 lglobal.@clientName = Player name of client running the code
 lglobal.@clientTeam = Team ID of client running the code
-lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+lglobal.@clientMobile = True if the client running the code is on mobile, false otherwise
 
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 
@@ -2532,4 +2532,4 @@ lenum.texturesize = Size of texture in tiles. Zero value scales marker width to
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
 lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
 lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
-lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.colori = Indexed color, used for line and quad markers with index zero being the first color.

core/src/mindustry/world/blocks/logic/SwitchBlock.java

@@ -42,6 +42,11 @@ public class SwitchBlock extends Block{
             if(privileged) return;
             super.damage(damage);
         }
+        
+        @Override
+        public boolean canPickup(){
+            return !privileged;
+        }
 
         @Override
         public boolean collide(Bullet other){