Bugfixes

core/assets/bundles/bundle.properties

@@ -1032,7 +1032,7 @@ block.diode.name = Battery Diode
 block.battery.name = Battery
 block.battery-large.name = Large Battery
 block.combustion-generator.name = Combustion Generator
-block.turbine-generator.name = Steam Generator
+block.steam-turbine.name = Steam Generator
 block.differential-generator.name = Differential Generator
 block.impact-reactor.name = Impact Reactor
 block.mechanical-drill.name = Mechanical Drill
@@ -1240,7 +1240,7 @@ block.battery.description = Stores power as a buffer in times of surplus energy.
 block.battery-large.description = Stores much more power than a regular battery.
 block.combustion-generator.description = Generates power by burning flammable materials, such as coal.
 block.thermal-generator.description = Generates power when placed in hot locations.
-block.turbine-generator.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
+block.steam-turbine.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
 block.rtg-generator.description = A simple, reliable generator. Uses the heat of decaying radioactive compounds to produce energy at a slow rate.
 block.solar-panel.description = Provides a small amount of power from the sun.

core/assets/bundles/bundle_be.properties

@@ -993,7 +993,7 @@ block.diode.name = Дыёд
 block.battery.name = Акумулятар
 block.battery-large.name = Вялікі акумулятар
 block.combustion-generator.name = Генератар ўнутранага згарання
-block.turbine-generator.name = Паравы генератар
+block.steam-turbine.name = Паравы генератар
 block.differential-generator.name = Дыферэнцыяльны генератар
 block.impact-reactor.name = Імпульсны рэактар
 block.mechanical-drill.name = Механічны бур
@@ -1192,7 +1192,7 @@ block.battery.description = Назапашвае энергію як буфер
 block.battery-large.description = Захоўвае значна больш энергіі, чым звычайны акумулятар.
 block.combustion-generator.description = вырабленай энергіі шляхам спальвання лёгкаўзгаральных матэрыялаў, такіх як вугаль.
 block.thermal-generator.description = Генеруе энергію, калі знаходзіцца ў гарачых месцах.
-block.turbine-generator.description = Удасканалены генератар згарання. Больш эфектыўны, але дадаткова патрабуе ваду для выпрацоўкі пары.
+block.steam-turbine.description = Удасканалены генератар згарання. Больш эфектыўны, але дадаткова патрабуе ваду для выпрацоўкі пары.
 block.differential-generator.description = Генеруе вялікая колькасць энергіі. Выкарыстоўвае розніцу тэмператур паміж крыягеннай вадкасцю і падпаленым пиротитом.
 block.rtg-generator.description = Просты, надзейны генератар. Выкарыстоўвае цяпло распадаюцца радыеактыўных злучэнняў для вытворчасці энергіі з нізкай хуткасцю.
 block.solar-panel.description = Забяспечвае невялікая колькасць энергіі ад сонца.

core/assets/bundles/bundle_cs.properties

@@ -993,7 +993,7 @@ block.diode.name = Bateriová dioda
 block.battery.name = Baterie
 block.battery-large.name = Velká baterie
 block.combustion-generator.name = Spalovací generátor
-block.turbine-generator.name = Turbínový generátor
+block.steam-turbine.name = Turbínový generátor
 block.differential-generator.name = Rozdílový Generator
 block.impact-reactor.name = Rázový reaktor
 block.mechanical-drill.name = Mechanický vrt
@@ -1192,7 +1192,7 @@ block.battery.description = Ukládá energii v případě nadbytku v síti a pos
 block.battery-large.description = Ukládá více energie, než základní baterie.
 block.combustion-generator.description = Generuje energii spalováním hořlaných materiálů, jako je například uhlí.
 block.thermal-generator.description = Pokud je umístěn na teplotně aktivní místo (jako je magmatický kámen), dokáže z tepla generovat energii.
-block.turbine-generator.description = Pokročilý spalovací generátor. Efektivnější, ale vyžaduje dodatečný přísun vody pro produkci páry.
+block.steam-turbine.description = Pokročilý spalovací generátor. Efektivnější, ale vyžaduje dodatečný přísun vody pro produkci páry.
 block.differential-generator.description = Generuje velké množství energie. Využívá teplotního rozdílu mezi chladící kapalinou a hořícím pyratitem.
 block.rtg-generator.description = Radioizotopní termoenergetický generátor (RTG) je jednoduchý, spolehlivý generátor. Využívá tepla z rozpadu radioaktivních složek ke generování menších dávek energie.
 block.solar-panel.description = Základní solární panel pro generování malého množství energie ze Slunce.

core/assets/bundles/bundle_da.properties

@@ -993,7 +993,7 @@ block.diode.name = Battery Diode
 block.battery.name = Battery
 block.battery-large.name = Large Battery
 block.combustion-generator.name = Combustion Generator
-block.turbine-generator.name = Steam Generator
+block.steam-turbine.name = Steam Generator
 block.differential-generator.name = Differential Generator
 block.impact-reactor.name = Impact Reactor
 block.mechanical-drill.name = Mechanical Drill
@@ -1192,7 +1192,7 @@ block.battery.description = Stores power as a buffer in times of surplus energy.
 block.battery-large.description = Stores much more power than a regular battery.
 block.combustion-generator.description = Generates power by burning flammable materials, such as coal.
 block.thermal-generator.description = Generates power when placed in hot locations.
-block.turbine-generator.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
+block.steam-turbine.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
 block.rtg-generator.description = A simple, reliable generator. Uses the heat of decaying radioactive compounds to produce energy at a slow rate.
 block.solar-panel.description = Provides a small amount of power from the sun.

core/assets/bundles/bundle_de.properties

@@ -993,7 +993,7 @@ block.diode.name = Batterie-Diode
 block.battery.name = Batterie
 block.battery-large.name = Große Batterie
 block.combustion-generator.name = Verbrennungsgenerator
-block.turbine-generator.name = Turbinengenerator
+block.steam-turbine.name = Turbinengenerator
 block.differential-generator.name = Differentialgenerator
 block.impact-reactor.name = Schlaggenerator
 block.mechanical-drill.name = Mechanischer Bohrer
@@ -1192,7 +1192,7 @@ block.battery.description = Speichert Strom, solange ein Überschuss besteht, un
 block.battery-large.description = Speichert sehr viel mehr Strom als eine normale Batterie.
 block.combustion-generator.description = Generiert Strom, indem Öl oder entzündliche Materialien verbrannt werden.
 block.thermal-generator.description = Erzeugt große Mengen Strom aus Lava.
