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

# Conflicts:
#	core/src/mindustry/world/blocks/BuildBlock.java
This commit is contained in:
Anuken
2020-03-17 20:03:12 -04:00
8 changed files with 26 additions and 15 deletions

View File

@@ -127,7 +127,7 @@ public class BuildBlock extends Block{
private float[] accumulator;
private float[] totalAccumulator;
@Override
public String getDisplayName(){
return Core.bundle.format("block.constructing", cblock == null ? previous.localizedName : cblock.localizedName);
@@ -230,7 +230,7 @@ public class BuildBlock extends Block{
}
public void deconstruct(Unitc builder, @Nullable Tilec core, float amount){
float deconstructMultiplier = 0.5f;
float deconstructMultiplier = state.rules.deconstructRefundMultiplier;
if(cblock != null){
ItemStack[] requirements = cblock.requirements;