Fixed content class errors

core/assets/bundles/bundle.properties

@@ -580,11 +580,11 @@ block.omega-mech-pad.name = Omega Mech Pad
 block.tau-mech-pad.name = Tau Mech Pad
 block.conduit.name = Conduit
 block.mechanical-pump.name = Mechanical Pump
-block.itemsource.name = Item Source
-block.itemvoid.name = Item Void
-block.liquidsource.name = Liquid Source
-block.powervoid.name = Power Void
-block.powerinfinite.name = Power Infinite
+block.item-source.name = Item Source
+block.item-void.name = Item Void
+block.liquid-source.name = Liquid Source
+block.power-void.name = Power Void
+block.power-source.name = Power Infinite
 block.unloader.name = Unloader
 block.vault.name = Vault
 block.wave.name = Wave
@@ -782,11 +782,11 @@ block.router.description = Accepts items from one direction and outputs them to
 block.distributor.description = An advanced router which splits items to up to 7 other directions equally.
 block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building.
 block.alpha-mech-pad.description = When given enough power, rebuilds your ship into the[accent] Alpha[] mech.
-block.itemsource.description = Infinitely outputs items. Sandbox only.
-block.liquidsource.description = Infinitely outputs liquids. Sandbox only.
-block.itemvoid.description = Destroys any items which go into it without using power. Sandbox only.
-block.powerinfinite.description = Infinitely outputs power. Sandbox only.
-block.powervoid.description = Voids all power inputted into it. Sandbox only.
+block.item-source.description = Infinitely outputs items. Sandbox only.
+block.liquid-source.description = Infinitely outputs liquids. Sandbox only.
+block.item-void.description = Destroys any items which go into it without using power. Sandbox only.
+block.power-source.description = Infinitely outputs power. Sandbox only.
+block.power-void.description = Voids all power inputted into it. Sandbox only.
 liquid.water.description = Commonly used for cooling machines and waste processing.
 liquid.lava.description = Can be transformed into[LIGHT_GRAY] stone[], used for generating power or used as ammo for certain turrets.
 liquid.oil.description = Can be burnt, exploded or used as a coolant.

core/assets/bundles/bundle_cs.properties

@@ -578,11 +578,11 @@ block.omega-mech-pad.name = Plošina pro Omega Mech
 block.tau-mech-pad.name = Plošina pro Tau Mech
 block.conduit.name = Potrubí
 block.mechanical-pump.name = Mechanická pumpa
-block.itemsource.name = Zdroj předmětů
-block.itemvoid.name = Prázdnota pro předměty
-block.liquidsource.name = Zdroj tekutin
-block.powervoid.name = Prázdnota pro energii
-block.powerinfinite.name = Nekonečný zdroj energie
+block.item-source.name = Zdroj předmětů
+block.item-void.name = Prázdnota pro předměty
+block.liquid-source.name = Zdroj tekutin
+block.power-void.name = Prázdnota pro energii
+block.power-source.name = Nekonečný zdroj energie
 block.unloader.name = Odbavovač
 block.vault.name = Trezor
 block.wave.name = Vlna
@@ -780,11 +780,11 @@ block.router.description = Příijmá předměty z jednoho směru a posílá je
 block.distributor.description = Pokročilý směrovač, který z libovolného počtu vstupů vytvoří libovolný počet výstupu a rozdělí přísun předmětů rovnoměrně do každého z nich, obdoba Multiplexeru a Demultiplexeru.
 block.bridge-conveyor.description = Pokročilý blok přepravy předmětů. Dovoluje transport předmětů až přez tři pole jakéhokoliv terénu nebo budovy.
 block.alpha-mech-pad.description = Když je dodán dostatek energie, Přestaví tvoji loď na[accent] Alfa[] mecha.
-block.itemsource.description = Nekonečný zdroj předmětů. Jen pro Sandbox.
-block.liquidsource.description = Nekonečný zdroj tekutin. Jen pro Sandbox.
-block.itemvoid.description = Likviduje jakéhokoliv vstupní předmět bež použití energie. Jen pro Sandbox.
-block.powerinfinite.description = Nekonečný zdroj energie. Jen pro Sandbox.
-block.powervoid.description = Prázdnota pro veškerou energii vstupující do něj. Jen pro Sandbox.
+block.item-source.description = Nekonečný zdroj předmětů. Jen pro Sandbox.
+block.liquid-source.description = Nekonečný zdroj tekutin. Jen pro Sandbox.
+block.item-void.description = Likviduje jakéhokoliv vstupní předmět bež použití energie. Jen pro Sandbox.
+block.power-source.description = Nekonečný zdroj energie. Jen pro Sandbox.
+block.power-void.description = Prázdnota pro veškerou energii vstupující do něj. Jen pro Sandbox.
 liquid.water.description = Nejčastěji se používá ke chlazení a zpracování odpadu.
 liquid.lava.description = Může být transformován na[LIGHT_GRAY] kámen[], nebo pro generátor energie nebo jako střelivo pro určitý druh střílen.
 liquid.oil.description = Může být spálen, vybouchnout nebo použit jako chlazení.

core/assets/bundles/bundle_de.properties

@@ -567,11 +567,11 @@ block.omega-mech-pad.name = Omega Mech Pad
 block.tau-mech-pad.name = Tau Mech Pad
 block.conduit.name = Leitungsrohr
 block.mechanical-pump.name = Mechanische Pumpe
-block.itemsource.name = Materialquelle
-block.itemvoid.name = Materialschlucker
-block.liquidsource.name = Flüssigkeitsquelle
-block.powervoid.name = Stromsenke
-block.powerinfinite.name = Unendliche Stromquelle
+block.item-source.name = Materialquelle
+block.item-void.name = Materialschlucker
+block.liquid-source.name = Flüssigkeitsquelle
+block.power-void.name = Stromsenke
+block.power-source.name = Unendliche Stromquelle
 block.unloader.name = Entlader
 block.vault.name = Tresor
 block.wave.name = Welle
@@ -769,11 +769,11 @@ block.router.description = Akzeptiert Materialien aus einer Richtung und leitet
 block.distributor.description = Ein weiterentwickelter Router, der Materialien in bis zu sieben Richtungen gleichmäßig verteilt.
 block.bridge-conveyor.description = Verbesserter Transportblock. Erlaubt es, Materialien über bis zu 3 Kacheln beliebigen Terrains oder Inhalts zu transportieren.
 block.alpha-mech-pad.description = Sofern genügend Strom zur Verfügung steht, baut dieses Pad deinen Schiff in einen [accent]Alpha[] mech zurück.
-block.itemsource.description = Produziert unendlich items. Nur im Sandkasten verfügbar.
-block.liquidsource.description = Produziert unendlich Flüssigkeiten. Nur im Sandkasten verfügbar.
-block.itemvoid.description = Zerstört Materialien, die hereingegeben werden, ohne Strom zu verbrauchen. Nur im Sandkasten verfügbar.
-block.powerinfinite.description = Erzeugt unendlich viel Strom. Nur im Sandkasten verfügbar.
-block.powervoid.description = Verschlingt den kompletten übrigen Strom. Nur im Sandkasten verfügbar.
+block.item-source.description = Produziert unendlich items. Nur im Sandkasten verfügbar.
+block.liquid-source.description = Produziert unendlich Flüssigkeiten. Nur im Sandkasten verfügbar.
+block.item-void.description = Zerstört Materialien, die hereingegeben werden, ohne Strom zu verbrauchen. Nur im Sandkasten verfügbar.
+block.power-source.description = Erzeugt unendlich viel Strom. Nur im Sandkasten verfügbar.
+block.power-void.description = Verschlingt den kompletten übrigen Strom. Nur im Sandkasten verfügbar.
 liquid.water.description = Wird überlicherweise zum Kühlen von Maschinen und zur Müllverarbeitung verwendet.
 liquid.lava.description = Kann zu [LIGHT_GRAY] Stein[] verarbeitet werden, zur Stromerzeugung verwendet werden oder als Munition für bestimmte Geschütztürme verwendet werden.
 liquid.oil.description = Kann verbrannt, zum explodieren gebracht, oder als Kühlung verwendet werden.

