diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 6ac2063baa..e27fe6ff96 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -345,69 +345,46 @@ error.crashtitle = An error has occured
 blocks.input = Input
 blocks.output = Output
 blocks.booster = Booster
-blocks.outputspeed = Drill Speed: {0}/
-blocks.efficiency = Efficiency: {0}%
-blocks.unknown = [LIGHT_GRAY]???
-blocks.blockinfo = Block Info
-blocks.powerbalance = Power: {0}
-blocks.poweroutput = Power Output: {0}
+block.unknown = [LIGHT_GRAY]???
 blocks.powercapacity = Power Capacity
 blocks.powershot = Power/Shot
 blocks.targetsair = Targets Air
 blocks.targetsground = Targets Ground
-blocks.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.launchtime = Time Between Launches
 blocks.shootrange = Range
 blocks.size = Size
 blocks.liquidcapacity = Liquid Capacity
-blocks.maxitemssecond = Max Items
 blocks.powerrange = Power Range
 blocks.poweruse = Power Use
 blocks.powerdamage = Power/Damage
-blocks.inputitemcapacity = Input Item Capacity
-blocks.outputitemcapacity = Output Item Capacity
 blocks.itemcapacity = Item Capacity
 blocks.basepowergeneration = Base Power Generation
-blocks.powertransferspeed = Power Transfer
 blocks.productiontime = Production Time
 blocks.repairtime = Block Full Repair Time
 blocks.speedincrease = Speed Increase
 blocks.range = Range
-blocks.inputliquid = Input Liquid
-blocks.inputliquidaux = Aux Liquid
-blocks.inputitem = Input Item
-blocks.inputitems = Input Items
-blocks.outputitem = Output Item
 blocks.drilltier = Drillables
 blocks.drillspeed = Base Drill Speed
 blocks.boosteffect = Boost Effect
 blocks.maxunits = Max Active Units
-blocks.liquidoutput = Liquid Output
-blocks.liquidoutputspeed = Liquid Output Speed
-blocks.liquiduse = Liquid Use
-blocks.coolant = Coolant
-blocks.liquid = Liquid
-blocks.coolantuse = Coolant Use
-blocks.inputliquidfuel = Fuel Liquid
-blocks.liquidfueluse = Liquid Fuel Use
-blocks.boostitem = Boost Item
-blocks.boostliquid = Boost Liquid
 blocks.health = Health
-blocks.heat = Heat
-blocks.power = Power
-blocks.progress = Build Progress
-blocks.spawned = Units: {0}/{1}
-blocks.power.satisfaction = Power Satisfaction
 blocks.inaccuracy = Inaccuracy
 blocks.shots = Shots
 blocks.reload = Shots/Second
-blocks.inputfuel = Fuel
-blocks.fuelburntime = Fuel Burn Time
-blocks.inputcapacity = Input capacity
-blocks.outputcapacity = Output capacity
 blocks.ammo = Ammo
 
+bar.drillspeed = Drill Speed: {0}/s
+bar.efficiency = Efficiency: {0}%
+bar.powerbalance = Power: {0}
+bar.poweroutput = Power Output: {0}
+bar.items = Items: {0}
+bar.liquid = Liquid
+bar.heat = Heat
+bar.power = Power
+bar.progress = Build Progress
+bar.spawned = Units: {0}/{1}
+
 bullet.damage = [stat]{0}[lightgray] damage
 bullet.splashdamage = [stat]{0}[lightgray] area dmg ~[stat] {1}[lightgray] tiles
 bullet.incendiary = [stat]incendiary
@@ -430,7 +407,6 @@ unit.degrees = degrees
 unit.seconds = seconds
 unit.persecond = /sec
 unit.timesspeed = x speed
-unit.timesRadius = x radius
 unit.percent = %
 unit.items = items
 category.general = General
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index baaa2dbad1..471ca344eb 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -334,17 +334,17 @@ no = Ne
 info.title = Informace
 error.title = [crimson]Objevila se chyba
 error.crashtitle = Objevila se chyba
-blocks.outputspeed = Drill Speed: {0}/s
-blocks.efficiency = Efficiency: {0}%
-blocks.unknown = [LIGHT_GRAY]???
+bar.drillspeed = Drill Speed: {0}/s
+bar.efficiency = Efficiency: {0}%
+block.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Informace o bloku
-blocks.powerbalance = Power: {0}
-blocks.poweroutput = Power Output: {0}
+bar.powerbalance = Power: {0}
+bar.poweroutput = Power Output: {0}
 blocks.powercapacity = Kapacita energie
 blocks.powershot = Energie na výstřel
 blocks.targetsair = Zaměřuje vzdušné jednotky
 blocks.targetsground = Targets Ground
-blocks.items = Items: {0}
+bar.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Dostřel
 blocks.size = velikost
@@ -371,17 +371,17 @@ blocks.liquidoutput = Výstup tekutin
 blocks.liquidoutputspeed = Rychlost výstupu tekutin
 blocks.liquiduse = Spotřebuje tekutin
 blocks.coolant = Chlazení
-blocks.liquid = Liquid
+bar.liquid = Liquid
 blocks.coolantuse = Spotřeba chlazení
 blocks.inputliquidfuel = Palivo-tekutina
 blocks.liquidfueluse = Spotřeba Paliva-tekutiny
 blocks.boostitem = Předmět pro zrychlení
 blocks.boostliquid = Tekutina pro zrychlení
 blocks.health = Životy
-blocks.heat = Heat
-blocks.power = Power
-blocks.progress = Build Progress
-blocks.spawned = Units: {0}/{1}
+bar.heat = Heat
+bar.power = Power
+bar.progress = Build Progress
+bar.spawned = Units: {0}/{1}
 blocks.power.satisfaction = Power Satisfaction
 blocks.inaccuracy = Nepřesnost/výchylka
 blocks.shots = Střely
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index fe20660e76..995d053f74 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -334,17 +334,17 @@ no = Nein
 info.title = [accent]Info
 error.title = [crimson] Ein Fehler ist aufgetreten
 error.crashtitle = Ein Fehler ist aufgetreten!
-blocks.outputspeed = Drill Speed: {0}/s
-blocks.efficiency = Efficiency: {0}%
-blocks.unknown = [LIGHT_GRAY]???
+bar.drillspeed = Drill Speed: {0}/s
+bar.efficiency = Efficiency: {0}%
+block.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Blockinfo:
-blocks.powerbalance = Power: {0}
-blocks.poweroutput = Power Output: {0}
+bar.powerbalance = Power: {0}
+bar.poweroutput = Power Output: {0}
 blocks.powercapacity = Kapazität
 blocks.powershot = Stromverbrauch/Schuss
 blocks.targetsair = Visiert Luft Einheiten an
 blocks.targetsground = Targets Ground
