Merge remote-tracking branch 'upstream/master' into wall-stats

core/assets/bundles/bundle.properties

@@ -512,6 +512,7 @@ weather.rain.name = Rain
 weather.snow.name = Snow
 weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
+weather.fog.name = Fog
 
 sectors.unexplored = [lightgray]Unexplored
 sectors.resources = Resources:
@@ -581,11 +582,6 @@ error.title = [scarlet]An error has occured
 error.crashtitle = An error has occured
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
-blocks.input = Input
-blocks.output = Output
-blocks.booster = Booster
-blocks.tiles = Required Tiles
-blocks.affinities = Affinities
 block.unknown = [lightgray]???
 blocks.powercapacity = Power Capacity
 blocks.powershot = Power/Shot
@@ -629,6 +625,60 @@ blocks.basedeflectchance = Base Deflect Chance
 blocks.lightningchance = Lightning Chance
 blocks.lightningdamage = Lightning Damage
 
+stat.input = Input
+stat.output = Output
+stat.booster = Booster
+stat.tiles = Required Tiles
+stat.affinities = Affinities
+stat.powercapacity = Power Capacity
+stat.powershot = Power/Shot
+stat.damage = Damage
+stat.targetsair = Targets Air
+stat.targetsground = Targets Ground
+stat.itemsmoved = Move Speed
+stat.launchtime = Time Between Launches
+stat.shootrange = Range
+stat.size = Size
+stat.displaysize = Display Size
+stat.liquidcapacity = Liquid Capacity
+stat.powerrange = Power Range
+stat.linkrange = Link Range
+stat.instructions = Instructions
+stat.powerconnections = Max Connections
+stat.poweruse = Power Use
+stat.powerdamage = Power/Damage
+stat.itemcapacity = Item Capacity
+stat.memorycapacity = Memory Capacity
+stat.basepowergeneration = Base Power Generation
+stat.productiontime = Production Time
+stat.repairtime = Block Full Repair Time
+stat.speedincrease = Speed Increase
+stat.range = Range
+stat.drilltier = Drillables
+stat.drillspeed = Base Drill Speed
+stat.boosteffect = Boost Effect
+stat.maxunits = Max Active Units
+stat.health = Health
+stat.buildtime = Build Time
+stat.maxconsecutive = Max Consecutive
+stat.buildcost = Build Cost
+stat.inaccuracy = Inaccuracy
+stat.shots = Shots
+stat.reload = Shots/Second
+stat.ammo = Ammo
+stat.shieldhealth = Shield Health
+stat.cooldowntime = Cooldown Time
+stat.explosiveness = Explosiveness
+stat.flammability = Flammability
+stat.radioactivity = Radioactivity
+stat.heatcapacity = HeatCapacity
+stat.viscosity = Viscosity
+stat.temperature = Temperature
+stat.speed = Speed
+stat.buildspeed = Build Speed
+stat.minespeed = Mine Speed
+stat.minetier = Mine Tier
+
 bar.drilltierreq = Better Drill Required
 bar.noresources = Missing Resources
 bar.corereq = Core Base Required
@@ -878,6 +928,7 @@ content.item.name = Items
 content.liquid.name = Liquids
 content.unit.name = Units
 content.block.name = Blocks
+
 item.copper.name = Copper
 item.lead.name = Lead
 item.coal.name = Coal
@@ -899,23 +950,6 @@ liquid.slag.name = Slag
 liquid.oil.name = Oil
 liquid.cryofluid.name = Cryofluid
 
-item.explosiveness = [lightgray]Explosiveness: {0}%
-item.flammability = [lightgray]Flammability: {0}%
-item.radioactivity = [lightgray]Radioactivity: {0}%
-
-unit.health = [lightgray]Health: {0}
-unit.speed = [lightgray]Speed: {0}
-unit.weapon = [lightgray]Weapon: {0}
-unit.itemcapacity = [lightgray]Item Capacity: {0}
-unit.minespeed = [lightgray]Mining Speed: {0}%
-unit.minepower = [lightgray]Mining Power: {0}
-unit.ability = [lightgray]Ability: {0}
-unit.buildspeed = [lightgray]Building Speed: {0}%
-
-liquid.heatcapacity = [lightgray]Heat Capacity: {0}
-liquid.viscosity = [lightgray]Viscosity: {0}
-liquid.temperature = [lightgray]Temperature: {0}
-
 unit.dagger.name = Dagger
 unit.mace.name = Mace
 unit.fortress.name = Fortress
@@ -1327,5 +1361,4 @@ block.cyclone.description = A large anti-air and anti-ground turret. Fires explo
 block.spectre.description = A massive dual-barreled cannon. Shoots large armor-piercing bullets at air and ground targets.
 block.meltdown.description = A massive laser cannon. Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate.
 block.repair-point.description = Continuously heals the closest damaged unit in its vicinity.
-block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
-
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.