core/assets/bundles/bundle_es.properties

@@ -567,11 +567,11 @@ block.omega-mech-pad.name = Pad de mecanoide Omega
 block.tau-mech-pad.name = Pad de mecanoide Tau
 block.conduit.name = Conducto
 block.mechanical-pump.name = Bomba Mecánica
-block.itemsource.name = Fuente de objetos
-block.itemvoid.name = Vacío de objetos 
-block.liquidsource.name = Fuente de líquidos
-block.powervoid.name = Vacío de energía
-block.powerinfinite.name = Energía Infinita
+block.item-source.name = Fuente de objetos
+block.item-void.name = Vacío de objetos 
+block.liquid-source.name = Fuente de líquidos
+block.power-void.name = Vacío de energía
+block.power-source.name = Energía Infinita
 block.unloader.name = Descargador
 block.vault.name = Bóveda
 block.wave.name = Horda
@@ -769,11 +769,11 @@ block.router.description = Acepta objetos de una dirección y deja objetos equit
 block.distributor.description = Un enrutador avanzado que distribuye objetos equitativamente en hasta otras 7 direcciones.
 block.bridge-conveyor.description = Bloque avanado de transporte. Puede transportar objetos por encima hasta 3 casillas de cualquier terreno o construcción.
 block.alpha-mech-pad.description = Cuando se le da suficiente energía, reconstruye tu nave en el mecanoide[accent] Alpha[].
-block.itemsource.description = Da objetos infinitos. Solo en sandbox.
-block.liquidsource.description = Da líquido infinito. Solo en sandbox.
-block.itemvoid.description = Destruye cuanquier objeto que va a él sin necesitar energía. Solo en sandbox.
-block.powerinfinite.description = Da energía infinita. Solo en sandbox.
-block.powervoid.description = Elimina toda la energía que se le da. Solo en sandbox.
+block.item-source.description = Da objetos infinitos. Solo en sandbox.
+block.liquid-source.description = Da líquido infinito. Solo en sandbox.
+block.item-void.description = Destruye cuanquier objeto que va a él sin necesitar energía. Solo en sandbox.
+block.power-source.description = Da energía infinita. Solo en sandbox.
+block.power-void.description = Elimina toda la energía que se le da. Solo en sandbox.
 liquid.water.description = Usado comúnmente para enfriar máquinas y para procesar residuos.
 liquid.lava.description = Puede usarse para ser transformado en[LIGHT_GRAY] stone[], para generar energía o para munición de ciertas torres.
 liquid.oil.description = Puede ser quemado, explotado o como un enfriador.

core/assets/bundles/bundle_fr.properties

@@ -567,11 +567,11 @@ block.omega-mech-pad.name = Reconstructeur de mécha "Oméga"
 block.tau-mech-pad.name = Reconstructeur de mécha "Tau"
 block.conduit.name = Conduit
 block.mechanical-pump.name = Pompe mécanique
-block.itemsource.name = Source d'objets
-block.itemvoid.name = Destructeur d'objets
-block.liquidsource.name = Source de liquide
-block.powervoid.name = absorbeur énergétique
-block.powerinfinite.name = Puissance infinie
+block.item-source.name = Source d'objets
+block.item-void.name = Destructeur d'objets
+block.liquid-source.name = Source de liquide
+block.power-void.name = absorbeur énergétique
+block.power-source.name = Puissance infinie
 block.unloader.name = Déchargeur
 block.vault.name = Coffre-Fort
 block.wave.name = Vague
@@ -769,11 +769,11 @@ block.router.description = Accepte les objets depuis une ou plus directions et l
 block.distributor.description = Un routeur avancé qui sépare les objets jusqu'à 7 autres directions équitablement.
 block.bridge-conveyor.description = bloc de transport avancé permettant de traverser jusqu'à 3 blocs de n'importe quel terrain ou batiment.
 block.alpha-mech-pad.description = Avec assez d'énergie, reconstruit votre vaisseau en un mécha [accent] Alpha[].
-block.itemsource.description = Produit des objets à l'infini. Bac à sable uniquement .
-block.liquidsource.description = Source de liquide infinie . Bac à sable uniquement.
-block.itemvoid.description = Désintègre n'importe quel objet qui va à l'intérieur sans utiliser d'énergie. Bac à sable uniquement.
-block.powerinfinite.description = Produit de l'énergie à l'infini. Bac à sable uniquement.
-block.powervoid.description = Supprime toute l'énergie allant à l'intérieur.Bac à sable uniquement
+block.item-source.description = Produit des objets à l'infini. Bac à sable uniquement .
+block.liquid-source.description = Source de liquide infinie . Bac à sable uniquement.
+block.item-void.description = Désintègre n'importe quel objet qui va à l'intérieur sans utiliser d'énergie. Bac à sable uniquement.
+block.power-source.description = Produit de l'énergie à l'infini. Bac à sable uniquement.
+block.power-void.description = Supprime toute l'énergie allant à l'intérieur.Bac à sable uniquement
 liquid.water.description = Couramment utilisé pour le refroidissement et le traitement des déchets.
 liquid.lava.description = Peut être transformé en [LIGHT_GRAY]pierre[], utilisé pour produire de l'énergie ou utilisé comme munition par certaines tourelles.
 liquid.oil.description = Peut être brûlé, utilisé comme explosif ou comme liquide de refroidissement.

core/assets/bundles/bundle_fr_BE.properties

@@ -575,11 +575,11 @@ block.omega-mech-pad.name = Omega Mech Pad
 block.tau-mech-pad.name = Tau Mech Pad
 block.conduit.name = Conduit
 block.mechanical-pump.name = Pompe Méchanique
-block.itemsource.name = Source d'objets
-block.itemvoid.name = Destructeur d'objets
-block.liquidsource.name = Source de liquide
-block.powervoid.name = Absorbeur énergétique
-block.powerinfinite.name = Puissance infinie
+block.item-source.name = Source d'objets
+block.item-void.name = Destructeur d'objets
+block.liquid-source.name = Source de liquide
+block.power-void.name = Absorbeur énergétique
+block.power-source.name = Puissance infinie
 block.unloader.name = Déchargeur
 block.vault.name = Coffre-Fort
 block.wave.name = Vague
@@ -777,11 +777,11 @@ block.router.description = Accepte les éléments d'une direction et les envoie
 block.distributor.description = Un routeur avancé qui divise les articles en 7 autres directions de manière égale. [scarlet]Seule et unique ![]
 block.bridge-conveyor.description = Bloc de transport d'articles avancé. Permet de transporter des objets sur plus de 3 tuiles de n'importe quel terrain ou bâtiment.
 block.alpha-mech-pad.description = Lorsque vous avez assez de puissance, reconstruisez votre vaisseau dans le [accent]Alpha[] mech.
-block.itemsource.description = Sort infiniment les articles. Bac à sable seulement.
-block.liquidsource.description = Débit infini de liquides. Bac à sable seulement.
-block.itemvoid.description = Détruit tous les objets qui y entrent sans utiliser d'énergie. Bac à sable seulement.
-block.powerinfinite.description = Débit infini d'énergie. Bac à sable seulement.
-block.powervoid.description = Annule toute l'énergie qui y est introduite. Bac à sable seulement.
+block.item-source.description = Sort infiniment les articles. Bac à sable seulement.
+block.liquid-source.description = Débit infini de liquides. Bac à sable seulement.
+block.item-void.description = Détruit tous les objets qui y entrent sans utiliser d'énergie. Bac à sable seulement.
+block.power-source.description = Débit infini d'énergie. Bac à sable seulement.
+block.power-void.description = Annule toute l'énergie qui y est introduite. Bac à sable seulement.
 liquid.water.description = Couramment utilisé pour les machines de refroidissement et le traitement des déchets.
 liquid.lava.description = Peut être transformé en [LIGHT_GRAY]pierre[], utilisé pour générer de l'énergie ou utilisé comme munition pour certaines tourelles.
 liquid.oil.description = Peut être brûlé, explosé ou utilisé comme liquide de refroidissement.