-blocks.items = Items: {0}
+bar.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Reichweite
 blocks.size = Größe
@@ -371,17 +371,17 @@ blocks.liquidoutput = Erzeugte Flüssigkeit
 blocks.liquidoutputspeed = Ausgabegeschwindigkeit
 blocks.liquiduse = Flüssigkeitsverbrauch
 blocks.coolant = Kühlmittel
-blocks.liquid = Liquid
+bar.liquid = Liquid
 blocks.coolantuse = Kühlmittelverbrauch
 blocks.inputliquidfuel = Kraftstoff
 blocks.liquidfueluse = Kraftstoffverbrauch
 blocks.boostitem = Boost Item
 blocks.boostliquid = Boost Liquid
 blocks.health = Lebenspunkte
-blocks.heat = Heat
-blocks.power = Power
-blocks.progress = Build Progress
-blocks.spawned = Units: {0}/{1}
+bar.heat = Heat
+bar.power = Power
+bar.progress = Build Progress
+bar.spawned = Units: {0}/{1}
 blocks.power.satisfaction = Power Satisfaction
 blocks.inaccuracy = Ungenauigkeit
 blocks.shots = Schüsse
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index 320c840898..0022468e7c 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -334,17 +334,17 @@ no = No
 info.title = [accent]Información
 error.title = [crimson]Un error ha ocurrido.
 error.crashtitle = Un error ha ocurrido.
-blocks.outputspeed = Drill Speed: {0}/s
-blocks.efficiency = Efficiency: {0}%
-blocks.unknown = [LIGHT_GRAY]???
+bar.drillspeed = Drill Speed: {0}/s
+bar.efficiency = Efficiency: {0}%
+block.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Información del Bloque
-blocks.powerbalance = Power: {0}
-blocks.poweroutput = Power Output: {0}
+bar.powerbalance = Power: {0}
+bar.poweroutput = Power Output: {0}
 blocks.powercapacity = Capacidad de Energía
 blocks.powershot = Energía/Disparo
 blocks.targetsair = Apunta al Aire
 blocks.targetsground = Targets Ground
-blocks.items = Items: {0}
+bar.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Rango
 blocks.size = Tamaño
@@ -371,17 +371,17 @@ blocks.liquidoutput = Líquido de Salida
 blocks.liquidoutputspeed = Velocidad de Salida del Líquido
 blocks.liquiduse = Uso de Líquido
 blocks.coolant = Refrigerante
-blocks.liquid = Liquid
+bar.liquid = Liquid
 blocks.coolantuse = Uso del Refrigerante
 blocks.inputliquidfuel = Combustible Líquido
 blocks.liquidfueluse = Uso del Combustible Líquido
 blocks.boostitem = Boost Item
 blocks.boostliquid = Boost Liquid
 blocks.health = Vida
-blocks.heat = Heat
-blocks.power = Power
-blocks.progress = Build Progress
-blocks.spawned = Units: {0}/{1}
+bar.heat = Heat
+bar.power = Power
+bar.progress = Build Progress
+bar.spawned = Units: {0}/{1}
 blocks.power.satisfaction = Power Satisfaction
 blocks.inaccuracy = Imprecisión
 blocks.shots = Disparos
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index 66b29b1525..99bbab2cd9 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -334,17 +334,17 @@ no = Non
 info.title = Info
 error.title = [crimson]Une erreur s'est produite
 error.crashtitle = Une erreur s'est produite
-blocks.outputspeed = Drill Speed: {0}/s
-blocks.efficiency = Efficiency: {0}%
-blocks.unknown = [LIGHT_GRAY]???
+bar.drillspeed = Drill Speed: {0}/s
+bar.efficiency = Efficiency: {0}%
+block.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Info sur le bloc
-blocks.powerbalance = Power: {0}
-blocks.poweroutput = Power Output: {0}
+bar.powerbalance = Power: {0}
+bar.poweroutput = Power Output: {0}
 blocks.powercapacity = capacité d'énergie
 blocks.powershot = Énergie/Tir
 blocks.targetsair = Cible les unités aériennes
 blocks.targetsground = Targets Ground
-blocks.items = Items: {0}
+bar.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Portée
 blocks.size = Taille
@@ -371,17 +371,17 @@ blocks.liquidoutput = Liquide en sortie
 blocks.liquidoutputspeed = Vitesse de production de liquide
 blocks.liquiduse = Quantité de liquide utilisée
 blocks.coolant = Liquide de refroidissement
-blocks.liquid = Liquid
+bar.liquid = Liquid
 blocks.coolantuse = Quantité de liquide de refroidissement utilisée
 blocks.inputliquidfuel = Carburant liquide
 blocks.liquidfueluse = Quantité de carburant liquide utilisé
 blocks.boostitem = Boost Item
 blocks.boostliquid = Boost Liquid
 blocks.health = Santé
-blocks.heat = Heat
-blocks.power = Power
-blocks.progress = Build Progress
-blocks.spawned = Units: {0}/{1}
+bar.heat = Heat
+bar.power = Power
+bar.progress = Build Progress
+bar.spawned = Units: {0}/{1}
 blocks.power.satisfaction = Power Satisfaction
 blocks.inaccuracy = Précision
 blocks.shots = Tir
diff --git a/core/assets/bundles/bundle_fr_BE.properties b/core/assets/bundles/bundle_fr_BE.properties
index 532548e66b..6848f2aff2 100644
--- a/core/assets/bundles/bundle_fr_BE.properties
+++ b/core/assets/bundles/bundle_fr_BE.properties
@@ -334,17 +334,17 @@ no = Non
 info.title = Info
 error.title = [crimson]Une erreur s'est produite
 error.crashtitle = Une erreur s'est produite
-blocks.outputspeed = Drill Speed: {0}/s
-blocks.efficiency = Efficiency: {0}%
-blocks.unknown = [LIGHT_GRAY]???
+bar.drillspeed = Drill Speed: {0}/s
+bar.efficiency = Efficiency: {0}%
+block.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Info sur le bloc
-blocks.powerbalance = Power: {0}
-blocks.poweroutput = Power Output: {0}
+bar.powerbalance = Power: {0}
+bar.poweroutput = Power Output: {0}
 blocks.powercapacity = Capacité d'énergie
 blocks.powershot = Énergie/Tir
 blocks.targetsair = Cible les unités aériennes
 blocks.targetsground = Targets Ground