-block.turbine-generator.description = Effizienter als ein Verbrennungsgenerator, benötigt jedoch zusätzlich Wasser.
+block.steam-turbine.description = Effizienter als ein Verbrennungsgenerator, benötigt jedoch zusätzlich Wasser.
 block.differential-generator.description = Erzeugt große Mengen an Energie. Nutzt den Temperaturunterschied zwischen Kryofluid und brennendem Pyratit.
 block.rtg-generator.description = Ein Radioisotopengenerator, der keine Kühlung benötigt, aber weniger Strom als ein Thorium-Reaktor liefert.
 block.solar-panel.description = Erzeugt kleine Mengen an Strom aus Sonnenenergie.

core/assets/bundles/bundle_es.properties

@@ -993,7 +993,7 @@ block.diode.name = Diodo de batería
 block.battery.name = Batería
 block.battery-large.name = Batería Grande
 block.combustion-generator.name = Generador de Combustión
-block.turbine-generator.name = Turbina
+block.steam-turbine.name = Turbina
 block.differential-generator.name = Generador Diferencial
 block.impact-reactor.name = Reactor de Impacto
 block.mechanical-drill.name = Taladro mecánico
@@ -1192,7 +1192,7 @@ block.battery.description = Guarda energía cuando hay abundancia y proporciona
 block.battery-large.description = Almacena mucha más energía que una batería normal.
 block.combustion-generator.description = Genera energía quemando aceite o materiales inflamables.
 block.thermal-generator.description = Genera una gran cantidad de energía con la lava.
-block.turbine-generator.description = Más eficiente que un generador de combustión, pero requiere agua adicional.
+block.steam-turbine.description = Más eficiente que un generador de combustión, pero requiere agua adicional.
 block.differential-generator.description = Genera grandes cantidades de energía. Utiliza la diferencia de temperatura entre el fluído criogenico y la quema de piratita.
 block.rtg-generator.description = Un generador radioisótropo termoeléctrico que no necesita enfriamiento, pero proporciona menos energía que un reactor de torio.
 block.solar-panel.description = Proporciona una pequeña cantidad de energía procedente del sol.

core/assets/bundles/bundle_et.properties

@@ -993,7 +993,7 @@ block.diode.name = Battery Diode
 block.battery.name = Aku
 block.battery-large.name = Suur aku
 block.combustion-generator.name = Põlemisgeneraator
-block.turbine-generator.name = Aurugeneraator
+block.steam-turbine.name = Aurugeneraator
 block.differential-generator.name = Diferentseeriv generaator
 block.impact-reactor.name = Impulssreaktor
 block.mechanical-drill.name = Harilik puur
@@ -1192,7 +1192,7 @@ block.battery.description = Salvestab energiat puhvrina positiivse energiabilans
 block.battery-large.description = Salvestab rohkem energiat kui tavaline aku.
 block.combustion-generator.description = Toodab energiat süttivate materjalide, näiteks söe, põletamisel.
 block.thermal-generator.description = Toodab energiat kuumades piirkondades.
-block.turbine-generator.description = Täiustatud põlemisgeneraator. Tõhusam kui põlemisgeneraator, kuid vajab auru tootmiseks lisanduvat vett.
+block.steam-turbine.description = Täiustatud põlemisgeneraator. Tõhusam kui põlemisgeneraator, kuid vajab auru tootmiseks lisanduvat vett.
 block.differential-generator.description = Tekitab suurel hulgal energiat. Kasutab ära krüovedeliku ja põleva püratiidi temperatuuride erinevust.
 block.rtg-generator.description = Töökindel generaator, mis kasutab radioaktiivsete ühendite lagunemisel eralduvat soojust, et toota sellest aeglasel kiirusel energiat.
 block.solar-panel.description = Toodab vähesel määral energiat päikesekiirgusest.

core/assets/bundles/bundle_eu.properties

@@ -993,7 +993,7 @@ block.diode.name = Battery Diode
 block.battery.name = Bateria
 block.battery-large.name = Bateria handia
 block.combustion-generator.name = Errekuntza sorgailua
-block.turbine-generator.name = Lurrin sorgailua
+block.steam-turbine.name = Lurrin sorgailua
 block.differential-generator.name = Sorgailu diferentziala
 block.impact-reactor.name = Talkazko erreaktorea
 block.mechanical-drill.name = Zulagailu mekanikoa
@@ -1192,7 +1192,7 @@ block.battery.description = Energia biltegiratu dezake gehiegi dagoenean tarteka
 block.battery-large.description = Bateria arrunt batek baino energia gehiago biltegiratu dezake.
 block.combustion-generator.description = Energia sortzen du gai erregarriak errez, esaterako ikatza.
 block.thermal-generator.description = Energia sortzen du toki beroetan jarrita.
-block.turbine-generator.description = Errekuntza sorgailu aurreratu bat. Eraginkorragoa. baina ur gehiago behar du lurrina sortzeko.
+block.steam-turbine.description = Errekuntza sorgailu aurreratu bat. Eraginkorragoa. baina ur gehiago behar du lurrina sortzeko.
 block.differential-generator.description = Energia kopuru handia sortzen du. Krio-isurkaria eta piratita goriaren arteko tenperatura diferentzia erabiltzen du.
 block.rtg-generator.description = Sorgailu sinple eta fidagarria. Konposatu erradioaktiboen hirotzearen beroa erabiltzen du geldiro energia sortzeko.
 block.solar-panel.description = Eguzkiaren energia kopuru txiki bat ematen du.

core/assets/bundles/bundle_fi.properties

@@ -993,7 +993,7 @@ block.diode.name = Battery Diode
 block.battery.name = Akku
 block.battery-large.name = Suuri akku
 block.combustion-generator.name = Combustion Generator
-block.turbine-generator.name = Höyrygeneraattori
+block.steam-turbine.name = Höyrygeneraattori
 block.differential-generator.name = Differential Generator
 block.impact-reactor.name = Törmäysreaktori
 block.mechanical-drill.name = Mechanical Drill
@@ -1192,7 +1192,7 @@ block.battery.description = Stores power as a buffer in times of surplus energy.
 block.battery-large.description = Stores much more power than a regular battery.
 block.combustion-generator.description = Generates power by burning flammable materials, such as coal.
 block.thermal-generator.description = Generates power when placed in hot locations.
-block.turbine-generator.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
+block.steam-turbine.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
 block.rtg-generator.description = A simple, reliable generator. Uses the heat of decaying radioactive compounds to produce energy at a slow rate.
 block.solar-panel.description = Provides a small amount of power from the sun.