core/assets/bundles/bundle_in_ID.properties

@@ -567,11 +567,11 @@ block.omega-mech-pad.name = Omega Mech Pad
 block.tau-mech-pad.name = Tau Mech Pad
 block.conduit.name = saluran
 block.mechanical-pump.name = Mechanical Pump
-block.itemsource.name = Item Source
-block.itemvoid.name = Item Void
-block.liquidsource.name = Liquid Source
-block.powervoid.name = Power Void
-block.powerinfinite.name = Power Infinite
+block.item-source.name = Item Source
+block.item-void.name = Item Void
+block.liquid-source.name = Liquid Source
+block.power-void.name = Power Void
+block.power-source.name = Power Infinite
 block.unloader.name = Unloader
 block.vault.name = Vault
 block.wave.name = Wave
@@ -769,11 +769,11 @@ block.router.description = Accepts items from one direction and outputs them to
 block.distributor.description = An advanced router which splits items to up to 7 other directions equally.
 block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building.
 block.alpha-mech-pad.description = When given enough power, rebuilds your ship into the[accent] Alpha[] mech.
-block.itemsource.description = Infinitely outputs items. Sandbox only.
-block.liquidsource.description = Infinitely outputs liquids. Sandbox only.
-block.itemvoid.description = Destroys any items which go into it without using power. Sandbox only.
-block.powerinfinite.description = Infinitely outputs power. Sandbox only.
-block.powervoid.description = Voids all power inputted into it. Sandbox only.
+block.item-source.description = Infinitely outputs items. Sandbox only.
+block.liquid-source.description = Infinitely outputs liquids. Sandbox only.
+block.item-void.description = Destroys any items which go into it without using power. Sandbox only.
+block.power-source.description = Infinitely outputs power. Sandbox only.
+block.power-void.description = Voids all power inputted into it. Sandbox only.
 liquid.water.description = Commonly used for cooling machines and waste processing.
 liquid.lava.description = Can be transformed into[LIGHT_GRAY] stone[], used for generating power or used as ammo for certain turrets.
 liquid.oil.description = Can be burnt, exploded or used as a coolant.

core/assets/bundles/bundle_it.properties

@@ -567,11 +567,11 @@ block.omega-mech-pad.name = Omega Mech Pad
 block.tau-mech-pad.name = Tau Mech Pad
 block.conduit.name = Condotto
 block.mechanical-pump.name = Pompa meccanica
-block.itemsource.name = Sorgente oggetti
-block.itemvoid.name = Vuoto oggetti
-block.liquidsource.name = Sorgente liquida
-block.powervoid.name = Energia nulla
-block.powerinfinite.name = Energia infinita
+block.item-source.name = Sorgente oggetti
+block.item-void.name = Vuoto oggetti
+block.liquid-source.name = Sorgente liquida
+block.power-void.name = Energia nulla
+block.power-source.name = Energia infinita
 block.unloader.name = Scaricatore
 block.vault.name = Deposito
 block.wave.name = Idrogetto
@@ -769,11 +769,11 @@ block.router.description = Accepts items from one direction and outputs them to
 block.distributor.description = An advanced router which splits items to up to 7 other directions equally.
 block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building.
 block.alpha-mech-pad.description = When given enough power, rebuilds your ship into the[accent] Alpha[] mech.
-block.itemsource.description = Infinitely outputs items. Sandbox only.
-block.liquidsource.description = Infinitely outputs liquids. Sandbox only.
-block.itemvoid.description = Destroys any items which go into it without using power. Sandbox only.
-block.powerinfinite.description = Infinitely outputs power. Sandbox only.
-block.powervoid.description = Voids all power inputted into it. Sandbox only.
+block.item-source.description = Infinitely outputs items. Sandbox only.
+block.liquid-source.description = Infinitely outputs liquids. Sandbox only.
+block.item-void.description = Destroys any items which go into it without using power. Sandbox only.
+block.power-source.description = Infinitely outputs power. Sandbox only.
+block.power-void.description = Voids all power inputted into it. Sandbox only.
 liquid.water.description = Commonly used for cooling machines and waste processing.
 liquid.lava.description = Can be transformed into[LIGHT_GRAY] stone[], used for generating power or used as ammo for certain turrets.
 liquid.oil.description = Can be burnt, exploded or used as a coolant.

core/assets/bundles/bundle_ja.properties

@@ -576,11 +576,11 @@ block.omega-mech-pad.name = オメガパッド
 block.tau-mech-pad.name = タウパッド
 block.conduit.name = パイプ
 block.mechanical-pump.name = 機械ポンプ
-block.itemsource.name = アイテムソース
-block.itemvoid.name = アイテムボイド
-block.liquidsource.name = 液体ソース
-block.powervoid.name = 電力ボイド
-block.powerinfinite.name = 無限電源
+block.item-source.name = アイテムソース
+block.item-void.name = アイテムボイド
+block.liquid-source.name = 液体ソース
+block.power-void.name = 電力ボイド
+block.power-source.name = 無限電源
 block.unloader.name = アンローダー
 block.vault.name = ボールト
 block.wave.name = ウェーブ
@@ -778,11 +778,11 @@ block.router.description = 一つの方向から受け取ったアイテムを
 block.distributor.description = 高度なルーターです。アイテムを7方向に均等に分けて搬出します。
 block.bridge-conveyor.description = 高度な輸送ブロックです。地形や建物を超えて、3ブロック離れた場所にアイテムを輸送することができます。
 block.alpha-mech-pad.description = 電力を使用して、機体を[accent]アルファ[]機体に作り替えます。
-block.itemsource.description = アイテムを無限に搬出します。サンドボックスのみ。
-block.liquidsource.description = 液体を無限に搬出します。サンドボックスのみ。
-block.itemvoid.description = 電力なしでアイテムを廃棄します。サンドボックスのみ。
-block.powerinfinite.description = 無限に電力を搬出します。サンドボックスのみ。
-block.powervoid.description = 入力されたすべての電力を破棄します。サンドボックスのみ。
+block.item-source.description = アイテムを無限に搬出します。サンドボックスのみ。
+block.liquid-source.description = 液体を無限に搬出します。サンドボックスのみ。
+block.item-void.description = 電力なしでアイテムを廃棄します。サンドボックスのみ。
+block.power-source.description = 無限に電力を搬出します。サンドボックスのみ。
+block.power-void.description = 入力されたすべての電力を破棄します。サンドボックスのみ。
 liquid.water.description = 一般的に機械の冷却や廃棄物の処理などに使用されます。
 liquid.lava.description = 冷却して石にしたり、発電や一部ターレットの弾薬として使用することができます。
 liquid.oil.description = 燃焼させたり、爆発させたり、冷却水としても使われます。

core/assets/bundles/bundle_ko.properties

@@ -570,11 +570,11 @@ block.omega-mech-pad.name = 오메가 기체 패드
 block.tau-mech-pad.name = 타우 기체 패드
 block.conduit.name = 파이프
 block.mechanical-pump.name = 기계식 펌프
-block.itemsource.name = 아이템 소스
-block.itemvoid.name = 아이템 삭제 장치
-block.liquidsource.name = 무한 액체공급 장치
-block.powervoid.name = 방전장치
-block.powerinfinite.name = 무한 전력공급 장치
+block.item-source.name = 아이템 소스
+block.item-void.name = 아이템 삭제 장치
+block.liquid-source.name = 무한 액체공급 장치
+block.power-void.name = 방전장치
+block.power-source.name = 무한 전력공급 장치
 block.unloader.name = 언로더
 block.vault.name = 창고
 block.wave.name = 파도