-blocks.items = Items: {0}
+bar.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Portée
 blocks.size = Taille
@@ -371,17 +371,17 @@ blocks.liquidoutput = Liquide en sortie
 blocks.liquidoutputspeed = Vitesse de sortie du liquide
 blocks.liquiduse = Quantité de liquide utilisé
 blocks.coolant = Liquide de refroidissement
-blocks.liquid = Liquid
+bar.liquid = Liquid
 blocks.coolantuse = Quantité de liquide de refroidissement utilisé
 blocks.inputliquidfuel = Carburant liquide
 blocks.liquidfueluse = Quantité de carburant liquide utilisé
 blocks.boostitem = Objet boostant la production
 blocks.boostliquid = Liquide boostant la production
 blocks.health = Santé
-blocks.heat = Heat
-blocks.power = Power
-blocks.progress = Build Progress
-blocks.spawned = Units: {0}/{1}
+bar.heat = Heat
+bar.power = Power
+bar.progress = Build Progress
+bar.spawned = Units: {0}/{1}
 blocks.power.satisfaction = Power Satisfaction
 blocks.inaccuracy = Précision
 blocks.shots = Tirs
diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties
index f4e4fc37e9..8fcd3eb972 100644
--- a/core/assets/bundles/bundle_in_ID.properties
+++ b/core/assets/bundles/bundle_in_ID.properties
@@ -334,17 +334,17 @@ no = No
 info.title = [accent]Info
 error.title = [crimson]Telah terjadi kesalahan
 error.crashtitle = Telah terjadi kesalahan
-blocks.outputspeed = Drill Speed: {0}/s
-blocks.efficiency = Efficiency: {0}%
-blocks.unknown = [LIGHT_GRAY]???
+bar.drillspeed = Drill Speed: {0}/s
+bar.efficiency = Efficiency: {0}%
+block.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Info Blok
-blocks.powerbalance = Power: {0}
-blocks.poweroutput = Power Output: {0}
+bar.powerbalance = Power: {0}
+bar.poweroutput = Power Output: {0}
 blocks.powercapacity = Kapasitas Tenaga
 blocks.powershot = Tenaga/tembakan
 blocks.targetsair = Targets Air
 blocks.targetsground = Targets Ground
-blocks.items = Items: {0}
+bar.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Range
 blocks.size = Ukuran
@@ -371,17 +371,17 @@ blocks.liquidoutput = Liquid Output
 blocks.liquidoutputspeed = Liquid Output Speed
 blocks.liquiduse = Liquid Use
 blocks.coolant = Coolant
-blocks.liquid = Liquid
+bar.liquid = Liquid
 blocks.coolantuse = Coolant Use
 blocks.inputliquidfuel = Fuel Liquid
 blocks.liquidfueluse = Liquid Fuel Use
 blocks.boostitem = Boost Item
 blocks.boostliquid = Boost Liquid
 blocks.health = Darah
-blocks.heat = Heat
-blocks.power = Power
-blocks.progress = Build Progress
-blocks.spawned = Units: {0}/{1}
+bar.heat = Heat
+bar.power = Power
+bar.progress = Build Progress
+bar.spawned = Units: {0}/{1}
 blocks.power.satisfaction = Power Satisfaction
 blocks.inaccuracy = Ketidaktelitian
 blocks.shots = Tembakan
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index e271de7b55..d81f5ed85b 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -334,17 +334,17 @@ no = No
 info.title = [accent] Info
 error.title = [crimson]Si è verificato un errore
 error.crashtitle = Si è verificato un errore
-blocks.outputspeed = Drill Speed: {0}/s
-blocks.efficiency = Efficiency: {0}%
-blocks.unknown = [LIGHT_GRAY]???
+bar.drillspeed = Drill Speed: {0}/s
+bar.efficiency = Efficiency: {0}%
+block.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = info sul blocco
-blocks.powerbalance = Power: {0}
-blocks.poweroutput = Power Output: {0}
+bar.powerbalance = Power: {0}
+bar.poweroutput = Power Output: {0}
 blocks.powercapacity = Capacità Energetica
 blocks.powershot = Danno/Colpo
 blocks.targetsair = Attacca nemici aerei
 blocks.targetsground = Targets Ground
-blocks.items = Items: {0}
+bar.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Raggio
 blocks.size = Grandezza
@@ -371,17 +371,17 @@ blocks.liquidoutput = Uscita liquidi
 blocks.liquidoutputspeed = Liquid Output Speed
 blocks.liquiduse = Uso liquidi
 blocks.coolant = Refrigerante
-blocks.liquid = Liquid
+bar.liquid = Liquid
 blocks.coolantuse = uso refrigerante
 blocks.inputliquidfuel = carburante liquido
 blocks.liquidfueluse = Utilizzo carburante liquido
 blocks.boostitem = Boost Item
 blocks.boostliquid = Boost Liquid
 blocks.health = Salute
-blocks.heat = Heat
-blocks.power = Power
-blocks.progress = Build Progress
-blocks.spawned = Units: {0}/{1}
+bar.heat = Heat
+bar.power = Power
+bar.progress = Build Progress
+bar.spawned = Units: {0}/{1}
 blocks.power.satisfaction = Power Satisfaction
 blocks.inaccuracy = Inaccuratezza
 blocks.shots = Colpi
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index 09c7dc6cb5..c5ccbb48d5 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -334,17 +334,17 @@ no = いいえ
 info.title = 情報
 error.title = [crimson]エラーが発生しました
 error.crashtitle = エラーが発生しました
-blocks.outputspeed = 採掘速度: {0}/秒
-blocks.efficiency = 効率: {0}%
-blocks.unknown = [LIGHT_GRAY]???
+bar.drillspeed = 採掘速度: {0}/秒
+bar.efficiency = 効率: {0}%
+block.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = ブロック情報
-blocks.powerbalance = 電力: {0}
-blocks.poweroutput = 電力発電量: {0}
+bar.powerbalance = 電力: {0}
+bar.poweroutput = 電力発電量: {0}
 blocks.powercapacity = 電力容量
 blocks.powershot = 電力/ショット
 blocks.targetsair = 対空攻撃
 blocks.targetsground = 対地攻撃
-blocks.items = アイテム: {0}
+bar.items = アイテム: {0}
 blocks.itemsmoved = 輸送速度
 blocks.shootrange = 範囲
 blocks.size = 大きさ
@@ -371,17 +371,17 @@ blocks.liquidoutput = 搬出液体
 blocks.liquidoutputspeed = 液体搬出速度
 blocks.liquiduse = 液体使用量
 blocks.coolant = 冷却