core/assets/bundles/bundle_fil.properties

@@ -1007,7 +1007,7 @@ block.diode.name = Battery Diode
 block.battery.name = Battery
 block.battery-large.name = Large Battery
 block.combustion-generator.name = Combustion Generator
-block.turbine-generator.name = Steam Generator
+block.steam-turbine.name = Steam Generator
 block.differential-generator.name = Differential Generator
 block.impact-reactor.name = Impact Reactor
 block.mechanical-drill.name = Mechanical Drill
@@ -1206,7 +1206,7 @@ block.battery.description = Stores power as a buffer in times of surplus energy.
 block.battery-large.description = Stores much more power than a regular battery.
 block.combustion-generator.description = Generates power by burning flammable materials, such as coal.
 block.thermal-generator.description = Generates power when placed in hot locations.
-block.turbine-generator.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
+block.steam-turbine.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
 block.rtg-generator.description = A simple, reliable generator. Uses the heat of decaying radioactive compounds to produce energy at a slow rate.
 block.solar-panel.description = Provides a small amount of power from the sun.

core/assets/bundles/bundle_fr.properties

@@ -993,7 +993,7 @@ block.diode.name = Diode
 block.battery.name = Batterie
 block.battery-large.name = Grande Batterie
 block.combustion-generator.name = Générateur à Combustion
-block.turbine-generator.name = Générateur à Turbine
+block.steam-turbine.name = Générateur à Turbine
 block.differential-generator.name = Générateur Différentiel
 block.impact-reactor.name = Réacteur à Impact
 block.mechanical-drill.name = Foreuse Mécanique
@@ -1192,7 +1192,7 @@ block.battery.description = Stocke le surplus d'énergie et le redistribue en ca
 block.battery-large.description = Stocke bien plus d'énergie qu'une batterie normale.
 block.combustion-generator.description = Génère de l'énergie en brûlant du charbon ou d'autres matériaux inflammables.
 block.thermal-generator.description = Génère une grande quantité d'énergie à partir de zones de chaleur.
-block.turbine-generator.description = Plus efficace qu'un générateur à combustion, mais requiert de l'eau.
+block.steam-turbine.description = Plus efficace qu'un générateur à combustion, mais requiert de l'eau.
 block.differential-generator.description = Génère de grandes quantités d'énergie en utilisant la différence de température entre le liquide cryogénique et la pyratite brûlante.
 block.rtg-generator.description = Un générateur thermo-électrique à radioisotope qui ne demande pas de refroidissement mais produit moins d'énergie qu'un réacteur à Thorium.
 block.solar-panel.description = Génère une faible quantité d'énergie grâce aux rayons du soleil.

core/assets/bundles/bundle_fr_BE.properties

@@ -993,7 +993,7 @@ block.diode.name = Battery Diode
 block.battery.name = Batterie
 block.battery-large.name = Batterie large
 block.combustion-generator.name = Générateur à combustion
-block.turbine-generator.name = Générateur à turbine
+block.steam-turbine.name = Générateur à turbine
 block.differential-generator.name = Générateur différentiel
 block.impact-reactor.name = Réacteur à impact
 block.mechanical-drill.name = Foreuse mécanique
@@ -1192,7 +1192,7 @@ block.battery.description = Stocke l’énergie chaque fois qu’il ya abondance
 block.battery-large.description = Stocke beaucoup plus d'énergie qu'une batterie ordinaire.
 block.combustion-generator.description = Génère de l'énergie en brûlant du pétrole ou des matériaux inflammables.
 block.thermal-generator.description = Génère une grande quantité d'énergie grâce à la lave.
-block.turbine-generator.description = Plus efficace qu'un générateur de combustion, mais nécessite de l'eau supplémentaire.
+block.steam-turbine.description = Plus efficace qu'un générateur de combustion, mais nécessite de l'eau supplémentaire.
 block.differential-generator.description = Génère de grandes quantités d'énergie. Utilise la différence de température entre le cryofluide et la pyratite en combustion.
 block.rtg-generator.description = Générateur thermoélectrique à radio-isotopes ne nécessitant pas de refroidissement mais fournissant moins d'énergie qu'un réacteur à thorium.
 block.solar-panel.description = Fournit une petite quantité d'énergie grâce au soleil.

core/assets/bundles/bundle_hu.properties

@@ -993,7 +993,7 @@ block.diode.name = Battery Diode
 block.battery.name = Battery
 block.battery-large.name = Large Battery
 block.combustion-generator.name = Combustion Generator
-block.turbine-generator.name = Steam Generator
+block.steam-turbine.name = Steam Generator
 block.differential-generator.name = Differential Generator
 block.impact-reactor.name = Impact Reactor
 block.mechanical-drill.name = Mechanical Drill
@@ -1192,7 +1192,7 @@ block.battery.description = Stores power as a buffer in times of surplus energy.
 block.battery-large.description = Stores much more power than a regular battery.
 block.combustion-generator.description = Generates power by burning flammable materials, such as coal.
 block.thermal-generator.description = Generates power when placed in hot locations.
-block.turbine-generator.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
+block.steam-turbine.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
 block.rtg-generator.description = A simple, reliable generator. Uses the heat of decaying radioactive compounds to produce energy at a slow rate.
 block.solar-panel.description = Provides a small amount of power from the sun.

core/assets/bundles/bundle_in_ID.properties

@@ -993,7 +993,7 @@ block.diode.name = Dioda Baterai
 block.battery.name = Baterai
 block.battery-large.name = Baterai Besar
 block.combustion-generator.name = Generator Pembakar
-block.turbine-generator.name = Generator Turbin
+block.steam-turbine.name = Generator Turbin
 block.differential-generator.name = Generator Majemuk
 block.impact-reactor.name = Reaktor Tumbukan
 block.mechanical-drill.name = Bor Mekanik
@@ -1192,7 +1192,7 @@ block.battery.description = Menyimpan tenaga jika ada kelimpahan dan memberikan
 block.battery-large.description = Menyimpan lebih banyak tenaga daripada baterai biasa.
 block.combustion-generator.description = Menghasilkan tenaga dengan membakar minyak atau bahan bakar.
 block.thermal-generator.description = Menghasilkan tenaga disaat ditaruh di lokasi yang panas.
-block.turbine-generator.description = Lebih efisien daripada generator pembakar, tetapi membutuhkan tambahan air.
+block.steam-turbine.description = Lebih efisien daripada generator pembakar, tetapi membutuhkan tambahan air.
 block.differential-generator.description = Menghasilkan banyak sekali tenaga. Memanfaatkan perbedaan suhu dingin cairan pendingin dan suhu panas pyratite.
 block.rtg-generator.description = Generator yang tidak membutuhkan pendiginan tetapi lebih memberi sedikit tenaga daripada reaktor thorium.
 block.solar-panel.description = Menghasilkan jumlah tenaga kecil dari matahari.