@@ -772,11 +772,11 @@ block.router.description = 한 방향에서 아이템을 받은 후 최대 3개
 block.distributor.description = 아이템을 최대 7개의 다른 방향으로 똑같이 분할하는 고급 분배기.
 block.bridge-conveyor.description = 고급 자원 수송 블록.\n지형이나 건물을 넘어 최대 3개 타일을 건너뛰고 자원을 운송할 수 있습니다.
 block.alpha-mech-pad.description = 알파 기체로 바꿀 수 있는 패드입니다.
-block.itemsource.description = 자원을 선택하면 그 자원이 무한하게 생성되는 블록입니다.
-block.liquidsource.description = 무한한 액체를 출력해냅니다.
-block.itemvoid.description = 아이템을 사라지게 만듭니다.
-block.powerinfinite.description = 무한한 전력을 공급해주는 블록입니다.
-block.powervoid.description = 설정된 아이템을 계속해서 출력하는 블록입니다.
+block.item-source.description = 자원을 선택하면 그 자원이 무한하게 생성되는 블록입니다.
+block.liquid-source.description = 무한한 액체를 출력해냅니다.
+block.item-void.description = 아이템을 사라지게 만듭니다.
+block.power-source.description = 무한한 전력을 공급해주는 블록입니다.
+block.power-void.description = 설정된 아이템을 계속해서 출력하는 블록입니다.
 liquid.water.description = 지상 유닛이 이 위를 지나가면 이동속도가 느려지고, 깊은 물에 빠지면 죽습니다.
 liquid.lava.description = 지상 유닛이 이 위를 지나가면 이동속도가 매우 느려지고, 지속적으로 데미지를 입습니다.
 liquid.oil.description = 일부 조합 블록에서 사용되는 자원입니다.

core/assets/bundles/bundle_pl.properties

@@ -567,11 +567,11 @@ block.omega-mech-pad.name = Omega Mech Pad
 block.tau-mech-pad.name = Tau Mech Pad
 block.conduit.name = Rura
 block.mechanical-pump.name = Mechaniczna Pompa
-block.itemsource.name = Źródło przedmiotów
-block.itemvoid.name = Próżnia przedmiotów
-block.liquidsource.name = Źródło płynów
-block.powervoid.name = Próżnia prądu
-block.powerinfinite.name = Nieskończony Prąd
+block.item-source.name = Źródło przedmiotów
+block.item-void.name = Próżnia przedmiotów
+block.liquid-source.name = Źródło płynów
+block.power-void.name = Próżnia prądu
+block.power-source.name = Nieskończony Prąd
 block.unloader.name = Wyciągacz
 block.vault.name = Magazyn
 block.wave.name = Działo Płynowe
@@ -769,11 +769,11 @@ block.router.description = Akceptuje przedmioty z jednego miejsca i rozdziela je
 block.distributor.description = Zaawansowany rozdzielacz, rozdzielający przedmioty do 7 innych kierunków.
 block.bridge-conveyor.description = Zaawansowany blok transportujący. Pozwala na przenoszenie przedmiotów nawet do 3 bloków na każdym terenie, przez każdy budynek.
 block.alpha-mech-pad.description = When given enough power, rebuilds your ship into the[accent] Alpha[] mech.
-block.itemsource.description = Wydziela przedmioty w nieskończoność. Dostępny tylko w trybie sandbox.
-block.liquidsource.description = Wydziela ciecz w nieskończoność. Dostępny tylko w trybie sandbox.
-block.itemvoid.description = Niszczy wszystkie przedmioty, które idą do tego bloku, który nie wymaga prądu. Dostępny tylko w trybie sandbox.
-block.powerinfinite.description = Wydziela prąd w nieskończoność. Dostępny tylko w trybie sandbox.
-block.powervoid.description = Niszczy całą energię wprowadzoną do tego bloku. Dostępny tylko w trybie sandbox.
+block.item-source.description = Wydziela przedmioty w nieskończoność. Dostępny tylko w trybie sandbox.
+block.liquid-source.description = Wydziela ciecz w nieskończoność. Dostępny tylko w trybie sandbox.
+block.item-void.description = Niszczy wszystkie przedmioty, które idą do tego bloku, który nie wymaga prądu. Dostępny tylko w trybie sandbox.
+block.power-source.description = Wydziela prąd w nieskończoność. Dostępny tylko w trybie sandbox.
+block.power-void.description = Niszczy całą energię wprowadzoną do tego bloku. Dostępny tylko w trybie sandbox.
 liquid.water.description = Powszechnie używana do schładzania budowli i przetwarzania odpadów.
 liquid.lava.description = Może być przekształcona w [LIGHT_GRAY] kamień[]; używana do generowania prądu lub używana jako amunicja dla niektórych działek.
 liquid.oil.description = Może się palić, eksplodować lub być używana do schładzania.

core/assets/bundles/bundle_pt_BR.properties

@@ -567,11 +567,11 @@ block.omega-mech-pad.name = Controle do meca Omega
 block.tau-mech-pad.name = Controle do meca Tau
 block.conduit.name = Cano
 block.mechanical-pump.name = Bomba Mecanica
-block.itemsource.name = Fonte do item
-block.itemvoid.name = Item Void
-block.liquidsource.name = Liquid Source
-block.powervoid.name = Power Void
-block.powerinfinite.name = Power Infinite
+block.item-source.name = Fonte do item
+block.item-void.name = Item Void
+block.liquid-source.name = Liquid Source
+block.power-void.name = Power Void
+block.power-source.name = Power Infinite
 block.unloader.name = Unloader
 block.vault.name = Cofre
 block.wave.name = Wave
@@ -769,11 +769,11 @@ block.router.description = Aceita itens de uma direção e os divide em 3 direç
 block.distributor.description = Um roteador avancada que espalhas os itens em 7 outras direções igualmente.
 block.bridge-conveyor.description = Bloco de transporte de itens avancado. Possibilita o transporte de itens acima de 3 blocos de construção ou paredes.
 block.alpha-mech-pad.description = Quando dado energia o suficiente, Reconstrua sua nave em [accent] Alpha[] mech.
-block.itemsource.description = Infinivamente da itens. Apenas caixa de areia.
-block.liquidsource.description = Infinitivamente da Liquidos. Apenas caixa de areia.
-block.itemvoid.description = Destroi qualquer item que entre sem requerir energia. Apenas caixa de areia.
-block.powerinfinite.description = Infinitivamente da energia. Apenas caixa de areia.
-block.powervoid.description = Destroi qualquer energia que entre dentro. Apenas caixa de areia.
+block.item-source.description = Infinivamente da itens. Apenas caixa de areia.
+block.liquid-source.description = Infinitivamente da Liquidos. Apenas caixa de areia.
+block.item-void.description = Destroi qualquer item que entre sem requerir energia. Apenas caixa de areia.
+block.power-source.description = Infinitivamente da energia. Apenas caixa de areia.
+block.power-void.description = Destroi qualquer energia que entre dentro. Apenas caixa de areia.
 liquid.water.description = Comumente usado em resfriamento e no processo de perda.
 liquid.lava.description = Pode ser transformado em[LIGHT_GRAY] pedra[], usado para gerar energia ou usado como munição para certas torres.
 liquid.oil.description = Pode ser queimado, explodido ou usado como resfriador.

core/assets/bundles/bundle_ru.properties

@@ -569,11 +569,11 @@ block.omega-mech-pad.name = Реконструктор мехов "Омега"
 block.tau-mech-pad.name = Реконструктор мехов "Тау"
 block.conduit.name = Трубопровод
 block.mechanical-pump.name = Механическая помпа