-blocks.liquid = 液体
+bar.liquid = 液体
 blocks.coolantuse = 冷却使用量
 blocks.inputliquidfuel = 液体燃料
 blocks.liquidfueluse = 液体燃料使用量
 blocks.boostitem = 加速アイテム
 blocks.boostliquid = 加速液体
 blocks.health = 耐久値
-blocks.heat = 熱
-blocks.power = 電力
-blocks.progress = 建設状況
-blocks.spawned = ユニット数: {0}/{1}
+bar.heat = 熱
+bar.power = 電力
+bar.progress = 建設状況
+bar.spawned = ユニット数: {0}/{1}
 blocks.power.satisfaction = 電力需要
 blocks.inaccuracy = 精度のずれ
 blocks.shots = ショット
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index fd5480124d..cb6c433e3d 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -334,17 +334,17 @@ no = 아니오
 info.title = [accent]정보
 error.title = [crimson]오류가 발생했습니다.
 error.crashtitle = 오류가 발생했습니다.
-blocks.outputspeed = 채광 속도: {0}/s
-blocks.efficiency = Efficiency: {0}%
-blocks.unknown = [LIGHT_GRAY]???
+bar.drillspeed = 채광 속도: {0}/s
+bar.efficiency = Efficiency: {0}%
+block.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = 블록 정보
-blocks.powerbalance = 전력: {0}
-blocks.poweroutput = 전력 출력: {0}
+bar.powerbalance = 전력: {0}
+bar.poweroutput = 전력 출력: {0}
 blocks.powercapacity = 전력 용량
 blocks.powershot = 1발당 전력 소모량
 blocks.targetsair = 공중공격 가능
 blocks.targetsground = 지상공격 가능
-blocks.items = Items: {0}
+bar.items = Items: {0}
 blocks.itemsmoved = 이동 속도
 blocks.shootrange = 사거리
 blocks.size = 크기
@@ -371,17 +371,17 @@ blocks.liquidoutput = 액체 출력
 blocks.liquidoutputspeed = 액체 출력속도
 blocks.liquiduse = 액체 사용량
 blocks.coolant = 냉각제
-blocks.liquid = 액체
+bar.liquid = 액체
 blocks.coolantuse = 냉각제 사용
 blocks.inputliquidfuel = 연료 액
 blocks.liquidfueluse = 액체 연료 사용
 blocks.boostitem = 가속 아이템
 blocks.boostliquid = 가속 액체
 blocks.health = 체력
-blocks.heat = 발열
-blocks.power = 전력
-blocks.progress = 건설 진행
-blocks.spawned = 유닛: {0}/{1}
+bar.heat = 발열
+bar.power = 전력
+bar.progress = 건설 진행
+bar.spawned = 유닛: {0}/{1}
 blocks.power.satisfaction = 전력 만족도
 blocks.inaccuracy = 오차각
 blocks.shots = 발포 횟수
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index 4efd01ddca..43a6312443 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -334,17 +334,17 @@ no = No
 info.title = Info
 error.title = [crimson]An error has occured
 error.crashtitle = An error has occured
-blocks.outputspeed = Drill Speed: {0}/s
-blocks.efficiency = Efficiency: {0}%
-blocks.unknown = [LIGHT_GRAY]???
+bar.drillspeed = Drill Speed: {0}/s
+bar.efficiency = Efficiency: {0}%
+block.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Block Info
-blocks.powerbalance = Power: {0}
-blocks.poweroutput = Power Output: {0}
+bar.powerbalance = Power: {0}
+bar.poweroutput = Power Output: {0}
 blocks.powercapacity = Power Capacity
 blocks.powershot = Power/Shot
 blocks.targetsair = Targets Air
 blocks.targetsground = Targets Ground
-blocks.items = Items: {0}
+bar.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Range
 blocks.size = Size
@@ -371,17 +371,17 @@ blocks.liquidoutput = Liquid Output
 blocks.liquidoutputspeed = Liquid Output Speed
 blocks.liquiduse = Liquid Use
 blocks.coolant = Coolant
-blocks.liquid = Liquid
+bar.liquid = Liquid
 blocks.coolantuse = Coolant Use
 blocks.inputliquidfuel = Fuel Liquid
 blocks.liquidfueluse = Liquid Fuel Use
 blocks.boostitem = Boost Item
 blocks.boostliquid = Boost Liquid
 blocks.health = Health
-blocks.heat = Heat
-blocks.power = Power
-blocks.progress = Build Progress
-blocks.spawned = Units: {0}/{1}
+bar.heat = Heat
+bar.power = Power
+bar.progress = Build Progress
+bar.spawned = Units: {0}/{1}
 blocks.power.satisfaction = Power Satisfaction
 blocks.inaccuracy = Inaccuracy
 blocks.shots = Shots
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index c3f9cae764..a134803e92 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -334,17 +334,17 @@ no = Nie ma mowy!
 info.title = [accent]Informacje
 error.title = [crimson]Wystąpił błąd
 error.crashtitle = Wystąpił błąd
-blocks.outputspeed = Drill Speed: {0}/s
-blocks.efficiency = Efficiency: {0}%
-blocks.unknown = [LIGHT_GRAY]???
+bar.drillspeed = Drill Speed: {0}/s
+bar.efficiency = Efficiency: {0}%
+block.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Informacje o bloku
-blocks.powerbalance = Power: {0}
-blocks.poweroutput = Power Output: {0}
+bar.powerbalance = Power: {0}
+bar.poweroutput = Power Output: {0}
 blocks.powercapacity = Pojemność mocy
 blocks.powershot = moc/strzał
 blocks.targetsair = Może namierzać wrogów powietrznych
 blocks.targetsground = Targets Ground
-blocks.items = Items: {0}
+bar.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Zasięg
 blocks.size = Rozmiar
@@ -371,17 +371,17 @@ blocks.liquidoutput = Wyprodukowany płyn
 blocks.liquidoutputspeed = Prędkość odpływu cieczy
 blocks.liquiduse = Zużycie płynów
 blocks.coolant = Płyn chłodzący
-blocks.liquid = Płyn
+bar.liquid = Płyn
 blocks.coolantuse = Zużycie płynu chłodzącego
 blocks.inputliquidfuel = Paliwo
 blocks.liquidfueluse = Zużycie paliwa
 blocks.boostitem = Boost Item
 blocks.boostliquid = Boost Liquid
 blocks.health = Zdrowie
