Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle.properties

@@ -1265,7 +1265,7 @@ block.spore-press.description = Compresses spore pods into oil.
 block.pulverizer.description = Crushes scrap into fine sand.
 block.coal-centrifuge.description = Transforms oil into coal.
 block.incinerator.description = Vaporizes any item or liquid it receives.
-block.power-void.description = Voids all power inputted.
+block.power-void.description = Voids all power inputted. Sandbox only.
 block.power-source.description = Infinitely outputs power. Sandbox only.
 block.item-source.description = Infinitely outputs items. Sandbox only.
 block.item-void.description = Destroys any items. Sandbox only.

core/src/mindustry/content/Blocks.java

@@ -1744,7 +1744,6 @@ public class Blocks implements ContentList{
 
             rotateSpeed = 2.5f;
             reloadTime = 200f;
-            restitution = 0.2f;
             ammoUseEffect = Fx.casing3Double;
             recoilAmount = 5f;
             restitution = 0.009f;