-block.itemsource.name = Источник предметов
-block.itemvoid.name = Предметный вакуум
-block.liquidsource.name = Источник жидкостей
-block.powervoid.name = Энергетический вакуум
-block.powerinfinite.name = Источник энергии
+block.item-source.name = Источник предметов
+block.item-void.name = Предметный вакуум
+block.liquid-source.name = Источник жидкостей
+block.power-void.name = Энергетический вакуум
+block.power-source.name = Источник энергии
 block.unloader.name = Разгрузчик
 block.vault.name = Хранилище
 block.wave.name = Волна
@@ -771,11 +771,11 @@ block.router.description = Принимает предметы из одного
 block.distributor.description = Передовой маршрутизатор, который равномерно разбивает элементы до 7 других направлений.
 block.bridge-conveyor.description = Улучшенный транспортный блок элементов. Позволяет транспортировать предметы до 3-х блоков над любым ландшафтом или зданием.
 block.alpha-mech-pad.description = Превращает вас в мех [accent] Альфа[]. Требует энергию.
-block.itemsource.description = Бесконечно выводит предметы. Работает только в песочнице.
-block.liquidsource.description = Бесконечно выводит жидкости. Работает только в песочнице.
-block.itemvoid.description = Уничтожает любые предметы, которые входят в него, без использования энергии. Работает только в режиме песочницы.
-block.powerinfinite.description = Бесконечность — не предел. Бесконечно выводит энергию. Доступен только в режиме песочницы.
-block.powervoid.description = Энергия просто уходит в пустоту. Присутствует только в песочнице.
+block.item-source.description = Бесконечно выводит предметы. Работает только в песочнице.
+block.liquid-source.description = Бесконечно выводит жидкости. Работает только в песочнице.
+block.item-void.description = Уничтожает любые предметы, которые входят в него, без использования энергии. Работает только в режиме песочницы.
+block.power-source.description = Бесконечность — не предел. Бесконечно выводит энергию. Доступен только в режиме песочницы.
+block.power-void.description = Энергия просто уходит в пустоту. Присутствует только в песочнице.
 liquid.water.description = Намного лучше чем  [BLUE]монооксид дигидрогена[].\n\n Для получения воды используйте помпу(насос) на источнике(блоке) или экстрактор воды.\n\n Эту жидкость можно подвести к бурам для ускорения скорости добычи или к турелям для ускорения стрельбы.
 liquid.lava.description = [accent]Горячо...\nВещество расплавленное из горно-каменных пород.
 liquid.oil.description = Кто-то писал о добавлении золота в игру. Его добавили, правда оно какое-то чёрное...\nСмесь жидких углеводородов, выделяющаяся из природного газа в результате снижения температуры и пластового давления.

core/assets/bundles/bundle_tk.properties

@@ -567,11 +567,11 @@ block.omega-mech-pad.name = Omega Mech Pad
 block.tau-mech-pad.name = Tau Mech Pad
 block.conduit.name = boru
 block.mechanical-pump.name = Mekanikal pompa
-block.itemsource.name = esya kaynagi
-block.itemvoid.name = esya deligi
-block.liquidsource.name = sivi kaynagi
-block.powervoid.name = guc deligi
-block.powerinfinite.name = sonsuz guc
+block.item-source.name = esya kaynagi
+block.item-void.name = esya deligi
+block.liquid-source.name = sivi kaynagi
+block.power-void.name = guc deligi
+block.power-source.name = sonsuz guc
 block.unloader.name = bekletici
 block.vault.name = kasa
 block.wave.name = Dalga
@@ -769,11 +769,11 @@ block.router.description = Accepts items from one direction and outputs them to
 block.distributor.description = An advanced router which splits items to up to 7 other directions equally.
 block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building.
 block.alpha-mech-pad.description = When given enough power, rebuilds your ship into the[accent] Alpha[] mech.
-block.itemsource.description = Infinitely outputs items. Sandbox only.
-block.liquidsource.description = Infinitely outputs liquids. Sandbox only.
-block.itemvoid.description = Destroys any items which go into it without using power. Sandbox only.
-block.powerinfinite.description = Infinitely outputs power. Sandbox only.
-block.powervoid.description = Voids all power inputted into it. Sandbox only.
+block.item-source.description = Infinitely outputs items. Sandbox only.
+block.liquid-source.description = Infinitely outputs liquids. Sandbox only.
+block.item-void.description = Destroys any items which go into it without using power. Sandbox only.
+block.power-source.description = Infinitely outputs power. Sandbox only.
+block.power-void.description = Voids all power inputted into it. Sandbox only.
 liquid.water.description = Commonly used for cooling machines and waste processing.
 liquid.lava.description = Can be transformed into[LIGHT_GRAY] stone[], used for generating power or used as ammo for certain turrets.
 liquid.oil.description = Can be burnt, exploded or used as a coolant.

core/assets/bundles/bundle_tr.properties

@@ -569,11 +569,11 @@ block.omega-mech-pad.name = Omega Mech Pad
 block.tau-mech-pad.name = Tau Mech Pad
 block.conduit.name = sıvı borusu
 block.mechanical-pump.name = Mechanical Pump
-block.itemsource.name = Item Source
-block.itemvoid.name = Item Void
-block.liquidsource.name = Liquid Source
-block.powervoid.name = Power Void
-block.powerinfinite.name = Power Infinite
+block.item-source.name = Item Source
+block.item-void.name = Item Void
+block.liquid-source.name = Liquid Source
+block.power-void.name = Power Void
+block.power-source.name = Power Infinite
 block.unloader.name = Unloader
 block.vault.name = Vault
 block.wave.name = Wave
@@ -771,11 +771,11 @@ block.router.description = Accepts items from one direction and outputs them to
 block.distributor.description = An advanced router which splits items to up to 7 other directions equally.
 block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building.
 block.alpha-mech-pad.description = When given enough power, rebuilds your ship into the[accent] Alpha[] mech.
-block.itemsource.description = Infinitely outputs items. Sandbox only.
-block.liquidsource.description = Infinitely outputs liquids. Sandbox only.
-block.itemvoid.description = Destroys any items which go into it without using power. Sandbox only.
-block.powerinfinite.description = Infinitely outputs power. Sandbox only.
-block.powervoid.description = Voids all power inputted into it. Sandbox only.
+block.item-source.description = Infinitely outputs items. Sandbox only.
+block.liquid-source.description = Infinitely outputs liquids. Sandbox only.
+block.item-void.description = Destroys any items which go into it without using power. Sandbox only.
+block.power-source.description = Infinitely outputs power. Sandbox only.
+block.power-void.description = Voids all power inputted into it. Sandbox only.
 liquid.water.description = Commonly used for cooling machines and waste processing.
 liquid.lava.description = Can be transformed into[LIGHT_GRAY] stone[], used for generating power or used as ammo for certain turrets.
 liquid.oil.description = Can be burnt, exploded or used as a coolant.

core/assets/bundles/bundle_uk_UA.properties

@@ -580,11 +580,11 @@ block.omega-mech-pad.name = Реконструктор "Омега"
 block.tau-mech-pad.name = Реконструктор "Тау"
 block.conduit.name = Трубопровід
 block.mechanical-pump.name = Механічний насос
-block.itemsource.name = Джерело предметів
-block.itemvoid.name = Предметний вакуум
-block.liquidsource.name = Рідке джерело
-block.powervoid.name = Енергетичний вакуум
-block.powerinfinite.name = Нескінченна енергія
+block.item-source.name = Джерело предметів
+block.item-void.name = Предметний вакуум
+block.liquid-source.name = Рідке джерело
+block.power-void.name = Енергетичний вакуум
+block.power-source.name = Нескінченна енергія
 block.unloader.name = Розвантажувач
 block.vault.name = Сховище
 block.wave.name = Хвиля