core/assets/bundles/bundle_it.properties

@@ -993,7 +993,7 @@ block.diode.name = Diodo
 block.battery.name = Batteria
 block.battery-large.name = Batteria Grande
 block.combustion-generator.name = Generatore a Combustibile
-block.turbine-generator.name = Turbina a Vapore
+block.steam-turbine.name = Turbina a Vapore
 block.differential-generator.name = Generatore Differenziale
 block.impact-reactor.name = Reattore ad Impatto
 block.mechanical-drill.name = Trivella Meccanica
@@ -1192,7 +1192,7 @@ block.battery.description = Accumula energia ogni volta che c'è abbondanza e fo
 block.battery-large.description = Immagazzina molta più energia di una normale batteria.
 block.combustion-generator.description = Genera energia bruciando combustibile.
 block.thermal-generator.description = Genera una grande quantità di energia dalla lava.
-block.turbine-generator.description = Più efficiente di un generatore a combustione, ma richiede l'aggiunta di acqua.
+block.steam-turbine.description = Più efficiente di un generatore a combustione, ma richiede l'aggiunta di acqua.
 block.differential-generator.description = Genera grandi quantità di energia. Utilizza la differenza di temperatura tra criofluido e pirite in combustione.
 block.rtg-generator.description = Un generatore che sfrutta il calore del decadimento di materiale radioattivo per produrre energia.\nNon richiede raffreddamento ma fornisce meno energia di un reattore al torio.
 block.solar-panel.description = Fornisce una piccola quantità di energia dal sole.

core/assets/bundles/bundle_ja.properties

@@ -993,7 +993,7 @@ block.diode.name = バッテリーダイオード
 block.battery.name = バッテリー
 block.battery-large.name = 大型バッテリー
 block.combustion-generator.name = 火力発電機
-block.turbine-generator.name = タービン発電機
+block.steam-turbine.name = タービン発電機
 block.differential-generator.name = 差動発電機
 block.impact-reactor.name = インパクトリアクター
 block.mechanical-drill.name = 機械ドリル
@@ -1192,7 +1192,7 @@ block.battery.description = 余分な電力の充電して、貯めておくこ
 block.battery-large.description = 通常のバッテリーよりもたくさんの電力を溜めておくことができます。
 block.combustion-generator.description = 石油や可燃性の物質を燃やして発電します。
 block.thermal-generator.description = 溶岩から大量の電力を発電します。
-block.turbine-generator.description = 水を使って火力発電機より効率的に発電します。
+block.steam-turbine.description = 水を使って火力発電機より効率的に発電します。
 block.differential-generator.description = 大量の電力を生成します。冷却水と燃焼したピラタイトの温度差を利用します。
 block.rtg-generator.description = トリウムリアクターよりも発電量は少ないですが、冷却を必要としない放射性同位体熱発電機(RTG)です。
 block.solar-panel.description = 太陽光から少量の電力を発電します。

core/assets/bundles/bundle_ko.properties

@@ -993,7 +993,7 @@ block.diode.name = 배터리 다이오드
 block.battery.name = 배터리
 block.battery-large.name = 대형 배터리
 block.combustion-generator.name = 연소 발전기
-block.turbine-generator.name = 증기 발전기
+block.steam-turbine.name = 증기 발전기
 block.differential-generator.name = 차동 발잔기
 block.impact-reactor.name = 임팩트 원자로
 block.mechanical-drill.name = 기계식 드릴
@@ -1192,7 +1192,7 @@ block.battery.description = 에너지가 넘쳐날 때 완충재로 전력을
 block.battery-large.description = 일반 배터리보다 훨씬 더 많은 전력을 저장합니다.
 block.combustion-generator.description = 석탄과 같은 가연성 물질을 연소시켜 전력을 생산합니다.
 block.thermal-generator.description = 열이 있는 곳에 설치하면 전력이 생성됩니다.
-block.turbine-generator.description = 고급 연소 발전기. 더 효율적이지만 증기를 생성하기 위해 물이 필요합니다.
+block.steam-turbine.description = 고급 연소 발전기. 더 효율적이지만 증기를 생성하기 위해 물이 필요합니다.
 block.differential-generator.description = 많은 양의 전력을 생성합니다. 냉각수와 불타는 파이라타이트의 온도 차이를 이용합니다.
 block.rtg-generator.description = 간단하고 안정적인 발전기. 붕괴하는 방사성 화합물의 열을 이용하여 느린 속도로 전력을 생성합니다.
 block.solar-panel.description = 태양으로부터 소량의 전력을 생성합니다.

core/assets/bundles/bundle_lt.properties

@@ -993,7 +993,7 @@ block.diode.name = Baterijos Diodas
 block.battery.name = Baterija
 block.battery-large.name = Didelė Baterija
 block.combustion-generator.name = Vidaus Degimo Generatorius
-block.turbine-generator.name = Garų Generatorius
+block.steam-turbine.name = Garų Generatorius
 block.differential-generator.name = Diferencialinis Generatorius
 block.impact-reactor.name = Smūginis Reaktorius
 block.mechanical-drill.name = Mechaninis Grąžtas
@@ -1192,7 +1192,7 @@ block.battery.description = Laiko enegiją kaip buferis, kai reikalinga papildom
 block.battery-large.description = Laiko daugiau energijos negu paprasta baterija.
 block.combustion-generator.description = Gamina energiją degindamas degias medžiagas kaip anglis.
 block.thermal-generator.description = Gamina energiją, kai pastatytas karštose vietose.
-block.turbine-generator.description = Pažangesnis vidaus degimo generatorius. Efektyvesnis, bet papildomai reikalauja vandens sukurti garams.
+block.steam-turbine.description = Pažangesnis vidaus degimo generatorius. Efektyvesnis, bet papildomai reikalauja vandens sukurti garams.
 block.differential-generator.description = Gamina didelį kiekį energijos. Pasitelkia temperatūrų skirtumą tarp krio skysčio ir degančio piratito.
 block.rtg-generator.description = Paprastas, patikimas generatorius. Naudoja yrančių junginių karštį energijos gamybai.
 block.solar-panel.description = Suteikia mažą kiekį energijos iš saulės.

core/assets/bundles/bundle_nl.properties