-blocks.heat = Heat
-blocks.power = Prąd
-blocks.progress = Build Progress
-blocks.spawned = Units: {0}/{1}
+bar.heat = Heat
+bar.power = Prąd
+bar.progress = Build Progress
+bar.spawned = Units: {0}/{1}
 blocks.power.satisfaction = Zapotrzebowanie Prądu
 blocks.inaccuracy = Niedokładność
 blocks.shots = Strzały
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index 1a5d99f3f3..51c21efdfc 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -334,17 +334,17 @@ no = Não
 info.title = [accent]Informação
 error.title = [crimson]Ocorreu um Erro.
 error.crashtitle = Ocorreu um Erro
-blocks.outputspeed = Drill Speed: {0}/s
-blocks.efficiency = Efficiency: {0}%
-blocks.unknown = [LIGHT_GRAY]???
+bar.drillspeed = Drill Speed: {0}/s
+bar.efficiency = Efficiency: {0}%
+block.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Informação do Bloco
-blocks.powerbalance = Power: {0}
-blocks.poweroutput = Power Output: {0}
+bar.powerbalance = Power: {0}
+bar.poweroutput = Power Output: {0}
 blocks.powercapacity = Capacidade de Energia
 blocks.powershot = Energia/tiro
 blocks.targetsair = Mirar no ar
 blocks.targetsground = Targets Ground
-blocks.items = Items: {0}
+bar.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Alcance
 blocks.size = Tamanho
@@ -371,17 +371,17 @@ blocks.liquidoutput = Saida de liquido
 blocks.liquidoutputspeed = Velocidade da saida de líquido
 blocks.liquiduse = Uso de liquido
 blocks.coolant = Esfriador
-blocks.liquid = Liquid
+bar.liquid = Liquid
 blocks.coolantuse = Uso do esfriador
 blocks.inputliquidfuel = Liquido de combustivel
 blocks.liquidfueluse = Uso do liquido de combustivel
 blocks.boostitem = Acelerar item
 blocks.boostliquid = Acelerar líquido
 blocks.health = Saúde
-blocks.heat = Heat
-blocks.power = Poder
-blocks.progress = Build Progress
-blocks.spawned = Units: {0}/{1}
+bar.heat = Heat
+bar.power = Poder
+bar.progress = Build Progress
+bar.spawned = Units: {0}/{1}
 blocks.power.satisfaction = Power Satisfaction
 blocks.inaccuracy = Imprecisão
 blocks.shots = Tiros
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index 42c006c712..6fb090c585 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -334,17 +334,17 @@ no = Нет
 info.title = Информация
 error.title = [crimson]Произошла ошибка
 error.crashtitle = Произошла ошибка
-blocks.outputspeed = Скорость сверления: {0}/с
-blocks.efficiency = Эффективность: {0}%
-blocks.unknown = [LIGHT_GRAY]???
+bar.drillspeed = Скорость сверления: {0}/с
+bar.efficiency = Эффективность: {0}%
+block.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Информация о блоке
-blocks.powerbalance = Энергия: {0}
-blocks.poweroutput = Выходная энергия: {0}
+bar.powerbalance = Энергия: {0}
+bar.poweroutput = Выходная энергия: {0}
 blocks.powercapacity = Вместимость энергии
 blocks.powershot = Энергия/выстрел
 blocks.targetsair = Воздушные цели
 blocks.targetsground = Наземные цели
-blocks.items = Предметы: {0}
+bar.items = Предметы: {0}
 blocks.itemsmoved = Скорость перемещения
 blocks.shootrange = Радиус действия
 blocks.size = Размер
@@ -371,17 +371,17 @@ blocks.liquidoutput = Выходящая жидкость
 blocks.liquidoutputspeed = Выходная скорость жидкости
 blocks.liquiduse = Используется жидкости
 blocks.coolant = Охлаждающая жидкость
-blocks.liquid = Жидкость
+bar.liquid = Жидкость
 blocks.coolantuse = Охлажд. жидкости используется
 blocks.inputliquidfuel = Жидкое топливо
 blocks.liquidfueluse = Жидкого топлива используется
 blocks.boostitem = Ускоряющий предмет
 blocks.boostliquid = Ускоряющая жидкость
 blocks.health = Здоровье
-blocks.heat = Температура
-blocks.power = Энергия
-blocks.progress = Строительство продолжается
-blocks.spawned = Бой. ед.: {0}/{1}
+bar.heat = Температура
+bar.power = Энергия
+bar.progress = Строительство продолжается
+bar.spawned = Бой. ед.: {0}/{1}
 blocks.power.satisfaction = Энергия
 blocks.inaccuracy = Разброс
 blocks.shots = Выстрелы
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index ae3a214a81..3a296fb431 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -334,17 +334,17 @@ no = Hayir
 info.title = [accent]Bilgi
 error.title = [crimson]Bir hata olustu
 error.crashtitle = Bir hata olustu
-blocks.outputspeed = Drill Speed: {0}/s
-blocks.efficiency = Efficiency: {0}%
-blocks.unknown = [LIGHT_GRAY]???
+bar.drillspeed = Drill Speed: {0}/s
+bar.efficiency = Efficiency: {0}%
+block.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Yapi bilgisi
-blocks.powerbalance = Power: {0}
-blocks.poweroutput = Power Output: {0}
+bar.powerbalance = Power: {0}
+bar.poweroutput = Power Output: {0}
 blocks.powercapacity = Guc kapasitesi
 blocks.powershot = Guc/Saldiri hizi
 blocks.targetsair = Havayi hedef alir mi?
 blocks.targetsground = Targets Ground
-blocks.items = Items: {0}
+bar.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Menzil
 blocks.size = Buyukluk
@@ -371,17 +371,17 @@ blocks.liquidoutput = Sivi cikisi
 blocks.liquidoutputspeed = Liquid Output Speed
 blocks.liquiduse = Sivi kullanimi
 blocks.coolant = Sogutma sivisi
-blocks.liquid = Liquid
+bar.liquid = Liquid
 blocks.coolantuse = Sogutma sivi kullanimi
 blocks.inputliquidfuel = Yakit sivisi
 blocks.liquidfueluse = Sivi yakit kullanimi
 blocks.boostitem = Boost Item
 blocks.boostliquid = Boost Liquid
 blocks.health = Can
-blocks.heat = Heat
-blocks.power = Power
-blocks.progress = Build Progress
-blocks.spawned = Units: {0}/{1}
+bar.heat = Heat
+bar.power = Power
+bar.progress = Build Progress
+bar.spawned = Units: {0}/{1}
 blocks.power.satisfaction = Power Satisfaction
 blocks.inaccuracy = sekme
 blocks.shots = vuruslar
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index 560e9d2b4d..4ceb60e40e 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -334,17 +334,17 @@ no = No
 info.title = [Vurgu] Bilgi
 error.title = [crimson] Bir hata oluştu
 error.crashtitle = Bir hata oluştu