@@ -782,11 +782,11 @@ block.router.description = Приймає елементи з одного на
 block.distributor.description = Розширений маршрутизатор, який рівномірно розбиває елементи на 7 різних напрямків.
 block.bridge-conveyor.description = Покращений блок транспортування предметів. Дозволяє транспортувати предмети понад 3 блоки над будь-якої місцевостю або будівлеє.
 block.alpha-mech-pad.description = Коли ви отримаєте достатньо енергії, перебудовує ваш корабель у [accent] Альфа[] мех.
-block.itemsource.description = Безліченно виводить предмети.
-block.liquidsource.description = Безліченно виводить рідини.
-block.itemvoid.description = Знищує будь-які предмети, які входять, без використання енергії.
-block.powerinfinite.description = Нескінченність не межа. Безмежно виводить енергію.
-block.powervoid.description = Енергія просто йде в порожнечу.
+block.item-source.description = Безліченно виводить предмети.
+block.liquid-source.description = Безліченно виводить рідини.
+block.item-void.description = Знищує будь-які предмети, які входять, без використання енергії.
+block.power-source.description = Нескінченність не межа. Безмежно виводить енергію.
+block.power-void.description = Енергія просто йде в порожнечу.
 liquid.water.description = Цю рідину можно підвести до бурів для прискорення швидкості видобутку або к турелям для прискорення стрілянини.
 liquid.lava.description = Можна  перетворити в[LIGHT_GRAY] камінь[].
 liquid.oil.description = Можна спалити, взірвати або використовувати для охолодження.

core/assets/bundles/bundle_zh_CN.properties

@@ -567,11 +567,11 @@ block.omega-mech-pad.name = Omega 机甲平台
 block.tau-mech-pad.name = Tau 机甲平台
 block.conduit.name = 导管
 block.mechanical-pump.name = 机械泵
-block.itemsource.name = 物品源
-block.itemvoid.name = 物品黑洞
-block.liquidsource.name = 液体源
-block.powervoid.name = 能源黑洞
-block.powerinfinite.name = 无限能源
+block.item-source.name = 物品源
+block.item-void.name = 物品黑洞
+block.liquid-source.name = 液体源
+block.power-void.name = 能源黑洞
+block.power-source.name = 无限能源
 block.unloader.name = 装卸器
 block.vault.name = 仓库
 block.wave.name = 波浪
@@ -769,11 +769,11 @@ block.router.description = 从一个方向接受物品，并将它们平均输
 block.distributor.description = 一个高级路由器，可以将物品分成最多7个方向。
 block.bridge-conveyor.description = 高级项目传输块。允许在跨越任何地形或建筑物上运输物品，最多跨越3个块。
 block.alpha-mech-pad.description = 当给予足够的电力时，将你的装置重建为[accent] Alpha []机甲。
-block.itemsource.description = 无限输出物品。仅限沙箱。
-block.liquidsource.description = 无限输出液体。仅限沙箱。
-block.itemvoid.description = 在不使用电源的情况下销毁任何进入它的物品。仅限沙箱。
-block.powerinfinite.description = 无限输出功率。仅限沙箱。
-block.powervoid.description = 消耗输入的所有功率。仅限沙箱。
+block.item-source.description = 无限输出物品。仅限沙箱。
+block.liquid-source.description = 无限输出液体。仅限沙箱。
+block.item-void.description = 在不使用电源的情况下销毁任何进入它的物品。仅限沙箱。
+block.power-source.description = 无限输出功率。仅限沙箱。
+block.power-void.description = 消耗输入的所有功率。仅限沙箱。
 liquid.water.description = 通常用于冷却和废物处理。
 liquid.lava.description = 可以转换成[LIGHT_GRAY] 石头 []，用于发电或用作某些炮塔的弹药。
 liquid.oil.description = 可以燃烧，爆炸或用作冷却液。

core/assets/bundles/bundle_zh_TW.properties

@@ -578,11 +578,11 @@ block.omega-mech-pad.name = 奧米伽機甲墊
 block.tau-mech-pad.name = Tau機甲墊
 block.conduit.name = 管線
 block.mechanical-pump.name = 機械泵
-block.itemsource.name = 物品源
-block.itemvoid.name = 物品虚
-block.liquidsource.name = 液體源
-block.powervoid.name = 能量空虛
-block.powerinfinite.name = 無限能量
+block.item-source.name = 物品源
+block.item-void.name = 物品虚
+block.liquid-source.name = 液體源
+block.power-void.name = 能量空虛
+block.power-source.name = 無限能量
 block.unloader.name = 裝卸器
 block.vault.name = 存儲庫
 block.wave.name = 波浪炮
@@ -780,11 +780,11 @@ block.router.description = 接受來自一個方向的物品並將它們平均
 block.distributor.description = 高級的分配器，可將物品均分到最多7個其他方向。
 block.bridge-conveyor.description = 高級的物品運輸方塊。允許跨過最多3個任何地形或建築物的方塊運輸物品。
 block.alpha-mech-pad.description = 當給予足夠能量時，將你的船重建為[accent]阿爾法[]機甲。
-block.itemsource.description = 不限地輸出物品。僅限沙盒。
-block.liquidsource.description = 不限地輸出液體。僅限沙盒。
-block.itemvoid.description = 不使用能量銷毀任何進入它的物品。僅限沙盒。
-block.powerinfinite.description = 不限地輸出能量。僅限沙盒。
-block.powervoid.description = 銷毀所有輸入的能量。僅限沙盒。
+block.item-source.description = 不限地輸出物品。僅限沙盒。
+block.liquid-source.description = 不限地輸出液體。僅限沙盒。
+block.item-void.description = 不使用能量銷毀任何進入它的物品。僅限沙盒。
+block.power-source.description = 不限地輸出能量。僅限沙盒。
+block.power-void.description = 銷毀所有輸入的能量。僅限沙盒。
 liquid.water.description = 常用於冷卻機器和廢物處理。
 liquid.lava.description = 可以轉換為[LIGHT_GRAY]石頭[]、用於發電或用作某些砲塔的彈藥。
 liquid.oil.description = 可以燃燒、爆炸或用作冷卻劑。

core/assets/sprites/sprites.atlas

@@ -2944,28 +2944,28 @@ incinerator
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-icon-itemsource
+block-icon-item-source
   rotate: false
   xy: 483, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-itemsource
+item-source
   rotate: false
   xy: 483, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-icon-itemvoid
+block-icon-item-void
   rotate: false
   xy: 415, 357
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-itemvoid
+item-void
   rotate: false
   xy: 415, 357
   size: 32, 32
@@ -3042,6 +3042,20 @@ block-icon-liquid-router
   orig: 32, 32
   offset: 0, 0
   index: -1
+block-icon-liquid-source
+  rotate: false
+  xy: 483, 357
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+liquid-source
+  rotate: false
+  xy: 483, 357
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 block-icon-liquid-tank
   rotate: false
   xy: 261, 1243
@@ -3049,20 +3063,6 @@ block-icon-liquid-tank
   orig: 96, 96
   offset: 0, 0
   index: -1
-block-icon-liquidsource
-  rotate: false
-  xy: 483, 357
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquidsource
-  rotate: false
-  xy: 483, 357
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 block-icon-mass-driver
   rotate: false
   xy: 359, 1341
@@ -3308,14 +3308,28 @@ block-icon-power-node-large
   orig: 64, 64
   offset: 0, 0
   index: -1
-block-icon-powerinfinite
+block-icon-power-source
   rotate: false
   xy: 229, 310
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-icon-powervoid
+power-source
+  rotate: false
+  xy: 229, 310
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-icon-power-void
+  rotate: false
+  xy: 229, 276
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+power-void
   rotate: false
   xy: 229, 276
   size: 32, 32

core/src/io/anuke/mindustry/content/Blocks.java

