Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0

# Conflicts: # core/src/mindustry/world/blocks/BuildBlock.java
2020-03-17 20:03:12 -04:00
parent 12d4aab48a 71f20f928a
commit 436c76fd2f
8 changed files with 26 additions and 15 deletions
@@ -779,6 +779,7 @@ rules.respawntime = Respawn Time:[lightgray] (sec)
 rules.wavespacing = Wave Spacing:[lightgray] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
+rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Waves Wait for Enemies
 rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
 rules.respawns = Max respawns per wave