Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-11-05 09:09:27 -05:00
parent 47b123c219 cfdc30ab7e
commit df7b8e78e9
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/assets/bundles/bundle.properties
View File

@@ -1265,7 +1265,7 @@ block.spore-press.description = Compresses spore pods into oil.
block.pulverizer.description = Crushes scrap into fine sand. block.pulverizer.description = Crushes scrap into fine sand.
block.coal-centrifuge.description = Transforms oil into coal. block.coal-centrifuge.description = Transforms oil into coal.
block.incinerator.description = Vaporizes any item or liquid it receives. 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.power-source.description = Infinitely outputs power. Sandbox only.
block.item-source.description = Infinitely outputs items. Sandbox only. block.item-source.description = Infinitely outputs items. Sandbox only.
block.item-void.description = Destroys any items. Sandbox only. block.item-void.description = Destroys any items. Sandbox only.
@@ -1421,4 +1421,4 @@ unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at
unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Constructs flare units. unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Constructs flare units.
unit.alpha.description = Defends the Shard core from enemies. Builds structures. unit.alpha.description = Defends the Shard core from enemies. Builds structures.
unit.beta.description = Defends the Foundation core from enemies. Builds structures. unit.beta.description = Defends the Foundation core from enemies. Builds structures.
unit.gamma.description = Defends the Nucleus core from enemies. Builds structures. unit.gamma.description = Defends the Nucleus core from enemies. Builds structures.

1
core/src/mindustry/content/Blocks.java
View File

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