@@ -46,17 +46,6 @@ public class Blocks implements ContentList{
     @Override
     public void load(){
         //region environment blocks
-        
-        //create ores for every floor and item combination necessary
-        for(Item item : content.items()){
-            if(!item.genOre) continue;
-
-            for(Block block : content.blocks()){
-                if(block instanceof Floor && ((Floor) block).hasOres){
-                    new OreBlock(item, (Floor) block);
-                }
-            }
-        }
 
         air = new Floor("air"){
             {
@@ -1187,5 +1176,20 @@ public class Blocks implements ContentList{
         }};
         
         //endregion
+
+        //region ores
+
+        //create ores for every floor and item combination necessary
+        for(Item item : content.items()){
+            if(!item.genOre) continue;
+
+            for(Block block : content.blocks()){
+                if(block instanceof Floor && ((Floor) block).hasOres){
+                    new OreBlock(item, (Floor) block);
+                }
+            }
+        }
+
+        //endregion
     }
 }

core/src/io/anuke/mindustry/content/Fx.java

@@ -8,6 +8,7 @@ import io.anuke.arc.graphics.g2d.Fill;
 import io.anuke.arc.graphics.g2d.Lines;
 import io.anuke.arc.math.Angles;
 import io.anuke.arc.math.Mathf;
+import io.anuke.arc.util.Tmp;
 import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect;
 import io.anuke.mindustry.game.ContentList;
 import io.anuke.mindustry.graphics.Palette;
@@ -803,5 +804,309 @@ public class Fx implements ContentList{
 
             Draw.reset();
         });