@@ -993,7 +993,7 @@ block.diode.name = Batterij Diode
 block.battery.name = Batterij
 block.battery-large.name = Grote Batterij
 block.combustion-generator.name = Fossiele Generator
-block.turbine-generator.name = Turbine Generator
+block.steam-turbine.name = Turbine Generator
 block.differential-generator.name = Verschiltemperatuurgenerator
 block.impact-reactor.name = Impact Reactor
 block.mechanical-drill.name = Mechanische Boor
@@ -1192,7 +1192,7 @@ block.battery.description = Stores power whenever there is an abundance and prov
 block.battery-large.description = Stores much more power than a regular battery.
 block.combustion-generator.description = Generates power by burning oil or flammable materials.
 block.thermal-generator.description = Generates power when placed in hot locations.
-block.turbine-generator.description = More efficient than a combustion generator, but requires additional water.
+block.steam-turbine.description = More efficient than a combustion generator, but requires additional water.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
 block.rtg-generator.description = A radioisotope thermoelectric generator which does not require cooling but provides less power than a thorium reactor.
 block.solar-panel.description = Genereert een klein beetje zonne-energie.

core/assets/bundles/bundle_nl_BE.properties

@@ -993,7 +993,7 @@ block.diode.name = Battery Diode
 block.battery.name = Battery
 block.battery-large.name = Large Battery
 block.combustion-generator.name = Combustion Generator
-block.turbine-generator.name = Turbine Generator
+block.steam-turbine.name = Turbine Generator
 block.differential-generator.name = Differential Generator
 block.impact-reactor.name = Impact Reactor
 block.mechanical-drill.name = Mechanical Drill
@@ -1192,7 +1192,7 @@ block.battery.description = Stores power whenever there is an abundance and prov
 block.battery-large.description = Stores much more power than a regular battery.
 block.combustion-generator.description = Generates power by burning oil or flammable materials.
 block.thermal-generator.description = Generates power when placed in hot locations.
-block.turbine-generator.description = More efficient than a combustion generator, but requires additional water.
+block.steam-turbine.description = More efficient than a combustion generator, but requires additional water.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
 block.rtg-generator.description = A radioisotope thermoelectric generator which does not require cooling but provides less power than a thorium reactor.
 block.solar-panel.description = Provides a small amount of power from the sun.

core/assets/bundles/bundle_pl.properties

@@ -994,7 +994,7 @@ block.diode.name = Dioda baterii
 block.battery.name = Bateria
 block.battery-large.name = Duża Bateria
 block.combustion-generator.name = Generator Spalinowy
-block.turbine-generator.name = Generator Parowy
+block.steam-turbine.name = Generator Parowy
 block.differential-generator.name = Generator Różnicowy
 block.impact-reactor.name = Reaktor Uderzeniowy
 block.mechanical-drill.name = Wiertło Mechaniczne
@@ -1193,7 +1193,7 @@ block.battery.description = Przechowuje energię przy nadwyżce produkcji oraz d
 block.battery-large.description = Przechowuje o wiele wiecej prądu niż standardowa bateria.
 block.combustion-generator.description = Wytwarza energię poprzez spalanie łatwopalnych materiałów.
 block.thermal-generator.description = Generuje prąd kiedy jest postawiony na źródłach ciepła.
-block.turbine-generator.description = Zaawansowana wersja Generatora Spalinowego. Jest wydajniejszy niż Generator Spalinowy, ale wymaga wody do generowania pary.
+block.steam-turbine.description = Zaawansowana wersja Generatora Spalinowego. Jest wydajniejszy niż Generator Spalinowy, ale wymaga wody do generowania pary.
 block.differential-generator.description = Generuje duże ilości prądu. Wykorzystuje różnice temperatur pomiędzy Lodocieczą a spalanym Piratianem.
 block.rtg-generator.description = Prosty, niezawodny generator. Wykorzystuje ciepło powstałe z rozpadu izotopów promieniotwórczych. Nie wymaga chłodzenia, ale produkuje mniej energii od reaktora torowego.
 block.solar-panel.description = Wytwarza małe ilości prądu wykorzystując energię słoneczną.

core/assets/bundles/bundle_pt_BR.properties

@@ -993,7 +993,7 @@ block.diode.name = Diodo
 block.battery.name = Bateria
 block.battery-large.name = Bateria grande
 block.combustion-generator.name = Gerador à combustão
-block.turbine-generator.name = Gerador à vapor
+block.steam-turbine.name = Gerador à vapor
 block.differential-generator.name = Gerador diferencial
 block.impact-reactor.name = Reator De impacto
 block.mechanical-drill.name = Broca Mecânica
@@ -1192,7 +1192,7 @@ block.battery.description = Armazena energia em tempos de energia excedente. Lib
 block.battery-large.description = Guarda muito mais energia que uma bateria comum.
 block.combustion-generator.description = Gera energia queimando materiais inflamáveis, como carvão.
 block.thermal-generator.description = Gera energia quando colocado em lugares quentes.
-block.turbine-generator.description = Mais eficiente que o gerador à combustão, mas requer água adicional para a geração de vapor.
+block.steam-turbine.description = Mais eficiente que o gerador à combustão, mas requer água adicional para a geração de vapor.
 block.differential-generator.description = Gera grandes quantidades de energia. Utiliza a diferença de temperatura entre o Fluido Criogênico e a Piratita.
 block.rtg-generator.description = Um Gerador termoelétrico de radioisótopos que não precisa de refriamento mas dá muito menos energia que o reator de tório.
 block.solar-panel.description = Gera pequenas quantidades de energia do sol.

core/assets/bundles/bundle_pt_PT.properties

@@ -993,7 +993,7 @@ block.diode.name = Battery Diode
 block.battery.name = Bateria
 block.battery-large.name = Bateria Grande
 block.combustion-generator.name = Gerador a combustão
-block.turbine-generator.name = Gerador de Turbina
+block.steam-turbine.name = Gerador de Turbina
 block.differential-generator.name = Gerador diferencial
 block.impact-reactor.name = Reator De Impacto
 block.mechanical-drill.name = Broca Mecânica
@@ -1192,7 +1192,7 @@ block.battery.description = Armazena energia em tempos de energia excedente. Lib
 block.battery-large.description = Guarda muito mais energia que uma beteria comum.
 block.combustion-generator.description = Gera energia usando combustível ou petróleo.
 block.thermal-generator.description = Gera uma quantidade grande de energia usando lava.