-blocks.outputspeed = Drill Speed: {0}/s
-blocks.efficiency = Efficiency: {0}%
-blocks.unknown = [LIGHT_GRAY]???
+bar.drillspeed = Drill Speed: {0}/s
+bar.efficiency = Efficiency: {0}%
+block.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Blok Bilgisi
-blocks.powerbalance = Power: {0}
-blocks.poweroutput = Power Output: {0}
+bar.powerbalance = Power: {0}
+bar.poweroutput = Power Output: {0}
 blocks.powercapacity = Güç kapasitesi
 blocks.powershot = Güç / atış
 blocks.targetsair = Targets Air
 blocks.targetsground = Targets Ground
-blocks.items = Items: {0}
+bar.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Range
 blocks.size = Boyut
@@ -371,17 +371,17 @@ blocks.liquidoutput = Liquid Output
 blocks.liquidoutputspeed = Liquid Output Speed
 blocks.liquiduse = Liquid Use
 blocks.coolant = Coolant
-blocks.liquid = Liquid
+bar.liquid = Liquid
 blocks.coolantuse = Coolant Use
 blocks.inputliquidfuel = Fuel Liquid
 blocks.liquidfueluse = Liquid Fuel Use
 blocks.boostitem = Boost Item
 blocks.boostliquid = Boost Liquid
 blocks.health = Can
-blocks.heat = Heat
-blocks.power = Power
-blocks.progress = Build Progress
-blocks.spawned = Units: {0}/{1}
+bar.heat = Heat
+bar.power = Power
+bar.progress = Build Progress
+bar.spawned = Units: {0}/{1}
 blocks.power.satisfaction = Power Satisfaction
 blocks.inaccuracy = yanlışlık
 blocks.shots = atışlar
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index 7c576ec32d..ed680d48ac 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -334,17 +334,17 @@ no = Ні
 info.title = Інформація
 error.title = [crimson]Виникла помилка
 error.crashtitle = Виникла помилка
-blocks.outputspeed = Швидкість свердління: {0}/с
-blocks.efficiency = Ефективність: {0}%
-blocks.unknown = [LIGHT_GRAY]???
+bar.drillspeed = Швидкість свердління: {0}/с
+bar.efficiency = Ефективність: {0}%
+block.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Інформація про блок
-blocks.powerbalance = Енергія: {0}
-blocks.poweroutput = Вихідна енергія: {0}
+bar.powerbalance = Енергія: {0}
+bar.poweroutput = Вихідна енергія: {0}
 blocks.powercapacity = Місткість енергії
 blocks.powershot = Енергія/постріл
 blocks.targetsair = Повітряні мішені
 blocks.targetsground = Наземні мішені
-blocks.items = Предмети: {0}
+bar.items = Предмети: {0}
 blocks.itemsmoved = Швидкість переміщення
 blocks.shootrange = Діапазон дії
 blocks.size = Розмір
@@ -371,17 +371,17 @@ blocks.liquidoutput = Вихідна рідина
 blocks.liquidoutputspeed = Швидкість вихідної рідини
 blocks.liquiduse = Використовуеться рідин
 blocks.coolant = Охолоджуюча рідина
-blocks.liquid = Рідина
+bar.liquid = Рідина
 blocks.coolantuse = Охолодж. рідини використовуеться
 blocks.inputliquidfuel = Рідке паливо
 blocks.liquidfueluse = Рідкого палива використовуеться
 blocks.boostitem = Прискорюючий предмет
 blocks.boostliquid = Прискорююча рідина
 blocks.health = Здоров'я
-blocks.heat = Температура
-blocks.power = Енергія
-blocks.progress = Будівництво триває
-blocks.spawned = Бой. од.: {0}/{1}
+bar.heat = Температура
+bar.power = Енергія
+bar.progress = Будівництво триває
+bar.spawned = Бой. од.: {0}/{1}
 blocks.power.satisfaction = Енергія
 blocks.inaccuracy = Розкид
 blocks.shots = Постріли
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index 19250b0976..b558f14c0d 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -334,17 +334,17 @@ no = 不
 info.title = [accent]详情
 error.title = [crimson]发生了一个错误
 error.crashtitle = 发生了一个错误
-blocks.outputspeed = Drill Speed: {0}/s
-blocks.efficiency = Efficiency: {0}%
-blocks.unknown = [LIGHT_GRAY]???
+bar.drillspeed = Drill Speed: {0}/s
+bar.efficiency = Efficiency: {0}%
+block.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = 方块详情
-blocks.powerbalance = Power: {0}
-blocks.poweroutput = Power Output: {0}
+bar.powerbalance = Power: {0}
+bar.poweroutput = Power Output: {0}
 blocks.powercapacity = 能量容量
 blocks.powershot = 能量/发射
 blocks.targetsair = 攻击空中单位
 blocks.targetsground = Targets Ground
-blocks.items = Items: {0}
+bar.items = Items: {0}
 blocks.itemsmoved = 移动速度
 blocks.shootrange = 范围
 blocks.size = 尺寸
@@ -371,17 +371,17 @@ blocks.liquidoutput = 液体输出
 blocks.liquidoutputspeed = 液体输出速度
 blocks.liquiduse = 液体使用速度
 blocks.coolant = 冷却剂
-blocks.liquid = Liquid
+bar.liquid = Liquid
 blocks.coolantuse = 冷却剂使用速度
 blocks.inputliquidfuel = 液体燃料输入
 blocks.liquidfueluse = 液体燃料使用速度
 blocks.boostitem = 强化物件
 blocks.boostliquid = 强化液体
 blocks.health = 生命值
-blocks.heat = Heat
-blocks.power = 电力
-blocks.progress = Build Progress
-blocks.spawned = Units: {0}/{1}
+bar.heat = Heat
+bar.power = 电力
+bar.progress = Build Progress
+bar.spawned = Units: {0}/{1}
 blocks.power.satisfaction = 电力见面
 blocks.inaccuracy = 误差
 blocks.shots = 发射数
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index 1a14d395b7..c89b5a5b7d 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -334,17 +334,17 @@ no = 否
 info.title = [accent]資訊
 error.title = [crimson]發生錯誤
 error.crashtitle = 發生錯誤