+
+
+        reactorsmoke = new Effect(17, e -> {
+            Angles.randLenVectors(e.id, 4, e.fin() * 8f, (x, y) -> {
+                float size = 1f + e.fout() * 5f;
+                Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.fin());
+                Draw.rect("circle", e.x + x, e.y + y, size, size);
+                Draw.reset();
+            });
+        });
+        nuclearsmoke = new Effect(40, e -> {
+            Angles.randLenVectors(e.id, 4, e.fin() * 13f, (x, y) -> {
+                float size = e.fslope() * 4f;
+                Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.fin());
+                Draw.rect("circle", e.x + x, e.y + y, size, size);
+                Draw.reset();
+            });
+        });
+        nuclearcloud = new Effect(90, 200f, e -> {
+            Angles.randLenVectors(e.id, 10, e.finpow() * 90f, (x, y) -> {
+                float size = e.fout() * 14f;
+                Draw.color(Color.LIME, Color.GRAY, e.fin());
+                Draw.rect("circle", e.x + x, e.y + y, size, size);
+                Draw.reset();
+            });
+        });
+        redgeneratespark = new Effect(18, e -> {
+            Angles.randLenVectors(e.id, 5, e.fin() * 8f, (x, y) -> {
+                float len = e.fout() * 4f;
+                Draw.color(Palette.redSpark, Color.GRAY, e.fin());
+                //Draw.alpha(e.fout());
+                Draw.rect("circle", e.x + x, e.y + y, len, len);
+                Draw.reset();
+            });
+        });
+        generatespark = new Effect(18, e -> {
+            Angles.randLenVectors(e.id, 5, e.fin() * 8f, (x, y) -> {
+                float len = e.fout() * 4f;
+                Draw.color(Palette.orangeSpark, Color.GRAY, e.fin());
+                Draw.rect("circle", e.x + x, e.y + y, len, len);
+                Draw.reset();
+            });
+        });
+        fuelburn = new Effect(23, e -> {
+            Angles.randLenVectors(e.id, 5, e.fin() * 9f, (x, y) -> {
+                float len = e.fout() * 4f;
+                Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.fin());
+                Draw.rect("circle", e.x + x, e.y + y, len, len);
+                Draw.reset();
+            });
+        });
+        plasticburn = new Effect(40, e -> {
+            Angles.randLenVectors(e.id, 5, 3f + e.fin() * 5f, (x, y) -> {
+                Draw.color(Color.valueOf("e9ead3"), Color.GRAY, e.fin());
+                Fill.circle(e.x + x, e.y + y, e.fout() * 1f);
+                Draw.reset();
+            });
+        });
+        pulverize = new Effect(40, e -> {
+            Angles.randLenVectors(e.id, 5, 3f + e.fin() * 8f, (x, y) -> {
+                Draw.color(Palette.stoneGray);
+                Fill.square(e.x + x, e.y + y, e.fout() * 2f + 0.5f, 45);
+                Draw.reset();
+            });
+        });
+        pulverizeRed = new Effect(40, e -> {
+            Angles.randLenVectors(e.id, 5, 3f + e.fin() * 8f, (x, y) -> {
+                Draw.color(Palette.redDust, Palette.stoneGray, e.fin());
+                Fill.square(e.x + x, e.y + y, e.fout() * 2f + 0.5f, 45);
+                Draw.reset();
+            });
+        });
+        pulverizeRedder = new Effect(40, e -> {
+            Angles.randLenVectors(e.id, 5, 3f + e.fin() * 9f, (x, y) -> {
+                Draw.color(Palette.redderDust, Palette.stoneGray, e.fin());
+                Fill.square(e.x + x, e.y + y, e.fout() * 2.5f + 0.5f, 45);
+                Draw.reset();
+            });
+        });
+        pulverizeSmall = new Effect(30, e -> {
+            Angles.randLenVectors(e.id, 3, e.fin() * 5f, (x, y) -> {
+                Draw.color(Palette.stoneGray);
+                Fill.square(e.x + x, e.y + y, e.fout() * 1f + 0.5f, 45);
+                Draw.reset();
+            });
+        });
+        pulverizeMedium = new Effect(30, e -> {
+            Angles.randLenVectors(e.id, 5, 3f + e.fin() * 8f, (x, y) -> {
+                Draw.color(Palette.stoneGray);
+                Fill.square(e.x + x, e.y + y, e.fout() * 1f + 0.5f, 45);
+                Draw.reset();
+            });
+        });
+        producesmoke = new Effect(12, e -> {
+            Angles.randLenVectors(e.id, 8, 4f + e.fin() * 18f, (x, y) -> {
+                Draw.color(Color.WHITE, Palette.accent, e.fin());
+                Fill.square(e.x + x, e.y + y, 1f + e.fout() * 3f, 45);
+                Draw.reset();
+            });
+        });
+        smeltsmoke = new Effect(15, e -> {
+            Angles.randLenVectors(e.id, 6, 4f + e.fin() * 5f, (x, y) -> {
+                Draw.color(Color.WHITE, e.color, e.fin());
+                Fill.square(e.x + x, e.y + y, 0.5f + e.fout() * 2f, 45);
+                Draw.reset();
+            });
+        });
+        formsmoke = new Effect(40, e -> {
+            Angles.randLenVectors(e.id, 6, 5f + e.fin() * 8f, (x, y) -> {
+                Draw.color(Palette.plasticSmoke, Color.LIGHT_GRAY, e.fin());
+                Fill.square(e.x + x, e.y + y, 0.2f + e.fout() * 2f, 45);
+                Draw.reset();
+            });
+        });
+        blastsmoke = new Effect(26, e -> {
+            Angles.randLenVectors(e.id, 12, 1f + e.fin() * 23f, (x, y) -> {
+                float size = 2f + e.fout() * 6f;
+                Draw.color(Color.LIGHT_GRAY, Color.DARK_GRAY, e.fin());
+                Draw.rect("circle", e.x + x, e.y + y, size, size);
+                Draw.reset();
+            });
+        });
+        lava = new Effect(18, e -> {
+            Angles.randLenVectors(e.id, 3, 1f + e.fin() * 10f, (x, y) -> {
+                float size = e.fslope() * 4f;
+                Draw.color(Color.ORANGE, Color.GRAY, e.fin());
+                Draw.rect("circle", e.x + x, e.y + y, size, size);
+                Draw.reset();
+            });
+        });
+        dooropen = new Effect(10, e -> {
+            Lines.stroke(e.fout() * 1.6f);
+            Lines.square(e.x, e.y, tilesize / 2f + e.fin() * 2f);
+            Draw.reset();
+        });
+        doorclose = new Effect(10, e -> {
+            Lines.stroke(e.fout() * 1.6f);
+            Lines.square(e.x, e.y, tilesize / 2f + e.fout() * 2f);
+            Draw.reset();
+        });
+        dooropenlarge = new Effect(10, e -> {
+            Lines.stroke(e.fout() * 1.6f);
+            Lines.square(e.x, e.y, tilesize + e.fin() * 2f);
+            Draw.reset();
+        });
+        doorcloselarge = new Effect(10, e -> {
+            Lines.stroke(e.fout() * 1.6f);
+            Lines.square(e.x, e.y, tilesize + e.fout() * 2f);
+            Draw.reset();
+        });
+        purify = new Effect(10, e -> {
+            Draw.color(Color.ROYAL, Color.GRAY, e.fin());
+            Lines.stroke(2f);
+            Lines.spikes(e.x, e.y, e.fin() * 4f, 2, 6);
+            Draw.reset();
+        });
+        purifyoil = new Effect(10, e -> {
+            Draw.color(Color.BLACK, Color.GRAY, e.fin());
+            Lines.stroke(2f);
+            Lines.spikes(e.x, e.y, e.fin() * 4f, 2, 6);
+            Draw.reset();
+        });
+        purifystone = new Effect(10, e -> {
+            Draw.color(Color.ORANGE, Color.GRAY, e.fin());
+            Lines.stroke(2f);
+            Lines.spikes(e.x, e.y, e.fin() * 4f, 2, 6);
+            Draw.reset();
+        });
+        generate = new Effect(11, e -> {
+            Draw.color(Color.ORANGE, Color.YELLOW, e.fin());
+            Lines.stroke(1f);
+            Lines.spikes(e.x, e.y, e.fin() * 5f, 2, 8);
+            Draw.reset();
+        });
+        mine = new Effect(20, e -> {
+            Angles.randLenVectors(e.id, 6, 3f + e.fin() * 6f, (x, y) -> {
+                Draw.color(e.color, Color.LIGHT_GRAY, e.fin());
+                Fill.square(e.x + x, e.y + y, e.fout() * 2f, 45);
+                Draw.reset();
+            });
+        });
+        mineBig = new Effect(30, e -> {
+            Angles.randLenVectors(e.id, 6, 4f + e.fin() * 8f, (x, y) -> {
+                Draw.color(e.color, Color.LIGHT_GRAY, e.fin());
+                Fill.square(e.x + x, e.y + y, e.fout() * 2f + 0.2f, 45);
+                Draw.reset();
+            });
+        });
+        mineHuge = new Effect(40, e -> {
+            Angles.randLenVectors(e.id, 8, 5f + e.fin() * 10f, (x, y) -> {
+                Draw.color(e.color, Color.LIGHT_GRAY, e.fin());
+                Fill.square(e.x + x, e.y + y, e.fout() * 2f + 0.5f, 45);
+                Draw.reset();
+            });
+        });
+        smelt = new Effect(20, e -> {
+            Angles.randLenVectors(e.id, 6, 2f + e.fin() * 5f, (x, y) -> {
+                Draw.color(Color.WHITE, e.color, e.fin());
+                Fill.square(e.x + x, e.y + y, 0.5f + e.fout() * 2f, 45);
+                Draw.reset();
+            });
+        });
+        teleportActivate = new Effect(50, e -> {
+            Draw.color(e.color);
+
+            e.scaled(8f, e2 -> {
+                Lines.stroke(e2.fout() * 4f);
+                Lines.circle(e2.x, e2.y, 4f + e2.fin() * 27f);
+            });
+
+            Lines.stroke(e.fout() * 2f);
+
+            Angles.randLenVectors(e.id, 30, 4f + 40f * e.fin(), (x, y) -> {
+                Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fin() * 4f + 1f);
+            });
+
+            Draw.reset();
+        });
+        teleport = new Effect(60, e -> {
+            Draw.color(e.color);
+            Lines.stroke(e.fin() * 2f);
+            Lines.circle(e.x, e.y, 7f + e.fout() * 8f);
+
+            Angles.randLenVectors(e.id, 20, 6f + 20f * e.fout(), (x, y) -> {
+                Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fin() * 4f + 1f);
+            });
+
+            Draw.reset();
+        });
+        teleportOut = new Effect(20, e -> {
+            Draw.color(e.color);
+            Lines.stroke(e.fout() * 2f);
+            Lines.circle(e.x, e.y, 7f + e.fin() * 8f);
+
+            Angles.randLenVectors(e.id, 20, 4f + 20f * e.fin(), (x, y) -> {
+                Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fslope() * 4f + 1f);
+            });
+
+            Draw.reset();
+        });
+        ripple = new GroundEffect(false, 30, e -> {
+            Draw.color(Tmp.c1.set(e.color).shiftValue(0.1f));
+            Lines.stroke(e.fout() + 0.4f);
+            Lines.circle(e.x, e.y, 2f + e.fin() * 4f);
+            Draw.reset();
+        });
+
+        bubble = new Effect(20, e -> {
+            Draw.color(Tmp.c1.set(e.color).shiftValue(0.1f));
+            Lines.stroke(e.fout() + 0.2f);
+            Angles.randLenVectors(e.id, 2, 8f, (x, y) -> {
+                Lines.circle(e.x + x, e.y + y, 1f + e.fin() * 3f);
+            });
+            Draw.reset();
+        });
+
+        commandSend = new Effect(28, e -> {
+            Draw.color(Palette.command);
+            Lines.stroke(e.fout() * 2f);
+            Lines.poly(e.x, e.y, 40, 4f + e.finpow() * 120f);
+            Draw.color();
+        });
+
+        healWaveMend = new Effect(40, e -> {
+            Draw.color(e.color);
+            Lines.stroke(e.fout() * 2f);
+            Lines.poly(e.x, e.y, 30, e.finpow() * e.rotation);
+            Draw.color();
+        });
+
+        overdriveWave = new Effect(50, e -> {
+            Draw.color(e.color);
+            Lines.stroke(e.fout() * 1f);
+            Lines.poly(e.x, e.y, 30, e.finpow() * e.rotation);
+            Draw.color();
+        });
+
+        healBlock = new Effect(20, e -> {
+            Draw.color(Palette.heal);
+            Lines.stroke(2f * e.fout() + 0.5f);
+            Lines.square(e.x, e.y, 1f + (e.fin() * e.rotation * tilesize/2f-1f));
+            Draw.color();
+        });
+
+        healBlockFull = new Effect(20, e -> {
+            Draw.color(e.color);
+            Draw.alpha(e.fout());
+            Fill.square(e.x, e.y, e.rotation * tilesize / 2f);
+            Draw.color();
+        });
+
+        overdriveBlockFull = new Effect(60, e -> {
+            Draw.color(e.color);
+            Draw.alpha(e.fslope() * 0.4f);
+            Fill.square(e.x, e.y, e.rotation * tilesize);
+            Draw.color();
+        });
+
+        shieldBreak = new Effect(40, e -> {
+            Draw.color(Palette.accent);
+            Lines.stroke(3f * e.fout());
+            Lines.poly(e.x, e.y, 6, e.rotation + e.fin(), 90);
+            Draw.reset();
+        });
     }
 }

core/src/io/anuke/mindustry/world/blocks/OreBlock.java

@@ -55,8 +55,7 @@ public class OreBlock extends Floor{
 
     public static Block get(Block floor, Item item){
         if(!oreBlockMap.containsKey(item)) throw new IllegalArgumentException("Item '" + item + "' is not an ore!");
-        if(!oreBlockMap.get(item).containsKey(floor))
-            throw new IllegalArgumentException("Block '" + floor.name + "' does not support ores!");
+        if(!oreBlockMap.get(item).containsKey(floor)) throw new IllegalArgumentException("Block '" + floor.name + "' does not support ores!");
         return oreBlockMap.get(item).get(floor);
     }
 }