-block.turbine-generator.description = Mais eficiente que o gerador de Combustão, Mas requer agua adicional.
+block.steam-turbine.description = Mais eficiente que o gerador de Combustão, Mas requer agua adicional.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
 block.rtg-generator.description = Um Gerador termoelétrico de radioisótopos Que não precisa de refriamento Mas da muito menos energia que o reator de torio.
 block.solar-panel.description = Gera pequenas quantidades de energia do sol.

core/assets/bundles/bundle_ru.properties

@@ -1011,7 +1011,7 @@ block.diode.name = Диод
 block.battery.name = Аккумулятор
 block.battery-large.name = Большой аккумулятор
 block.combustion-generator.name = Генератор внутреннего сгорания
-block.turbine-generator.name = Паровой генератор
+block.steam-turbine.name = Паровой генератор
 block.differential-generator.name = Дифференциальный генератор
 block.impact-reactor.name = Импульсный реактор
 block.mechanical-drill.name = Механический бур
@@ -1217,7 +1217,7 @@ block.battery.description = Накапливает энергию как буф
 block.battery-large.description = Хранит гораздо больше энергии, чем обычный аккумулятор.
 block.combustion-generator.description = Вырабатывает энергию путём сжигания легковоспламеняющихся материалов, таких как уголь.
 block.thermal-generator.description = Генерирует энергию, когда находится в горячих местах.
-block.turbine-generator.description = Усовершенствованный генератор сгорания. Более эффективен, но дополнительно требует воду для выработки пара.
+block.steam-turbine.description = Усовершенствованный генератор сгорания. Более эффективен, но дополнительно требует воду для выработки пара.
 block.differential-generator.description = Генерирует большое количество энергии. Использует разницу температур между криогенной жидкостью и горящим пиротитом.
 block.rtg-generator.description = Простой, надежный генератор. Использует тепло распадающихся радиоактивных соединений для производства энергии с низкой скоростью.
 block.solar-panel.description = Обеспечивает небольшое количество энергии от солнца.

core/assets/bundles/bundle_sv.properties

@@ -993,7 +993,7 @@ block.diode.name = Battery Diode
 block.battery.name = Batteri
 block.battery-large.name = Stort Batteri
 block.combustion-generator.name = Combustion Generator
-block.turbine-generator.name = Ånggenerator
+block.steam-turbine.name = Ånggenerator
 block.differential-generator.name = Differential Generator
 block.impact-reactor.name = Impact Reactor
 block.mechanical-drill.name = Mekanisk Borr
@@ -1192,7 +1192,7 @@ block.battery.description = Stores power as a buffer in times of surplus energy.
 block.battery-large.description = Stores much more power than a regular battery.
 block.combustion-generator.description = Generates power by burning flammable materials, such as coal.
 block.thermal-generator.description = Generates power when placed in hot locations.
-block.turbine-generator.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
+block.steam-turbine.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
 block.rtg-generator.description = A simple, reliable generator. Uses the heat of decaying radioactive compounds to produce energy at a slow rate.
 block.solar-panel.description = Provides a small amount of power from the sun.

core/assets/bundles/bundle_th.properties

@@ -993,7 +993,7 @@ block.diode.name = ไดโอดแบตเตอรี่
 block.battery.name = แบตเตอรี่
 block.battery-large.name = แบตเตอรี่ขนาดใหญ่
 block.combustion-generator.name = เครื่องกำเนิดไฟฟ้าโดยการสันดาป
-block.turbine-generator.name = เครื่องกำเนิดไฟฟ้าไอน้ำ
+block.steam-turbine.name = เครื่องกำเนิดไฟฟ้าไอน้ำ
 block.differential-generator.name = เครื่องกำเนิดไฟฟ้าดิฟเฟอเร่นเตอร์
 block.impact-reactor.name = เตาปฏิกรณ์อัดกระแทก
 block.mechanical-drill.name = เครื่องขุดเชิงกล
@@ -1192,7 +1192,7 @@ block.battery.description = เก็บพลังงานเป็นบั
 block.battery-large.description = เก็บพลังงานได้เยอะกว่าแบตเตอรี่ธรรมดา.
 block.combustion-generator.description = ผลิตพลังงานโดยการวัสดุติดไฟ เช่นถ่านหิน.
 block.thermal-generator.description = ผลิตพลังงานเมื่อวานในที่ร้อน (บนหินร้อนหรือหินแม็คม่า)
-block.turbine-generator.description = เครื่องกำเนิดไฟฟ้าเผาไหม้ขั้นสูง. ประสิทธิภาพสูงกว่า แต่ต้องใช้น้ำด้วยเพื่อผลิตไอน้ำ.
+block.steam-turbine.description = เครื่องกำเนิดไฟฟ้าเผาไหม้ขั้นสูง. ประสิทธิภาพสูงกว่า แต่ต้องใช้น้ำด้วยเพื่อผลิตไอน้ำ.
 block.differential-generator.description = ผลิตไฟฟ้าจำนวนมาก. ใช้ความต่างของอุณหภูมิระหว่างไครโยฟลูอิดและไพไรต์ที่กำลังไหม้.
 block.rtg-generator.description = เครื่องกำเนิดไฟฟ้าที่ใช้ง่ายและไว้ใจได้. ใช้ความร้อนจากการสลายของสารกัมมัตภาพรังสีเพื่อใช้ผลิตพลังงานอย่างช้าๆ.
 block.solar-panel.description = ให้พลังงานจากแสงอาทิตย์จำนวนน้อย.

core/assets/bundles/bundle_tk.properties

@@ -993,7 +993,7 @@ block.diode.name = Battery Diode
 block.battery.name = batarya
 block.battery-large.name = buyuk batarya
 block.combustion-generator.name = sicaklik jenaratoru
-block.turbine-generator.name = termal jenaratoru
+block.steam-turbine.name = termal jenaratoru
 block.differential-generator.name = Differential Generator
 block.impact-reactor.name = Impact Reactor
 block.mechanical-drill.name = Mekanikal Kazici
@@ -1192,7 +1192,7 @@ block.battery.description = Stores power whenever there is an abundance and prov
 block.battery-large.description = Stores much more power than a regular battery.
 block.combustion-generator.description = Generates power by burning oil or flammable materials.
 block.thermal-generator.description = Generates a large amount of power from lava.
-block.turbine-generator.description = More efficient than a combustion generator, but requires additional water.
+block.steam-turbine.description = More efficient than a combustion generator, but requires additional water.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
 block.rtg-generator.description = A radioisotope thermoelectric generator which does not require cooling but provides less power than a thorium reactor.
 block.solar-panel.description = Provides a small amount of power from the sun.

core/assets/bundles/bundle_tr.properties