-blocks.outputspeed = 鑽頭速度：{0}/秒
-blocks.efficiency = 效率：{0}%
-blocks.unknown = [LIGHT_GRAY]？？？
+bar.drillspeed = 鑽頭速度：{0}/秒
+bar.efficiency = 效率：{0}%
+block.unknown = [LIGHT_GRAY]？？？
 blocks.blockinfo = 方塊資訊
-blocks.powerbalance = 能量變化：{0}
-blocks.poweroutput = 能量輸出：{0}
+bar.powerbalance = 能量變化：{0}
+bar.poweroutput = 能量輸出：{0}
 blocks.powercapacity = 蓄電量
 blocks.powershot = 能量/射擊
 blocks.targetsair = 攻擊空中目標
 blocks.targetsground = 攻擊地面
-blocks.items = 物品：{0}
+bar.items = 物品：{0}
 blocks.itemsmoved = 移動速度
 blocks.shootrange = 範圍
 blocks.size = 尺寸
@@ -371,17 +371,17 @@ blocks.liquidoutput = 輸出液體
 blocks.liquidoutputspeed = 輸出液體速度
 blocks.liquiduse = 使用液體速度
 blocks.coolant = 冷卻劑
-blocks.liquid = 液體
+bar.liquid = 液體
 blocks.coolantuse = 使用冷卻劑
 blocks.inputliquidfuel = 輸入液體燃料
 blocks.liquidfueluse = 使用液體燃料速度
 blocks.boostitem = 強化物品
 blocks.boostliquid = 強化液體
 blocks.health = 耐久度
-blocks.heat = 熱
-blocks.power = 能量
-blocks.progress = 建造進度
-blocks.spawned = 單位：{0}/{1}
+bar.heat = 熱
+bar.power = 能量
+bar.progress = 建造進度
+bar.spawned = 單位：{0}/{1}
 blocks.power.satisfaction = 能量滿意度
 blocks.inaccuracy = 誤差
 blocks.shots = 射擊數
diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
index 253b14c3e4..0accd359db 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
@@ -192,7 +192,7 @@ public class PlacementFragment extends Fragment{
                             topTable.table(header -> {
                                 header.left();
                                 header.add(new Image(lastDisplay.icon(Icon.medium))).size(8 * 4);
-                                header.labelWrap(() -> !unlocked(lastDisplay) ? Core.bundle.get("blocks.unknown") : lastDisplay.localizedName)
+                                header.labelWrap(() -> !unlocked(lastDisplay) ? Core.bundle.get("block.unknown") : lastDisplay.localizedName)
                                 .left().width(190f).padLeft(5);
                                 header.add().growX();
                                 if(unlocked(lastDisplay)){
diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java
index 9add2bb570..1eced4b31a 100644
--- a/core/src/io/anuke/mindustry/world/Block.java
+++ b/core/src/io/anuke/mindustry/world/Block.java
@@ -413,19 +413,19 @@ public class Block extends BlockStorage{
             }else{
                 current = entity -> entity.liquids.current();
             }
-            bars.add("liquid", entity -> new Bar(() -> entity.liquids.get(current.get(entity)) <= 0.001f ? Core.bundle.get("blocks.liquid") : current.get(entity).localizedName(), () -> current.get(entity).color, () -> entity.liquids.get(current.get(entity)) / liquidCapacity));
+            bars.add("liquid", entity -> new Bar(() -> entity.liquids.get(current.get(entity)) <= 0.001f ? Core.bundle.get("bar.liquid") : current.get(entity).localizedName(), () -> current.get(entity).color, () -> entity.liquids.get(current.get(entity)) / liquidCapacity));
         }
 
         if(hasPower && consumes.hasPower()){
             boolean buffered = consumes.getPower().isBuffered;
             float capacity = consumes.getPower().powerCapacity;
 
-            bars.add("power", entity -> new Bar(() -> buffered ? Core.bundle.format("blocks.powerbalance", Float.isNaN(entity.power.satisfaction * capacity) ? "<ERROR>" : (int)(entity.power.satisfaction * capacity)) :
-                Core.bundle.get("blocks.power"), () -> Pal.powerBar, () -> entity.power.satisfaction));
+            bars.add("power", entity -> new Bar(() -> buffered ? Core.bundle.format("bar.powerbalance", Float.isNaN(entity.power.satisfaction * capacity) ? "<ERROR>" : (int)(entity.power.satisfaction * capacity)) :
+                Core.bundle.get("bar.power"), () -> Pal.powerBar, () -> entity.power.satisfaction));
         }
 
         if(hasItems && configurable){
-            bars.add("items", entity -> new Bar(() -> Core.bundle.format("blocks.items", entity.items.total()), () -> Pal.items, () -> (float)entity.items.total() / itemCapacity));
+            bars.add("items", entity -> new Bar(() -> Core.bundle.format("bar.items", entity.items.total()), () -> Pal.items, () -> (float)entity.items.total() / itemCapacity));
         }
     }
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java b/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java
index 3c2c8bcc70..bc619d002f 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java
@@ -52,7 +52,7 @@ public class ImpactReactor extends PowerGenerator{
         super.setBars();
 
         bars.add("poweroutput", entity -> new Bar(() ->
-            Core.bundle.format("blocks.poweroutput",
+            Core.bundle.format("bar.poweroutput",
             Strings.fixed(Math.max(entity.tile.block().getPowerProduction(entity.tile) - consumes.getPower().powerPerTick, 0)*60 * entity.delta(), 1)),
             () -> Pal.powerBar,
             () -> ((GeneratorEntity)entity).productionEfficiency));
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java b/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java
index 67b10c620e..62a8a00948 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java
@@ -73,7 +73,7 @@ public class NuclearReactor extends PowerGenerator{
     @Override
     public void setBars(){
         super.setBars();
-        bars.add("heat", entity -> new Bar("blocks.heat", Pal.lightOrange, () -> ((NuclearReactorEntity)entity).heat));
+        bars.add("heat", entity -> new Bar("bar.heat", Pal.lightOrange, () -> ((NuclearReactorEntity)entity).heat));
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerGenerator.java
index 15529e0772..5c93264f23 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/PowerGenerator.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerGenerator.java
@@ -39,7 +39,7 @@ public class PowerGenerator extends PowerDistributor{
 
         if(hasPower && outputsPower && !consumes.hasPower()){
             bars.add("power", entity -> new Bar(() ->
-            Core.bundle.format("blocks.poweroutput",
+            Core.bundle.format("bar.poweroutput",
             Strings.fixed(entity.tile.block().getPowerProduction(entity.tile)*60 * entity.timeScale, 1)),
             () -> Pal.powerBar,
             () -> ((GeneratorEntity)entity).productionEfficiency));
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java
index 01a56a2f87..bc995a375b 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java
@@ -92,7 +92,7 @@ public class PowerNode extends PowerBlock{
     public void setBars(){
         super.setBars();
         bars.add("power", entity -> new Bar(() ->
-            Core.bundle.format("blocks.powerbalance",
+            Core.bundle.format("bar.powerbalance",
             ((entity.power.graph.getPowerBalance() >= 0 ? "+" : "") + Strings.fixed(entity.power.graph.getPowerBalance()*60, 1))),
             () -> Pal.powerBar,
             () -> Mathf.clamp(entity.power.graph.getPowerProduced() / entity.power.graph.getPowerNeeded())));
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ThermalGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/ThermalGenerator.java
index 596da2c6ab..37b9da8212 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/ThermalGenerator.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/ThermalGenerator.java
@@ -28,7 +28,7 @@ public class ThermalGenerator extends PowerGenerator{
 
     @Override
     public void drawPlace(int x, int y, int rotation, boolean valid){
-        drawPlaceText(Core.bundle.formatFloat("blocks.efficiency", sumAttribute(Attribute.heat, x, y)*100, 1), x, y, valid);
+        drawPlaceText(Core.bundle.formatFloat("bar.efficiency", sumAttribute(Attribute.heat, x, y)*100, 1), x, y, valid);
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java b/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java
index 799f119d5b..5748dd5ea1 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java
@@ -53,7 +53,7 @@ public class Cultivator extends GenericCrafter{
     public void setBars(){
         super.setBars();
         bars.add("multiplier", entity -> new Bar(() ->
-        Core.bundle.formatFloat("blocks.efficiency",
+        Core.bundle.formatFloat("bar.efficiency",
         ((((CultivatorEntity)entity).boost + 1f) * ((CultivatorEntity)entity).warmup)*100f,1),
         () -> Pal.ammo,
         () -> ((CultivatorEntity)entity).warmup));
@@ -61,7 +61,7 @@ public class Cultivator extends GenericCrafter{
 
     @Override
     public void drawPlace(int x, int y, int rotation, boolean valid){
-        drawPlaceText(Core.bundle.formatFloat("blocks.efficiency", (1+sumAttribute(Attribute.spores, x, y))*100, 1), x, y, valid);
+        drawPlaceText(Core.bundle.formatFloat("bar.efficiency", (1+sumAttribute(Attribute.spores, x, y))*100, 1), x, y, valid);
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java
index 1593ef5064..9d6d286ce4 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java
@@ -79,7 +79,7 @@ public class Drill extends Block{
         bars.add("drillspeed", e -> {
             DrillEntity entity = (DrillEntity)e;
 
-            return new Bar(() -> Core.bundle.format("blocks.outputspeed", Strings.fixed(entity.lastDrillSpeed * 60 * entity.timeScale, 2)), () -> Pal.ammo, () -> entity.warmup);
+            return new Bar(() -> Core.bundle.format("bar.drillspeed", Strings.fixed(entity.lastDrillSpeed * 60 * entity.timeScale, 2)), () -> Pal.ammo, () -> entity.warmup);
         });
     }
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java b/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java
index 3103e8ba2f..1c6d396635 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java
@@ -42,7 +42,7 @@ public class SolidPump extends Pump{
     @Override
     public void drawPlace(int x, int y, int rotation, boolean valid){
         if(attribute != null){
-            drawPlaceText(Core.bundle.formatFloat("blocks.efficiency", (sumAttribute(attribute, x, y) + 1f)*100, 1), x, y, valid);
+            drawPlaceText(Core.bundle.formatFloat("bar.efficiency", (sumAttribute(attribute, x, y) + 1f)*100, 1), x, y, valid);
         }
     }
 
@@ -50,7 +50,7 @@ public class SolidPump extends Pump{
     public void setBars(){
         super.setBars();
         bars.add("efficiency", entity -> new Bar(() ->
-        Core.bundle.formatFloat("blocks.efficiency",
+        Core.bundle.formatFloat("bar.efficiency",
         ((((SolidPumpEntity)entity).boost + 1f) * ((SolidPumpEntity)entity).warmup) * 100, 1),
         () -> Pal.ammo,
         () -> ((SolidPumpEntity)entity).warmup));
diff --git a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java
index 2d3186bc15..7b425775e5 100644
--- a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java
+++ b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java
@@ -101,8 +101,8 @@ public class UnitFactory extends Block{
     @Override
     public void setBars(){
         super.setBars();
-        bars.add("progress", entity -> new Bar("blocks.progress", Pal.ammo, () -> ((UnitFactoryEntity)entity).buildTime / produceTime));
-        bars.add("spawned", entity -> new Bar(() -> Core.bundle.format("blocks.spawned", ((UnitFactoryEntity)entity).spawned, maxSpawn), () -> Pal.command, () -> (float)((UnitFactoryEntity)entity).spawned / maxSpawn));
+        bars.add("progress", entity -> new Bar("bar.progress", Pal.ammo, () -> ((UnitFactoryEntity)entity).buildTime / produceTime));
+        bars.add("spawned", entity -> new Bar(() -> Core.bundle.format("bar.spawned", ((UnitFactoryEntity)entity).spawned, maxSpawn), () -> Pal.command, () -> (float)((UnitFactoryEntity)entity).spawned / maxSpawn));
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/meta/BlockStat.java b/core/src/io/anuke/mindustry/world/meta/BlockStat.java
index a80f2aeca1..ed2af2abbb 100644
--- a/core/src/io/anuke/mindustry/world/meta/BlockStat.java
+++ b/core/src/io/anuke/mindustry/world/meta/BlockStat.java
@@ -21,7 +21,6 @@ public enum BlockStat{
     powerRange(StatCategory.power),
     basePowerGeneration(StatCategory.power),
 
-    liquidUse(StatCategory.crafting),
     input(StatCategory.crafting),
     output(StatCategory.crafting),
     productionTime(StatCategory.crafting),
diff --git a/core/src/io/anuke/mindustry/world/meta/StatUnit.java b/core/src/io/anuke/mindustry/world/meta/StatUnit.java
index e1e8947ca8..3b22ad68a5 100644
--- a/core/src/io/anuke/mindustry/world/meta/StatUnit.java
+++ b/core/src/io/anuke/mindustry/world/meta/StatUnit.java
@@ -18,7 +18,6 @@ public enum StatUnit{
     seconds,
     perSecond,
     timesSpeed(false),
-    timesRadius(false),
     percent(false),
     none,
     items;