From b80129e17b9a8345f6a678658f62165393cdda96 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 6 Aug 2021 11:52:25 -0400 Subject: [PATCH] Improved environmental block internal names --- .../environment/{craters1.png => crater-stone1.png} | Bin .../environment/{craters2.png => crater-stone2.png} | Bin .../environment/{craters3.png => crater-stone3.png} | Bin .../environment/{craters4.png => crater-stone4.png} | Bin .../environment/{craters5.png => crater-stone5.png} | Bin .../environment/{craters6.png => crater-stone6.png} | Bin .../environment/{deepwater.png => deep-water.png} | Bin .../environment/{slag.png => molten-slag.png} | Bin .../environment/{water.png => shallow-water.png} | Bin core/assets/bundles/bundle.properties | 8 ++++---- core/assets/bundles/bundle_be.properties | 8 ++++---- core/assets/bundles/bundle_bg.properties | 8 ++++---- core/assets/bundles/bundle_cs.properties | 8 ++++---- core/assets/bundles/bundle_da.properties | 8 ++++---- core/assets/bundles/bundle_de.properties | 8 ++++---- core/assets/bundles/bundle_es.properties | 8 ++++---- core/assets/bundles/bundle_et.properties | 8 ++++---- core/assets/bundles/bundle_eu.properties | 8 ++++---- core/assets/bundles/bundle_fi.properties | 8 ++++---- core/assets/bundles/bundle_fil.properties | 8 ++++---- core/assets/bundles/bundle_fr.properties | 8 ++++---- core/assets/bundles/bundle_hu.properties | 8 ++++---- core/assets/bundles/bundle_in_ID.properties | 8 ++++---- core/assets/bundles/bundle_it.properties | 8 ++++---- core/assets/bundles/bundle_ja.properties | 8 ++++---- core/assets/bundles/bundle_ko.properties | 8 ++++---- core/assets/bundles/bundle_lt.properties | 8 ++++---- core/assets/bundles/bundle_nl.properties | 8 ++++---- core/assets/bundles/bundle_nl_BE.properties | 8 ++++---- core/assets/bundles/bundle_pl.properties | 8 ++++---- core/assets/bundles/bundle_pt_BR.properties | 8 ++++---- core/assets/bundles/bundle_pt_PT.properties | 8 ++++---- core/assets/bundles/bundle_ro.properties | 8 ++++---- core/assets/bundles/bundle_ru.properties | 8 ++++---- core/assets/bundles/bundle_sv.properties | 8 ++++---- core/assets/bundles/bundle_th.properties | 8 ++++---- core/assets/bundles/bundle_tk.properties | 8 ++++---- core/assets/bundles/bundle_tr.properties | 8 ++++---- core/assets/bundles/bundle_uk_UA.properties | 8 ++++---- core/assets/bundles/bundle_vi.properties | 8 ++++---- core/assets/bundles/bundle_zh_CN.properties | 8 ++++---- core/assets/bundles/bundle_zh_TW.properties | 8 ++++---- core/assets/icons/icons.properties | 4 ++++ core/src/mindustry/content/Blocks.java | 8 ++++---- core/src/mindustry/io/SaveFileReader.java | 6 +++++- 45 files changed, 145 insertions(+), 137 deletions(-) rename core/assets-raw/sprites/blocks/environment/{craters1.png => crater-stone1.png} (100%) rename core/assets-raw/sprites/blocks/environment/{craters2.png => crater-stone2.png} (100%) rename core/assets-raw/sprites/blocks/environment/{craters3.png => crater-stone3.png} (100%) rename core/assets-raw/sprites/blocks/environment/{craters4.png => crater-stone4.png} (100%) rename core/assets-raw/sprites/blocks/environment/{craters5.png => crater-stone5.png} (100%) rename core/assets-raw/sprites/blocks/environment/{craters6.png => crater-stone6.png} (100%) rename core/assets-raw/sprites/blocks/environment/{deepwater.png => deep-water.png} (100%) rename core/assets-raw/sprites/blocks/environment/{slag.png => molten-slag.png} (100%) rename core/assets-raw/sprites/blocks/environment/{water.png => shallow-water.png} (100%) diff --git a/core/assets-raw/sprites/blocks/environment/craters1.png b/core/assets-raw/sprites/blocks/environment/crater-stone1.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/craters1.png rename to core/assets-raw/sprites/blocks/environment/crater-stone1.png diff --git a/core/assets-raw/sprites/blocks/environment/craters2.png b/core/assets-raw/sprites/blocks/environment/crater-stone2.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/craters2.png rename to core/assets-raw/sprites/blocks/environment/crater-stone2.png diff --git a/core/assets-raw/sprites/blocks/environment/craters3.png b/core/assets-raw/sprites/blocks/environment/crater-stone3.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/craters3.png rename to core/assets-raw/sprites/blocks/environment/crater-stone3.png diff --git a/core/assets-raw/sprites/blocks/environment/craters4.png b/core/assets-raw/sprites/blocks/environment/crater-stone4.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/craters4.png rename to core/assets-raw/sprites/blocks/environment/crater-stone4.png diff --git a/core/assets-raw/sprites/blocks/environment/craters5.png b/core/assets-raw/sprites/blocks/environment/crater-stone5.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/craters5.png rename to core/assets-raw/sprites/blocks/environment/crater-stone5.png diff --git a/core/assets-raw/sprites/blocks/environment/craters6.png b/core/assets-raw/sprites/blocks/environment/crater-stone6.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/craters6.png rename to core/assets-raw/sprites/blocks/environment/crater-stone6.png diff --git a/core/assets-raw/sprites/blocks/environment/deepwater.png b/core/assets-raw/sprites/blocks/environment/deep-water.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/deepwater.png rename to core/assets-raw/sprites/blocks/environment/deep-water.png diff --git a/core/assets-raw/sprites/blocks/environment/slag.png b/core/assets-raw/sprites/blocks/environment/molten-slag.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/slag.png rename to core/assets-raw/sprites/blocks/environment/molten-slag.png diff --git a/core/assets-raw/sprites/blocks/environment/water.png b/core/assets-raw/sprites/blocks/environment/shallow-water.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/water.png rename to core/assets-raw/sprites/blocks/environment/shallow-water.png diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 2e6f7813f4..51fbf226db 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1109,7 +1109,7 @@ block.cliff.name = Cliff block.sand-boulder.name = Sand Boulder block.basalt-boulder.name = Basalt Boulder block.grass.name = Grass -block.slag.name = Slag +block.molten-slag.name = Slag block.space.name = Space block.salt.name = Salt block.salt-wall.name = Salt Wall @@ -1140,8 +1140,8 @@ block.spawn.name = Enemy Spawn block.core-shard.name = Core: Shard block.core-foundation.name = Core: Foundation block.core-nucleus.name = Core: Nucleus -block.deepwater.name = Deep Water -block.water.name = Water +block.deep-water.name = Deep Water +block.shallow-water.name = Water block.tainted-water.name = Tainted Water block.darksand-tainted-water.name = Dark Sand Tainted Water block.tar.name = Tar @@ -1150,7 +1150,7 @@ block.sand.name = Sand block.darksand.name = Dark Sand block.ice.name = Ice block.snow.name = Snow -block.craters.name = Craters +block.stone-craters.name = Craters block.sand-water.name = Sand Water block.darksand-water.name = Dark Sand Water block.char.name = Char diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties index 59d125147c..7d88d0d0db 100644 --- a/core/assets/bundles/bundle_be.properties +++ b/core/assets/bundles/bundle_be.properties @@ -960,7 +960,7 @@ block.parallax.name = Парралакс block.cliff.name = Скала block.sand-boulder.name = Пяшчаны валун block.grass.name = Трава -block.slag.name = Шлак +block.molten-slag.name = Шлак block.space.name = Space block.salt.name = Соль block.salt-wall.name = Саляная сцяна @@ -991,8 +991,8 @@ block.spawn.name = Кропка з’яўлення ворагаў block.core-shard.name = Ядро: «Аскепак» block.core-foundation.name = Ядро: «Штаб» block.core-nucleus.name = Ядро: «Атам» -block.deepwater.name = Глубокаводдзе -block.water.name = Вада +block.deep-water.name = Глубокаводдзе +block.shallow-water.name = Вада block.tainted-water.name = Забруджанная вада block.darksand-tainted-water.name = Тёмный пясок з забруджанай вадой block.tar.name = Нафта @@ -1001,7 +1001,7 @@ block.sand.name = Пясок block.darksand.name = Тёмны пясок block.ice.name = Лёд block.snow.name = Снег -block.craters.name = Кратэры +block.stone-craters.name = Кратэры block.sand-water.name = Пясок з вадой block.darksand-water.name = Тёмный пясок з вадой block.char.name = Выпаленая зямля diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties index 42489f046f..37650b0b56 100644 --- a/core/assets/bundles/bundle_bg.properties +++ b/core/assets/bundles/bundle_bg.properties @@ -1074,7 +1074,7 @@ block.cliff.name = Скала block.sand-boulder.name = Пясъчен Камък block.basalt-boulder.name = Базалтов Камък block.grass.name = Трева -block.slag.name = Шлака +block.molten-slag.name = Шлака block.space.name = Космос block.salt.name = Сол block.salt-wall.name = Стена от Сол @@ -1105,8 +1105,8 @@ block.spawn.name = Вражеска Начална Точка block.core-shard.name = Ядро: Шард block.core-foundation.name = Core: Фондация block.core-nucleus.name = Core: Център -block.deepwater.name = Дълбока Вода -block.water.name = Вода +block.deep-water.name = Дълбока Вода +block.shallow-water.name = Вода block.tainted-water.name = Замърсена Вода block.darksand-tainted-water.name = Тъмен Пясък - Замърсена Вода block.tar.name = Катран @@ -1115,7 +1115,7 @@ block.sand.name = Пясък block.darksand.name = Тъмен Пясък block.ice.name = Лед block.snow.name = Сняг -block.craters.name = Кратери +block.stone-craters.name = Кратери block.sand-water.name = Пясък - Вода block.darksand-water.name = Тъмен Пясък - Вода block.char.name = Овъглен Камък diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index aad326105f..547a068c68 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -1023,7 +1023,7 @@ block.cliff.name = Útes block.sand-boulder.name = Pískovec block.basalt-boulder.name = Čedičový balvan block.grass.name = Tráva -block.slag.name = Struska +block.molten-slag.name = Struska block.space.name = Vesmír block.salt.name = Sůl block.salt-wall.name = Solné skály @@ -1054,8 +1054,8 @@ block.spawn.name = Nepřátelská líheň block.core-shard.name = Jádro: Odštěpek block.core-foundation.name = Jádro: Základ block.core-nucleus.name = Jádro: Atom -block.deepwater.name = Hluboká voda -block.water.name = Voda +block.deep-water.name = Hluboká voda +block.shallow-water.name = Voda block.tainted-water.name = Zamořená voda block.darksand-tainted-water.name = Zamořená voda s černým pískem block.tar.name = Dehet @@ -1064,7 +1064,7 @@ block.sand.name = Písek block.darksand.name = Černý písek block.ice.name = Led block.snow.name = Sníh -block.craters.name = Krátery +block.stone-craters.name = Krátery block.sand-water.name = Voda s pískem block.darksand-water.name = Voda s černým pískem block.char.name = Dřevěné uhlí diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties index d7937f0154..00faecd003 100644 --- a/core/assets/bundles/bundle_da.properties +++ b/core/assets/bundles/bundle_da.properties @@ -960,7 +960,7 @@ block.parallax.name = Parallax block.cliff.name = Klippe block.sand-boulder.name = Sandkampesten block.grass.name = Græs -block.slag.name = Ildgrød +block.molten-slag.name = Ildgrød block.space.name = Rum block.salt.name = Salt block.salt-wall.name = Saltvæg @@ -991,8 +991,8 @@ block.spawn.name = Fjendtligt Ankomstpunkt block.core-shard.name = Kerne: Skår block.core-foundation.name = Kerne: Fundament block.core-nucleus.name = Kerne: Nukleus -block.deepwater.name = Dybt Vand -block.water.name = Vand +block.deep-water.name = Dybt Vand +block.shallow-water.name = Vand block.tainted-water.name = Moget Vand block.darksand-tainted-water.name = Mørkt Sand Moget Vand block.tar.name = Tjærre @@ -1001,7 +1001,7 @@ block.sand.name = Sand block.darksand.name = Mørkt Sand block.ice.name = Is block.snow.name = Sne -block.craters.name = Kratere +block.stone-craters.name = Kratere block.sand-water.name = Sandet Lavvande block.darksand-water.name = Mørkt Sandet Lavvande block.char.name = Trækul diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 6c2e66c459..0f99a93990 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -1107,7 +1107,7 @@ block.cliff.name = Klippe block.sand-boulder.name = Sandbrocken block.basalt-boulder.name = Basaltbrocken block.grass.name = Gras -block.slag.name = Schlacke +block.molten-slag.name = Schlacke block.space.name = Weltall block.salt.name = Salz block.salt-wall.name = Salzwand @@ -1138,8 +1138,8 @@ block.spawn.name = Gegnerischer Startpunkt block.core-shard.name = Kern: Scherbe block.core-foundation.name = Kern: Fundament block.core-nucleus.name = Kern: Nukleus -block.deepwater.name = Tiefes Wasser -block.water.name = Wasser +block.deep-water.name = Tiefes Wasser +block.shallow-water.name = Wasser block.tainted-water.name = Dreckiges Wasser block.darksand-tainted-water.name = Dreckiges Wasser (Dunkler Sand) block.tar.name = Teer @@ -1148,7 +1148,7 @@ block.sand.name = Sand block.darksand.name = Dunkler Sand block.ice.name = Eis block.snow.name = Schnee -block.craters.name = Krater +block.stone-craters.name = Krater block.sand-water.name = Sandiges Wasser block.darksand-water.name = Dunkles sandiges Wasser block.char.name = Holzkohle diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 8701bc0531..961bce09f4 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -1103,7 +1103,7 @@ block.cliff.name = Pared block.sand-boulder.name = Roca de arena block.basalt-boulder.name = Roca de basalto block.grass.name = Hierba -block.slag.name = Magma +block.molten-slag.name = Magma block.space.name = Espacio block.salt.name = Sal block.salt-wall.name = Muro de sal @@ -1134,8 +1134,8 @@ block.spawn.name = Punto de generación block.core-shard.name = Núcleo: Shard block.core-foundation.name = Núcleo: Foundation block.core-nucleus.name = Núcleo: Nucleus -block.deepwater.name = Aguas profundas -block.water.name = Agua +block.deep-water.name = Aguas profundas +block.shallow-water.name = Agua block.tainted-water.name = Agua contaminada block.darksand-tainted-water.name = Agua contaminada con arena oscura block.tar.name = Alquitrán @@ -1144,7 +1144,7 @@ block.sand.name = Arena block.darksand.name = Arena oscura block.ice.name = Hielo block.snow.name = Nieve -block.craters.name = Cráter +block.stone-craters.name = Cráter block.sand-water.name = Agua con arena block.darksand-water.name = Agua con arena oscura block.char.name = Cenizas diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties index 46cf235d26..61f7ba36d6 100644 --- a/core/assets/bundles/bundle_et.properties +++ b/core/assets/bundles/bundle_et.properties @@ -960,7 +960,7 @@ block.parallax.name = Parallax block.cliff.name = Cliff block.sand-boulder.name = Liivakamakas block.grass.name = Rohi -block.slag.name = Slag +block.molten-slag.name = Slag block.space.name = Space block.salt.name = Sool block.salt-wall.name = Salt Wall @@ -991,8 +991,8 @@ block.spawn.name = Vaenlaste maandumisala block.core-shard.name = Tuumik: Osake block.core-foundation.name = Tuumik: Arenenud block.core-nucleus.name = Tuumik: Täielik -block.deepwater.name = Sügav vesi -block.water.name = Vesi +block.deep-water.name = Sügav vesi +block.shallow-water.name = Vesi block.tainted-water.name = Riknenud vesi block.darksand-tainted-water.name = Riknenud vesi tumedal liival block.tar.name = Tõrv @@ -1001,7 +1001,7 @@ block.sand.name = Liiv block.darksand.name = Tume liiv block.ice.name = Jää block.snow.name = Lumi -block.craters.name = Kraatrid +block.stone-craters.name = Kraatrid block.sand-water.name = Vesi liival block.darksand-water.name = Vesi tumedal liival block.char.name = Puusüsi diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties index 537d0b3133..bc43060854 100644 --- a/core/assets/bundles/bundle_eu.properties +++ b/core/assets/bundles/bundle_eu.properties @@ -960,7 +960,7 @@ block.parallax.name = Parallax block.cliff.name = Cliff block.sand-boulder.name = Hondar harkaitza block.grass.name = Belarra -block.slag.name = Slag +block.molten-slag.name = Slag block.space.name = Space block.salt.name = Gatza block.salt-wall.name = Salt Wall @@ -991,8 +991,8 @@ block.spawn.name = Etsai-sorrera block.core-shard.name = Muina: Maskorra block.core-foundation.name = Muina: Fundazioa block.core-nucleus.name = Muina: Nukleoa -block.deepwater.name = Ur sakona -block.water.name = Ura +block.deep-water.name = Ur sakona +block.shallow-water.name = Ura block.tainted-water.name = Ur kutsatua block.darksand-tainted-water.name = Hondar ilunez kutsatutako ura block.tar.name = Mundruna @@ -1001,7 +1001,7 @@ block.sand.name = Hondarra block.darksand.name = Hondar iluna block.ice.name = Izotza block.snow.name = Elurra -block.craters.name = Kraterrak +block.stone-craters.name = Kraterrak block.sand-water.name = Hondar ura block.darksand-water.name = Hondar ilun ura block.char.name = Kokea diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties index d2a998db77..da3f1075f9 100644 --- a/core/assets/bundles/bundle_fi.properties +++ b/core/assets/bundles/bundle_fi.properties @@ -960,7 +960,7 @@ block.parallax.name = Parallax block.cliff.name = Vuoren block.sand-boulder.name = Hiekkalohkare block.grass.name = Ruoho -block.slag.name = Kuono +block.molten-slag.name = Kuono block.space.name = Space block.salt.name = Suolapitoisuus block.salt-wall.name = Salt Wall @@ -991,8 +991,8 @@ block.spawn.name = Vihollisten syntymispiste block.core-shard.name = Ydin: Siru block.core-foundation.name = Ydin: Pohjaus block.core-nucleus.name = Ydin: Tuma -block.deepwater.name = Syvää vettä -block.water.name = Vettä +block.deep-water.name = Syvää vettä +block.shallow-water.name = Vettä block.tainted-water.name = Saastevettä block.darksand-tainted-water.name = Dark Sand Tainted Water block.tar.name = Terva @@ -1001,7 +1001,7 @@ block.sand.name = Hiekka block.darksand.name = Tumma hiekka block.ice.name = Jää block.snow.name = Lumi -block.craters.name = Kraatterit +block.stone-craters.name = Kraatterit block.sand-water.name = Sand water block.darksand-water.name = Dark Sand Water block.char.name = Char diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties index c5663baa1d..db99a05c9c 100644 --- a/core/assets/bundles/bundle_fil.properties +++ b/core/assets/bundles/bundle_fil.properties @@ -960,7 +960,7 @@ block.parallax.name = Parallax block.cliff.name = Cliff block.sand-boulder.name = Sand Boulder block.grass.name = Grass -block.slag.name = Slag +block.molten-slag.name = Slag block.space.name = Space block.salt.name = Salt block.salt-wall.name = Salt Wall @@ -991,8 +991,8 @@ block.spawn.name = Enemy Spawn block.core-shard.name = Core: Shard block.core-foundation.name = Core: Foundation block.core-nucleus.name = Core: Nucleus -block.deepwater.name = Deep Water -block.water.name = Water +block.deep-water.name = Deep Water +block.shallow-water.name = Water block.tainted-water.name = Tainted Water block.darksand-tainted-water.name = Dark Sand Tainted Water block.tar.name = Tar @@ -1001,7 +1001,7 @@ block.sand.name = Sand block.darksand.name = Dark Sand block.ice.name = Ice block.snow.name = Snow -block.craters.name = Craters +block.stone-craters.name = Craters block.sand-water.name = Sand water block.darksand-water.name = Dark Sand Water block.char.name = Char diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index 4f75f0d673..5bee2d80d3 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -1117,7 +1117,7 @@ block.cliff.name = Falaise block.sand-boulder.name = Bloc de Sable block.basalt-boulder.name = Rocher de Basalte block.grass.name = Herbe -block.slag.name = Scories +block.molten-slag.name = Scories block.space.name = Espace block.salt.name = Sel block.salt-wall.name = Mur de Sel @@ -1148,8 +1148,8 @@ block.spawn.name = Point d'Apparition Ennemi block.core-shard.name = Noyau: Fragment block.core-foundation.name = Noyau: Fondation block.core-nucleus.name = Noyau: Épicentre -block.deepwater.name = Eau profonde -block.water.name = Eau +block.deep-water.name = Eau profonde +block.shallow-water.name = Eau block.tainted-water.name = Eau Contaminée block.darksand-tainted-water.name = Eau Contaminée avec fond de Sable sombre block.tar.name = Goudron @@ -1158,7 +1158,7 @@ block.sand.name = Sable block.darksand.name = Sable sombre block.ice.name = Glace block.snow.name = Neige -block.craters.name = Cratères +block.stone-craters.name = Cratères block.sand-water.name = Eau avec fond de Sable block.darksand-water.name = Eau avec fond de Sable sombre block.char.name = Cendres diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties index 47734eb072..9d60e88be3 100644 --- a/core/assets/bundles/bundle_hu.properties +++ b/core/assets/bundles/bundle_hu.properties @@ -1044,7 +1044,7 @@ block.cliff.name = Cliff block.sand-boulder.name = Sand Boulder block.basalt-boulder.name = Basalt Boulder block.grass.name = Grass -block.slag.name = Slag +block.molten-slag.name = Slag block.space.name = Space block.salt.name = Salt block.salt-wall.name = Salt Wall @@ -1075,8 +1075,8 @@ block.spawn.name = Enemy Spawn block.core-shard.name = Core: Shard block.core-foundation.name = Core: Foundation block.core-nucleus.name = Core: Nucleus -block.deepwater.name = Deep Water -block.water.name = Water +block.deep-water.name = Deep Water +block.shallow-water.name = Water block.tainted-water.name = Tainted Water block.darksand-tainted-water.name = Dark Sand Tainted Water block.tar.name = Tar @@ -1085,7 +1085,7 @@ block.sand.name = Sand block.darksand.name = Dark Sand block.ice.name = Ice block.snow.name = Snow -block.craters.name = Craters +block.stone-craters.name = Craters block.sand-water.name = Sand water block.darksand-water.name = Dark Sand Water block.char.name = Char diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index c78204530d..d67c0ad2c6 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -1102,7 +1102,7 @@ block.cliff.name = Cliff block.sand-boulder.name = Batu Pasir Besar block.basalt-boulder.name = Batu Basal Besar block.grass.name = Rumput -block.slag.name = Lahar +block.molten-slag.name = Lahar block.space.name = Luar Angkasa block.salt.name = Garam block.salt-wall.name = Bukit Garam @@ -1133,8 +1133,8 @@ block.spawn.name = Muncul Musuh block.core-shard.name = Inti: Bagian block.core-foundation.name = Inti: Pondasi block.core-nucleus.name = Inti: Nukleus -block.deepwater.name = Air Dalam -block.water.name = Air +block.deep-water.name = Air Dalam +block.shallow-water.name = Air block.tainted-water.name = Air Ternoda block.darksand-tainted-water.name = Air Ternodai Pasir Hitam block.tar.name = Minyak Mentah @@ -1143,7 +1143,7 @@ block.sand.name = Pasir block.darksand.name = Pasir Hitam block.ice.name = Es block.snow.name = Salju -block.craters.name = Kawah +block.stone-craters.name = Kawah block.sand-water.name = Air Pasir block.darksand-water.name = Air Pasir Hitam block.char.name = Bara diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties index dd1d40f0f7..49cc18e758 100644 --- a/core/assets/bundles/bundle_it.properties +++ b/core/assets/bundles/bundle_it.properties @@ -1024,7 +1024,7 @@ block.cliff.name = Scogliera block.sand-boulder.name = Masso di Sabbia block.basalt-boulder.name = Masso di Basalto block.grass.name = Erba -block.slag.name = Scoria +block.molten-slag.name = Scoria block.space.name = Spazio block.salt.name = Sale block.salt-wall.name = Muro di Sale @@ -1055,8 +1055,8 @@ block.spawn.name = Punto di Generazione Nemico block.core-shard.name = Nucleo: Frammento block.core-foundation.name = Nucleo: Fondamento block.core-nucleus.name = Nucleo: Kernel -block.deepwater.name = Acqua Profonda -block.water.name = Acqua +block.deep-water.name = Acqua Profonda +block.shallow-water.name = Acqua block.tainted-water.name = Acqua Contaminata block.darksand-tainted-water.name = Acqua Contaminata Scura block.tar.name = Catrame @@ -1065,7 +1065,7 @@ block.sand.name = Sabbia block.darksand.name = Sabbia Scura block.ice.name = Ghiaccio block.snow.name = Neve -block.craters.name = Crateri +block.stone-craters.name = Crateri block.sand-water.name = Acqua Sabbiosa block.darksand-water.name = Acqua Sabbiosa Scura block.char.name = Carbone diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index df0475b176..fad527ac75 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -1037,7 +1037,7 @@ block.cliff.name = 崖 block.sand-boulder.name = 巨大な礫 block.basalt-boulder.name = 玄武岩の礫 block.grass.name = 草 -block.slag.name = スラグ +block.molten-slag.name = スラグ block.space.name = Space block.salt.name = 岩塩氷河 block.salt-wall.name = 塩の壁 @@ -1068,8 +1068,8 @@ block.spawn.name = 敵の出現場所 block.core-shard.name = コア: シャード block.core-foundation.name = コア: ファンデーション block.core-nucleus.name = コア: ニュークリアス -block.deepwater.name = 深層水 -block.water.name = 水 +block.deep-water.name = 深層水 +block.shallow-water.name = 水 block.tainted-water.name = 汚れた水 block.darksand-tainted-water.name = 黒い砂で汚れた水 block.tar.name = タール @@ -1078,7 +1078,7 @@ block.sand.name = 砂 block.darksand.name = 黒い砂 block.ice.name = 氷 block.snow.name = 雪 -block.craters.name = クレーター +block.stone-craters.name = クレーター block.sand-water.name = 濁った水 block.darksand-water.name = 黒い砂で濁った水 block.char.name = 焦げ跡 diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index 27ec3beb4c..e1f92d697b 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -1106,7 +1106,7 @@ block.cliff.name = 언덕 block.sand-boulder.name = 사암 바위 block.basalt-boulder.name = 현무암 바위 block.grass.name = 잔디 -block.slag.name = 용암 +block.molten-slag.name = 용암 block.space.name = 우주 block.salt.name = 소금 block.salt-wall.name = 소금 벽 @@ -1137,8 +1137,8 @@ block.spawn.name = 적 소환지점 block.core-shard.name = 코어: 조각 block.core-foundation.name = 코어: 기반 block.core-nucleus.name = 코어: 핵심 -block.deepwater.name = 깊은 물 -block.water.name = 물 +block.deep-water.name = 깊은 물 +block.shallow-water.name = 물 block.tainted-water.name = 오염된 물 block.darksand-tainted-water.name = 오염된 젖은 검은 모래 block.tar.name = 타르 @@ -1147,7 +1147,7 @@ block.sand.name = 모래 block.darksand.name = 검은 모래 block.ice.name = 얼음 block.snow.name = 눈 -block.craters.name = 구덩이 +block.stone-craters.name = 구덩이 block.sand-water.name = 젖은 모래 block.darksand-water.name = 젖은 검은 모래 block.char.name = 숯 diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties index 0a8290e544..a7bb0f5808 100644 --- a/core/assets/bundles/bundle_lt.properties +++ b/core/assets/bundles/bundle_lt.properties @@ -960,7 +960,7 @@ block.parallax.name = Parallax block.cliff.name = Cliff block.sand-boulder.name = Smėlio Riedulys block.grass.name = Žolė -block.slag.name = Slag +block.molten-slag.name = Slag block.space.name = Space block.salt.name = Druska block.salt-wall.name = Salt Wall @@ -991,8 +991,8 @@ block.spawn.name = Priešų Atsiradimo Zona block.core-shard.name = Branduolys: Šerdis block.core-foundation.name = Branduolys: Pagrindas block.core-nucleus.name = Branduolys: Centras -block.deepwater.name = Gilus Vanduo -block.water.name = Vanduo +block.deep-water.name = Gilus Vanduo +block.shallow-water.name = Vanduo block.tainted-water.name = Užterštas Vanduo block.darksand-tainted-water.name = Tamsaus Smėlio Užterštas Vanduo block.tar.name = Derva @@ -1001,7 +1001,7 @@ block.sand.name = Smėlis block.darksand.name = Tamsus Smėlis block.ice.name = Ledas block.snow.name = Sniegas -block.craters.name = Krateriai +block.stone-craters.name = Krateriai block.sand-water.name = Smėlio vanduo block.darksand-water.name = Tamsaus Smėlio Vanduo block.char.name = Char diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties index 6523ead319..8559cb7185 100644 --- a/core/assets/bundles/bundle_nl.properties +++ b/core/assets/bundles/bundle_nl.properties @@ -960,7 +960,7 @@ block.parallax.name = Parallax block.cliff.name = Cliff block.sand-boulder.name = Zandkei block.grass.name = Gras -block.slag.name = Slag +block.molten-slag.name = Slag block.space.name = Space block.salt.name = Zout block.salt-wall.name = Salt Wall @@ -991,8 +991,8 @@ block.spawn.name = Vijandelijke Spawn block.core-shard.name = Core: Shard block.core-foundation.name = Core: Foundation block.core-nucleus.name = Core: Nucleus -block.deepwater.name = Diep Water -block.water.name = Water +block.deep-water.name = Diep Water +block.shallow-water.name = Water block.tainted-water.name = Vervuild Water block.darksand-tainted-water.name = Donker Zand Vervuild Water block.tar.name = Olie @@ -1001,7 +1001,7 @@ block.sand.name = Donker Zand block.darksand.name = Donker Zand block.ice.name = Ijs block.snow.name = Sneeuw -block.craters.name = Krarters +block.stone-craters.name = Krarters block.sand-water.name = Zand water block.darksand-water.name = Donker Zand Water block.char.name = Char diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties index 2f6d94840c..4fb7a210e4 100644 --- a/core/assets/bundles/bundle_nl_BE.properties +++ b/core/assets/bundles/bundle_nl_BE.properties @@ -960,7 +960,7 @@ block.parallax.name = Parallax block.cliff.name = Cliff block.sand-boulder.name = Sand Boulder block.grass.name = Grass -block.slag.name = Slag +block.molten-slag.name = Slag block.space.name = Space block.salt.name = Salt block.salt-wall.name = Salt Wall @@ -991,8 +991,8 @@ block.spawn.name = Enemy Spawn block.core-shard.name = Core: Shard block.core-foundation.name = Core: Foundation block.core-nucleus.name = Core: Nucleus -block.deepwater.name = Deep Water -block.water.name = Water +block.deep-water.name = Deep Water +block.shallow-water.name = Water block.tainted-water.name = Tainted Water block.darksand-tainted-water.name = Dark Sand Tainted Water block.tar.name = Tar @@ -1001,7 +1001,7 @@ block.sand.name = Sand block.darksand.name = Dark Sand block.ice.name = Ice block.snow.name = Snow -block.craters.name = Craters +block.stone-craters.name = Craters block.sand-water.name = Sand water block.darksand-water.name = Dark Sand Water block.char.name = Char diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index b1c464655d..1dc7305538 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -1090,7 +1090,7 @@ block.cliff.name = Klif block.sand-boulder.name = Piaskowy Głaz block.basalt-boulder.name = Bazaltowy Głaz block.grass.name = Trawa -block.slag.name = Żużel +block.molten-slag.name = Żużel block.space.name = Kosmos block.salt.name = Sól block.salt-wall.name = Ściana Solna @@ -1121,8 +1121,8 @@ block.spawn.name = Spawn wrogów block.core-shard.name = Rdzeń: Odłamek block.core-foundation.name = Rdzeń: Podstawa block.core-nucleus.name = Rdzeń: Jądro -block.deepwater.name = Głęboka Woda -block.water.name = Woda +block.deep-water.name = Głęboka Woda +block.shallow-water.name = Woda block.tainted-water.name = Skażona Woda block.darksand-tainted-water.name = Skażona Woda z Ciemnym Piaskiem block.tar.name = Smoła @@ -1131,7 +1131,7 @@ block.sand.name = Piasek block.darksand.name = Czarny piasek block.ice.name = Lód block.snow.name = Śnieg -block.craters.name = Kratery +block.stone-craters.name = Kratery block.sand-water.name = Woda z Piaskiem block.darksand-water.name = Woda z Ciemnym Piaskiem block.char.name = Popiół diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index 20818e5d05..4d9b6fc370 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -1073,7 +1073,7 @@ block.parallax.name = Paralaxe block.cliff.name = Relevo block.sand-boulder.name = Pedregulho de areia block.grass.name = Grama -block.slag.name = Escória +block.molten-slag.name = Escória block.space.name = Space block.salt.name = Sal block.salt-wall.name = Parede de sal @@ -1104,8 +1104,8 @@ block.spawn.name = Área inimiga block.core-shard.name = Fragmento do núcleo block.core-foundation.name = Fundação do núcleo block.core-nucleus.name = Centro do núcleo -block.deepwater.name = Água profunda -block.water.name = Água +block.deep-water.name = Água profunda +block.shallow-water.name = Água block.tainted-water.name = Água tinta block.darksand-tainted-water.name = Água tinta sobre areia escura block.tar.name = Piche @@ -1114,7 +1114,7 @@ block.sand.name = Areia block.darksand.name = Areia escura block.ice.name = Gelo block.snow.name = Neve -block.craters.name = Crateras +block.stone-craters.name = Crateras block.sand-water.name = Água sobre areia block.darksand-water.name = Água sobre areia escura block.char.name = Cinzas diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties index 6e08cc7d3f..a0b0605696 100644 --- a/core/assets/bundles/bundle_pt_PT.properties +++ b/core/assets/bundles/bundle_pt_PT.properties @@ -960,7 +960,7 @@ block.parallax.name = Parallax block.cliff.name = Cliff block.sand-boulder.name = Pedregulho de areia block.grass.name = Grama -block.slag.name = Slag +block.molten-slag.name = Slag block.space.name = Space block.salt.name = Sal block.salt-wall.name = Salt Wall @@ -991,8 +991,8 @@ block.spawn.name = Spawn dos inimigos block.core-shard.name = Fragmento do núcleo block.core-foundation.name = Fundação do núcleo block.core-nucleus.name = Núcleo do núcleo -block.deepwater.name = Água profunda -block.water.name = Água +block.deep-water.name = Água profunda +block.shallow-water.name = Água block.tainted-water.name = Água contaminada block.darksand-tainted-water.name = Água contaminada sobre areia escura block.tar.name = Piche @@ -1001,7 +1001,7 @@ block.sand.name = Areia block.darksand.name = Areia escura block.ice.name = Gelo block.snow.name = Neve -block.craters.name = Crateras +block.stone-craters.name = Crateras block.sand-water.name = Água sobre areia block.darksand-water.name = Água sobre areia escura block.char.name = Char diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index 3dd9d388b0..8be6870cb5 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -1107,7 +1107,7 @@ block.cliff.name = Deal block.sand-boulder.name = Bolovan de Nisip block.grass.name = Iarbă block.basalt-boulder.name = Bolovan de Bazalt -block.slag.name = Zgură +block.molten-slag.name = Zgură block.space.name = Cosmos block.salt.name = Sare block.salt-wall.name = Perete de Sare @@ -1138,8 +1138,8 @@ block.spawn.name = Punctul de Lansare Inamic block.core-shard.name = Nucleu: Shard block.core-foundation.name = Nucleu: Foundation block.core-nucleus.name = Nucleu: Core -block.deepwater.name = Apă Adâncă -block.water.name = Apă +block.deep-water.name = Apă Adâncă +block.shallow-water.name = Apă block.tainted-water.name = Apă Tulbure block.darksand-tainted-water.name = Apă Tulbure cu Nisip Negru block.tar.name = Păcură @@ -1148,7 +1148,7 @@ block.sand.name = Nisip block.darksand.name = Nisip Negru block.ice.name = Gheață block.snow.name = Zăpadă -block.craters.name = Cratere +block.stone-craters.name = Cratere block.sand-water.name = Apă cu Nisip block.darksand-water.name = Apă cu Nisip Negru block.char.name = Turbă diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 25cfa5d9da..c9035e8e59 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -1102,7 +1102,7 @@ block.cliff.name = Скала block.sand-boulder.name = Песчаный валун block.basalt-boulder.name = Базальтовый валун block.grass.name = Трава -block.slag.name = Шлак +block.molten-slag.name = Шлак block.space.name = Космос block.salt.name = Соль block.salt-wall.name = Соляная стена @@ -1133,8 +1133,8 @@ block.spawn.name = Точка появления врагов block.core-shard.name = Ядро: «Осколок» block.core-foundation.name = Ядро: «Штаб» block.core-nucleus.name = Ядро: «Атом» -block.deepwater.name = Глубоководье -block.water.name = Вода +block.deep-water.name = Глубоководье +block.shallow-water.name = Вода block.tainted-water.name = Загрязнённая вода block.darksand-tainted-water.name = Тёмный песок с загрязнённой водой block.tar.name = Нефть @@ -1143,7 +1143,7 @@ block.sand.name = Песок block.darksand.name = Тёмный песок block.ice.name = Лёд block.snow.name = Снег -block.craters.name = Кратеры +block.stone-craters.name = Кратеры block.sand-water.name = Песок с водой block.darksand-water.name = Тёмный песок с водой block.char.name = Выжженная земля diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties index 12c3e84a7b..45b6ac8978 100644 --- a/core/assets/bundles/bundle_sv.properties +++ b/core/assets/bundles/bundle_sv.properties @@ -960,7 +960,7 @@ block.parallax.name = Parallax block.cliff.name = Cliff block.sand-boulder.name = Sandbumling block.grass.name = Gräs -block.slag.name = Slag +block.molten-slag.name = Slag block.space.name = Space block.salt.name = Salt block.salt-wall.name = Salt Wall @@ -991,8 +991,8 @@ block.spawn.name = Enemy Spawn block.core-shard.name = Core: Shard block.core-foundation.name = Core: Foundation block.core-nucleus.name = Core: Nucleus -block.deepwater.name = Djupt Vatten -block.water.name = Vatten +block.deep-water.name = Djupt Vatten +block.shallow-water.name = Vatten block.tainted-water.name = Tainted Water block.darksand-tainted-water.name = Dark Sand Tainted Water block.tar.name = Tjära @@ -1001,7 +1001,7 @@ block.sand.name = Sand block.darksand.name = Mörk Sand block.ice.name = Is block.snow.name = Snö -block.craters.name = Kratrar +block.stone-craters.name = Kratrar block.sand-water.name = Sandvatten block.darksand-water.name = Mörksandvatten block.char.name = Char diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties index ff7832ad63..6820bd2f71 100644 --- a/core/assets/bundles/bundle_th.properties +++ b/core/assets/bundles/bundle_th.properties @@ -1108,7 +1108,7 @@ block.cliff.name = หน้าผา block.sand-boulder.name = ก้อนหินทราย block.basalt-boulder.name = ก้อนบะซอลต์ block.grass.name = หญ้า -block.slag.name = แร่หลอม +block.molten-slag.name = แร่หลอม block.space.name = อวกาศ block.salt.name = เกลือ block.salt-wall.name = กำแพงเกลือ @@ -1139,8 +1139,8 @@ block.spawn.name = จุดเกิดศัตรู block.core-shard.name = แกนกลาง: ชาร์ด block.core-foundation.name = แกนกลาง: ฟาวน์เดชั่น block.core-nucleus.name = แกนกลาง: นิวเคลียส -block.deepwater.name = น้ำลึก -block.water.name = น้ำ +block.deep-water.name = น้ำลึก +block.shallow-water.name = น้ำ block.tainted-water.name = น้ำเสีย block.darksand-tainted-water.name = น้ำเสียบนทรายดำ block.tar.name = น้ำมันดิบ @@ -1149,7 +1149,7 @@ block.sand.name = ทราย block.darksand.name = ทรายดำ block.ice.name = น้ำแข็ง block.snow.name = หิมะ -block.craters.name = หลุมอุกกาบาต +block.stone-craters.name = หลุมอุกกาบาต block.sand-water.name = น้ำบนทราย block.darksand-water.name = น้ำบนทรายดำ block.char.name = ถ่าน diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties index 8b9f3a97aa..b91132cc5d 100644 --- a/core/assets/bundles/bundle_tk.properties +++ b/core/assets/bundles/bundle_tk.properties @@ -960,7 +960,7 @@ block.parallax.name = Parallax block.cliff.name = Cliff block.sand-boulder.name = Sand Boulder block.grass.name = Grass -block.slag.name = Slag +block.molten-slag.name = Slag block.space.name = Space block.salt.name = Salt block.salt-wall.name = Salt Wall @@ -991,8 +991,8 @@ block.spawn.name = Enemy Spawn block.core-shard.name = Core: Shard block.core-foundation.name = Core: Foundation block.core-nucleus.name = Core: Nucleus -block.deepwater.name = su alti -block.water.name = su +block.deep-water.name = su alti +block.shallow-water.name = su block.tainted-water.name = Tainted Water block.darksand-tainted-water.name = Dark Sand Tainted Water block.tar.name = Tar @@ -1001,7 +1001,7 @@ block.sand.name = kum block.darksand.name = Dark Sand block.ice.name = buz block.snow.name = kar -block.craters.name = Craters +block.stone-craters.name = Craters block.sand-water.name = Sand water block.darksand-water.name = Dark Sand Water block.char.name = Char diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties index 9ed3cf52b6..99758d683d 100644 --- a/core/assets/bundles/bundle_tr.properties +++ b/core/assets/bundles/bundle_tr.properties @@ -1108,7 +1108,7 @@ block.cliff.name = Uçurum block.sand-boulder.name = Kumlu Kaya Parçaları block.basalt-boulder.name = Bazalt Kaya block.grass.name = Çimen -block.slag.name = Cüruf +block.molten-slag.name = Cüruf block.space.name = Uzay block.salt.name = Tuz block.salt-wall.name = Tuz Duvar @@ -1139,8 +1139,8 @@ block.spawn.name = Düşman Doğma Noktası block.core-shard.name = Merkez: Parçacık block.core-foundation.name = Merkez: Temel block.core-nucleus.name = Merkez: Çekirdek -block.deepwater.name = Derin Su -block.water.name = Su +block.deep-water.name = Derin Su +block.shallow-water.name = Su block.tainted-water.name = Kirli Su block.darksand-tainted-water.name = Kara Kumlu Kirli Su block.tar.name = Katran @@ -1149,7 +1149,7 @@ block.sand.name = Kum block.darksand.name = Kara Kum block.ice.name = Buz block.snow.name = Kar -block.craters.name = Krater +block.stone-craters.name = Krater block.sand-water.name = Kumlu Su block.darksand-water.name = Kara Kumlu Su block.char.name = Kömür diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index 915c29534e..a41cafc7d5 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -1061,7 +1061,7 @@ block.cliff.name = Скеля block.sand-boulder.name = Пісочний валун block.basalt-boulder.name = Базальтовий валун block.grass.name = Трава -block.slag.name = Шлак +block.molten-slag.name = Шлак block.space.name = Космос block.salt.name = Сіль block.salt-wall.name = Соляна стіна @@ -1092,8 +1092,8 @@ block.spawn.name = Місце появи противника block.core-shard.name = Ядро «Уламок» block.core-foundation.name = Ядро «Штаб» block.core-nucleus.name = Ядро «Атом» -block.deepwater.name = Глибоководдя -block.water.name = Вода +block.deep-water.name = Глибоководдя +block.shallow-water.name = Вода block.tainted-water.name = Забруднена вода block.darksand-tainted-water.name = Темний пісок із забрудненою водою block.tar.name = Дьоготь @@ -1102,7 +1102,7 @@ block.sand.name = Пісок block.darksand.name = Темний пісок block.ice.name = Лід block.snow.name = Сніг -block.craters.name = Кратери +block.stone-craters.name = Кратери block.sand-water.name = Пісок із водою block.darksand-water.name = Темний пісок із водою block.char.name = Випалена земля diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties index 951bb1ecde..52fc53ef3b 100644 --- a/core/assets/bundles/bundle_vi.properties +++ b/core/assets/bundles/bundle_vi.properties @@ -1102,7 +1102,7 @@ block.cliff.name = Vách đá block.sand-boulder.name = Tường cát block.basalt-boulder.name = Tường đá basalt block.grass.name = Cỏ -block.slag.name = Xỉ nóng chảy +block.molten-slag.name = Xỉ nóng chảy block.space.name = Không gian block.salt.name = Muối block.salt-wall.name = Tường muối @@ -1133,8 +1133,8 @@ block.spawn.name = Khu vực tạo ra kẻ địch block.core-shard.name = Căn cứ: Cơ sở block.core-foundation.name = Căn cứ: Trụ sở block.core-nucleus.name = Căn cứ: Trung tâm -block.deepwater.name = Nước sâu -block.water.name = Nước +block.deep-water.name = Nước sâu +block.shallow-water.name = Nước block.tainted-water.name = Nước nhiểm bẩn block.darksand-tainted-water.name = Nước nhiễm bẩn cát đen block.tar.name = Dầu @@ -1143,7 +1143,7 @@ block.sand.name = Cát block.darksand.name = Cát đen block.ice.name = Băng block.snow.name = Tuyết -block.craters.name = Miệng núi lửa +block.stone-craters.name = Miệng núi lửa block.sand-water.name = Nước cát block.darksand-water.name = Nước cát đen block.char.name = Char diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 8577a9b6a0..e3f68dc7d1 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -1107,7 +1107,7 @@ block.cliff.name = 悬崖 block.sand-boulder.name = 砂岩 block.basalt-boulder.name = 玄武岩巨石 block.grass.name = 草地 -block.slag.name = 矿渣 +block.molten-slag.name = 矿渣 block.space.name = 太空 block.salt.name = 盐碱地 block.salt-wall.name = 盐墙 @@ -1138,8 +1138,8 @@ block.spawn.name = 敌人出生点 block.core-shard.name = 初代核心 block.core-foundation.name = 次代核心 block.core-nucleus.name = 终代核心 -block.deepwater.name = 深水 -block.water.name = 水 +block.deep-water.name = 深水 +block.shallow-water.name = 水 block.tainted-water.name = 污水 block.darksand-tainted-water.name = 黑沙 污水 block.tar.name = 石油 @@ -1148,7 +1148,7 @@ block.sand.name = 沙子 block.darksand.name = 黑沙 block.ice.name = 冰 block.snow.name = 雪 -block.craters.name = 陨石坑 +block.stone-craters.name = 陨石坑 block.sand-water.name = 沙 水 block.darksand-water.name = 黑沙 水 block.char.name = 焦土 diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index a77a616d24..1863f8a34a 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -1097,7 +1097,7 @@ block.cliff.name = 峭壁 block.sand-boulder.name = 沙礫巨岩 block.basalt-boulder.name = 玄武岩巨石 block.grass.name = 草 -block.slag.name = 熔渣 +block.molten-slag.name = 熔渣 block.space.name = 太空 block.salt.name = 鹽 block.salt-wall.name = 鹽牆 @@ -1128,8 +1128,8 @@ block.spawn.name = 敵人生成 block.core-shard.name = 核心：碎片 block.core-foundation.name = 核心：基地 block.core-nucleus.name = 核心：核子 -block.deepwater.name = 深水 -block.water.name = 水 +block.deep-water.name = 深水 +block.shallow-water.name = 水 block.tainted-water.name = 污水 block.darksand-tainted-water.name = 黑沙污水 block.tar.name = 焦油 @@ -1138,7 +1138,7 @@ block.sand.name = 沙 block.darksand.name = 黑沙 block.ice.name = 冰 block.snow.name = 雪 -block.craters.name = 彈坑 +block.stone-craters.name = 彈坑 block.sand-water.name = 沙水 block.darksand-water.name = 黑沙水 block.char.name = 燒焦 diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index fd80526784..88b2e7d939 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -356,3 +356,7 @@ 63356=sharded|team-sharded 63357=crux|team-crux 63358=derelict|team-derelict +63350=deep-water|block-deep-water-ui +63349=shallow-water|block-shallow-water-ui +63348=molten-slag|block-molten-slag-ui +63347=crater-stone|block-crater-stone-ui diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index a17b403b90..03fed2dd61 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -117,7 +117,7 @@ public class Blocks implements ContentList{ new ConstructBlock(i); } - deepwater = new Floor("deepwater"){{ + deepwater = new Floor("deep-water"){{ speedMultiplier = 0.2f; variants = 0; liquidDrop = Liquids.water; @@ -130,7 +130,7 @@ public class Blocks implements ContentList{ albedo = 0.5f; }}; - water = new Floor("water"){{ + water = new Floor("shallow-water"){{ speedMultiplier = 0.5f; variants = 0; status = StatusEffects.wet; @@ -184,7 +184,7 @@ public class Blocks implements ContentList{ cacheLayer = CacheLayer.tar; }}; - slag = new Floor("slag"){{ + slag = new Floor("molten-slag"){{ drownTime = 150f; status = StatusEffects.melting; statusDuration = 240f; @@ -209,7 +209,7 @@ public class Blocks implements ContentList{ stone = new Floor("stone"); - craters = new Floor("craters"){{ + craters = new Floor("crater-stone"){{ variants = 3; blendGroup = stone; }}; diff --git a/core/src/mindustry/io/SaveFileReader.java b/core/src/mindustry/io/SaveFileReader.java index 178980207f..1a059c976b 100644 --- a/core/src/mindustry/io/SaveFileReader.java +++ b/core/src/mindustry/io/SaveFileReader.java @@ -50,7 +50,11 @@ public abstract class SaveFileReader{ "holostone-wall", "dacite-wall", "rock", "boulder", "snowrock", "snow-boulder", - "cliffs", "stone-wall", + "cliffs", "stone-wall", + "craters", "crater-stone", + "deepwater", "deep-water", + "water", "shallow-water", + "slag", "molten-slag", "cryofluidmixer", "cryofluid-mixer" );