@@ -993,7 +993,7 @@ block.diode.name = Battery Diode
 block.battery.name = Batarya
 block.battery-large.name = Büyük Batarya
 block.combustion-generator.name = Termik Jeneratör
-block.turbine-generator.name = Buhar Jeneratörü
+block.steam-turbine.name = Buhar Jeneratörü
 block.differential-generator.name = Diferansiyel Jeneratörü
 block.impact-reactor.name = Patlama Reaktörü
 block.mechanical-drill.name = Mekanik Matkap
@@ -1192,7 +1192,7 @@ block.battery.description = Enerji fazlasını yedek olarak saklar. Enerji açı
 block.battery-large.description = Sıradan bataryadan çok daha fazla enerji depolar.
 block.combustion-generator.description = Kömür gibi yanıcı materyalleri yakarak enerji üretir.
 block.thermal-generator.description = Sıcak bölgelere konulduğunda enerji üretir.
-block.turbine-generator.description = Daha gelişmiş bir termik jeneratör. Daha verimlidir, ama buhar üretebilmek için suya ihtiyaç duyar.
+block.steam-turbine.description = Daha gelişmiş bir termik jeneratör. Daha verimlidir, ama buhar üretebilmek için suya ihtiyaç duyar.
 block.differential-generator.description = Çok miktarda enerji üretir. Kriyosıvı ve yanan pirratit arasındaki sıcaklık farkından yararlanır.
 block.rtg-generator.description = Basit, güvenilir bir reaktör. Bozunan radyoaktif materyallerin ısısını kullanır.
 block.solar-panel.description = Güneşten küçük miktarda enerji üretir.

core/assets/bundles/bundle_uk_UA.properties

@@ -994,7 +994,7 @@ block.diode.name = Діод
 block.battery.name = Акумулятор
 block.battery-large.name = Великий акумулятор
 block.combustion-generator.name = Генератор згорання
-block.turbine-generator.name = Паровий генератор
+block.steam-turbine.name = Паровий генератор
 block.differential-generator.name = Диференційний генератор
 block.impact-reactor.name = Імпульсний реактор
 block.mechanical-drill.name = Механічний бур
@@ -1193,7 +1193,7 @@ block.battery.description = Зберігає енергію як буфер в
 block.battery-large.description = Зберігає набагато більше енергії, ніж звичайний акумулятор.
 block.combustion-generator.description = Виробляє енергію, спалюючи легкозаймисті матеріали, такі як вугілля.
 block.thermal-generator.description = Генерує енергію при розміщенні в спекотних місцях.
-block.turbine-generator.description = Удосконалений генератор згоряння. Більш ефективний, але потребує додаткової води для отримання пари.
+block.steam-turbine.description = Удосконалений генератор згоряння. Більш ефективний, але потребує додаткової води для отримання пари.
 block.differential-generator.description = Удосконалений генератор згоряння. Використовує різницю температур між кріогенною рідиною і піротитом, що горить.
 block.rtg-generator.description = Простий і надійний генератор. Використовує тепло радіоактивних сполук, які розкладаються, для отримання енергії з повільною швидкістю.
 block.solar-panel.description = Забезпечує невелику кількість енергії від сонця.

core/assets/bundles/bundle_zh_CN.properties

@@ -993,7 +993,7 @@ block.diode.name = 二极管
 block.battery.name = 电池
 block.battery-large.name = 大型电池
 block.combustion-generator.name = 火力发电机
-block.turbine-generator.name = 涡轮发电机
+block.steam-turbine.name = 涡轮发电机
 block.differential-generator.name = 温差发电机
 block.impact-reactor.name = 冲击反应堆
 block.mechanical-drill.name = 机械钻头
@@ -1192,7 +1192,7 @@ block.battery.description = 存储能量作为缓冲，在发电量不足时提
 block.battery-large.description = 比普通电池容量更大。
 block.combustion-generator.description = 燃烧煤等材料发电。
 block.thermal-generator.description = 放置在炽热的地形上能够发电。
-block.turbine-generator.description = 先进的火力发电机，效率更高，但需要水来产生蒸汽。
+block.steam-turbine.description = 先进的火力发电机，效率更高，但需要水来产生蒸汽。
 block.differential-generator.description = 利用低温流体与燃烧的硫之间的温差产生大量能量。
 block.rtg-generator.description = 一种简单可靠的发电机。利用放射性化合物的衰变产生的热量，以缓慢的速度产生能量。
 block.solar-panel.description = 普通太阳能板，提供少量电力。

core/assets/bundles/bundle_zh_TW.properties

@@ -993,7 +993,7 @@ block.diode.name = 二極體
 block.battery.name = 電池
 block.battery-large.name = 大型電池
 block.combustion-generator.name = 燃燒發電機
-block.turbine-generator.name = 渦輪發電機
+block.steam-turbine.name = 渦輪發電機
 block.differential-generator.name = 差動發電機
 block.impact-reactor.name = 衝擊反應堆
 block.mechanical-drill.name = 機械鑽頭
@@ -1192,7 +1192,7 @@ block.battery.description = 有能量剩餘時存儲電力並在能量短缺時
 block.battery-large.description = 比普通電池存儲更多的能量。
 block.combustion-generator.description = 透過燃燒原油或可燃物品以產生能量。
 block.thermal-generator.description = 放置在熱的位置時會產生能量。
-block.turbine-generator.description = 比燃燒發電機更有效率，但需要水才能運作。
+block.steam-turbine.description = 比燃燒發電機更有效率，但需要水才能運作。
 block.differential-generator.description = 利用冷卻液和燃燒火焰彈之間的溫差產生大量的能量。
 block.rtg-generator.description = 一種簡單、可靠的發電機，使用放射性化合物衰變所產生的熱產生少量能量。不需要冷卻，但產生的能量比釷反應堆少。
 block.solar-panel.description = 透過太陽產生少量的能量。

core/assets/icons/icons.properties

@@ -134,7 +134,7 @@
 63610=battery-large|block-battery-large-medium
 63609=combustion-generator|block-combustion-generator-medium
 63608=thermal-generator|block-thermal-generator-medium
-63607=turbine-generator|block-turbine-generator-medium
+63607=steam-generator|block-steam-generator-medium
 63606=differential-generator|block-differential-generator-medium
 63605=rtg-generator|block-rtg-generator-medium
 63604=solar-panel|block-solar-panel-medium

core/src/mindustry/ai/types/GroundAI.java

