resolve conflicts

core/assets/bundles/bundle.properties

@@ -583,47 +583,6 @@ error.crashtitle = An error has occured
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
 block.unknown = [lightgray]???
-blocks.powercapacity = Power Capacity
-blocks.powershot = Power/Shot
-blocks.damage = Damage
-blocks.targetsair = Targets Air
-blocks.targetsground = Targets Ground
-blocks.itemsmoved = Move Speed
-blocks.launchtime = Time Between Launches
-blocks.shootrange = Range
-blocks.size = Size
-blocks.displaysize = Display Size
-blocks.liquidcapacity = Liquid Capacity
-blocks.powerrange = Power Range
-blocks.linkrange = Link Range
-blocks.instructions = Instructions
-blocks.powerconnections = Max Connections
-blocks.poweruse = Power Use
-blocks.powerdamage = Power/Damage
-blocks.itemcapacity = Item Capacity
-blocks.memorycapacity = Memory Capacity
-blocks.basepowergeneration = Base Power Generation
-blocks.productiontime = Production Time
-blocks.repairtime = Block Full Repair Time
-blocks.speedincrease = Speed Increase
-blocks.range = Range
-blocks.drilltier = Drillables
-blocks.drillspeed = Base Drill Speed
-blocks.boosteffect = Boost Effect
-blocks.maxunits = Max Active Units
-blocks.health = Health
-blocks.buildtime = Build Time
-blocks.maxconsecutive = Max Consecutive
-blocks.buildcost = Build Cost
-blocks.inaccuracy = Inaccuracy
-blocks.shots = Shots
-blocks.reload = Shots/Second
-blocks.ammo = Ammo
-blocks.shieldhealth = Shield Health
-blocks.cooldowntime = Cooldown Time
-blocks.basedeflectchance = Base Deflect Chance
-blocks.lightningchance = Lightning Chance
-blocks.lightningdamage = Lightning Damage
 
 stat.input = Input
 stat.output = Output
@@ -669,6 +628,9 @@ stat.ammo = Ammo
 stat.shieldhealth = Shield Health
 stat.cooldowntime = Cooldown Time
 stat.explosiveness = Explosiveness
+stat.basedeflectchance = Base Deflect Chance
+stat.lightningchance = Lightning Chance
+stat.lightningdamage = Lightning Damage
 stat.flammability = Flammability
 stat.radioactivity = Radioactivity
 stat.heatcapacity = HeatCapacity

core/src/mindustry/world/blocks/defense/Wall.java

@@ -43,10 +43,10 @@ public class Wall extends Block{
     public void setStats(){
         super.setStats();
 
-        if(chanceDeflect > 0f) stats.add(BlockStat.baseDeflectChance, chanceDeflect, StatUnit.none);
+        if(chanceDeflect > 0f) stats.add(Stat.baseDeflectChance, chanceDeflect, StatUnit.none);
         if(lightningChance > 0f){
-            stats.add(BlockStat.lightningChance, lightningChance * 100f, StatUnit.percent);
+            stats.add(Stat.lightningChance, lightningChance * 100f, StatUnit.percent);
-            stats.add(BlockStat.lightningDamage, lightningDamage, StatUnit.none);
+            stats.add(Stat.lightningDamage, lightningDamage, StatUnit.none);
         }
     }
 

core/src/mindustry/world/meta/BlockStat.java

@@ -1,71 +0,0 @@
-package mindustry.world.meta;
-
-import arc.*;
-
-import java.util.*;
-
-/** Describes one type of stat for a block. */
-public enum BlockStat{
-    health(StatCategory.general),
-    size(StatCategory.general),
-    displaySize(StatCategory.general),
-    buildTime(StatCategory.general),
-    buildCost(StatCategory.general),
-    memoryCapacity(StatCategory.general),
-    baseDeflectChance(StatCategory.general), 
-    lightningChance(StatCategory.general),
-    lightningDamage(StatCategory.general),
-
-    itemCapacity(StatCategory.items),
-    itemsMoved(StatCategory.items),
-    launchTime(StatCategory.items),
-    maxConsecutive(StatCategory.items),
-
-    liquidCapacity(StatCategory.liquids),
-
-    powerCapacity(StatCategory.power),
-    powerUse(StatCategory.power),
-    powerDamage(StatCategory.power),
-    powerRange(StatCategory.power),
-    powerConnections(StatCategory.power),
-    basePowerGeneration(StatCategory.power),
-
-    tiles(StatCategory.crafting),
-    input(StatCategory.crafting),
-    output(StatCategory.crafting),
-    productionTime(StatCategory.crafting),
-    drillTier(StatCategory.crafting),
-    drillSpeed(StatCategory.crafting),
-    maxUnits(StatCategory.crafting),
-    linkRange(StatCategory.crafting),
-    instructions(StatCategory.crafting),
-
-    speedIncrease(StatCategory.shooting),
-    repairTime(StatCategory.shooting),
-    range(StatCategory.shooting),
-    shootRange(StatCategory.shooting),
-    inaccuracy(StatCategory.shooting),
-    shots(StatCategory.shooting),
-    reload(StatCategory.shooting),
-    powerShot(StatCategory.shooting),
-    targetsAir(StatCategory.shooting),
-    targetsGround(StatCategory.shooting),
-    damage(StatCategory.shooting),
-    ammo(StatCategory.shooting),
-    shieldHealth(StatCategory.shooting),
-    cooldownTime(StatCategory.shooting),
-
-    booster(StatCategory.optional),
-    boostEffect(StatCategory.optional),
-    affinities(StatCategory.optional);
-
-    public final StatCategory category;
-
-    BlockStat(StatCategory category){
-        this.category = category;
-    }
-
-    public String localized(){
-        return Core.bundle.get("blocks." + name().toLowerCase(Locale.ROOT));
-    }
-}

core/src/mindustry/world/meta/Stat.java

@@ -22,6 +22,9 @@ public enum Stat{
     buildSpeed,
     mineSpeed,
     mineTier,
+    baseDeflectChance,
+    lightningChance, 
+    lightningDamage,
 
     itemCapacity(StatCat.items),
     itemsMoved(StatCat.items),