@@ -51,6 +51,7 @@ public class GroundAI extends AIController{
 
         if(!Units.invalidateTarget(target, unit, unit.range())){
             if(unit.type().hasWeapons()){
+                //TODO certain units should not look at the target, e.g. ships
                 unit.aimLook(Predict.intercept(unit, target, unit.type().weapons.first().bullet.speed));
             }
         }else if(unit.moving()){

core/src/mindustry/content/Blocks.java

@@ -64,7 +64,7 @@ public class Blocks implements ContentList{
     mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, platedConduit, liquidRouter, liquidTank, liquidJunction, bridgeConduit, phaseConduit,
 
     //power
-    combustionGenerator, thermalGenerator, turbineGenerator, differentialGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor,
+    combustionGenerator, thermalGenerator, steamGenerator, differentialGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor,
     impactReactor, battery, batteryLarge, powerNode, powerNodeLarge, surgeTower, diode,
 
     //production
@@ -1123,7 +1123,7 @@ public class Blocks implements ContentList{
             size = 2;
         }};
 
-        turbineGenerator = new BurnerGenerator("turbine-generator"){{
+        steamGenerator = new BurnerGenerator("steam-generator"){{
             requirements(Category.power, with(Items.copper, 35, Items.graphite, 25, Items.lead, 40, Items.silicon, 30));
             powerProduction = 5.5f;
             itemDuration = 90f;

core/src/mindustry/content/TechTree.java

@@ -261,7 +261,7 @@ public class TechTree implements ContentList{
                                 });
                             });
 
-                            node(turbineGenerator, () -> {
+                            node(steamGenerator, () -> {
                                 node(thermalGenerator, () -> {
                                     node(differentialGenerator, () -> {
                                         node(thoriumReactor, () -> {
@@ -490,7 +490,7 @@ public class TechTree implements ContentList{
                         new SectorComplete(frozenForest),
                         new Research(pneumaticDrill),
                         new Research(powerNode),
-                        new Research(turbineGenerator)
+                        new Research(steamGenerator)
                     ), () -> {
                         node(fungalPass, Seq.with(
                             new SectorComplete(stainedMountains),

core/src/mindustry/game/Schematics.java

@@ -28,6 +28,7 @@ import mindustry.io.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
 import mindustry.world.blocks.distribution.*;
+import mindustry.world.blocks.legacy.*;
 import mindustry.world.blocks.power.*;
 import mindustry.world.blocks.production.*;
 import mindustry.world.blocks.sandbox.*;
@@ -486,8 +487,9 @@ public class Schematics implements Loadable{
             IntMap<Block> blocks = new IntMap<>();
             byte length = stream.readByte();
             for(int i = 0; i < length; i++){
-                Block block = Vars.content.getByName(ContentType.block, stream.readUTF());
+                String name = stream.readUTF();
-                blocks.put(i, block == null ? Blocks.air : block);
+                Block block = Vars.content.getByName(ContentType.block, SaveFileReader.fallback.get(name, name));
+                blocks.put(i, block == null || block instanceof LegacyBlock ? Blocks.air : block);
             }
 
             int total = stream.readInt();

core/src/mindustry/input/InputHandler.java

@@ -125,10 +125,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         Unit unit = player.unit();
         Payloadc pay = (Payloadc)unit;
 
-        if(tile != null && tile.team == unit.team && pay.canPickup(tile)
+        if(tile != null && tile.team == unit.team
             && unit.within(tile, tilesize * tile.block.size * 1.2f)){
             //pick up block directly
-            if(tile.block().buildVisibility != BuildVisibility.hidden && tile.canPickup()){
+            if(tile.block().buildVisibility != BuildVisibility.hidden && tile.canPickup() && pay.canPickup(tile)){
                 pay.pickup(tile);
             }else{ //pick up block payload
                 Payload current = tile.getPayload();
@@ -344,7 +344,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         }else{
             Building tile = world.buildWorld(pay.x(), pay.y());
 
-            if(tile != null && tile.team == unit.team && pay.canPickup(tile)){
+            if(tile != null && tile.team == unit.team){
                 Call.pickupBlockPayload(player, tile);
             }
         }

core/src/mindustry/io/SaveFileReader.java

@@ -8,11 +8,7 @@ import mindustry.world.*;
 import java.io.*;
 
 public abstract class SaveFileReader{
-    protected final ReusableByteOutStream byteOutput = new ReusableByteOutStream();
+    public static final ObjectMap<String, String> fallback = ObjectMap.of(
-    protected final DataOutputStream dataBytes = new DataOutputStream(byteOutput);
-    protected final ReusableByteOutStream byteOutputSmall = new ReusableByteOutStream();
-    protected final DataOutputStream dataBytesSmall = new DataOutputStream(byteOutputSmall);
-    protected final ObjectMap<String, String> fallback = ObjectMap.of(
     "dart-mech-pad", "legacy-mech-pad",
     "dart-ship-pad", "legacy-mech-pad",
     "javelin-ship-pad", "legacy-mech-pad",
@@ -35,9 +31,15 @@ public abstract class SaveFileReader{
     "fortress-factory", "legacy-unit-factory",
 
     "mass-conveyor", "payload-conveyor",
-    "vestige", "scepter"
+    "vestige", "scepter",
+    "turbine-generator", "steam-generator"
     );
 
+    protected final ReusableByteOutStream byteOutput = new ReusableByteOutStream();
+    protected final DataOutputStream dataBytes = new DataOutputStream(byteOutput);
+    protected final ReusableByteOutStream byteOutputSmall = new ReusableByteOutStream();
+    protected final DataOutputStream dataBytesSmall = new DataOutputStream(byteOutputSmall);
+
     protected int lastRegionLength;
 
     protected void region(String name, DataInput stream, CounterInputStream counter, IORunner<DataInput> cons) throws IOException{

core/src/mindustry/world/blocks/distribution/PayloadConveyor.java

@@ -193,20 +193,25 @@ public class PayloadConveyor extends Block{
 
         @Override
         public boolean acceptPayload(Building source, Payload payload){
+            if(source == this){
+                return this.item == null && payload.fits();
+            }
             //accepting payloads from units isn't supported
-            return this.item == null && progress <= 5f && source != this && payload.fits();
+            return this.item == null && progress <= 5f && payload.fits();
         }
 
         @Override
         public void handlePayload(Building source, Payload payload){
             this.item = payload;
             this.stepAccepted = curStep();
-            this.itemRotation = source.angleTo(this);
+            this.itemRotation = source == this ? rotdeg() : source.angleTo(this);
             this.animation = 0;
 
             updatePayload();
         }
 
+
+
         @Override
         public void write(Writes write){
             super.write(write);