Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -2312,7 +2312,7 @@ block.vent-condenser.description = Condenses vent gases into water. Consumes pow
|
||||
block.plasma-bore.description = When placed facing an ore wall, outputs items indefinitely. Requires small amounts of power.\nOptionally uses hydrogen to boost efficiency.
|
||||
block.large-plasma-bore.description = A larger plasma bore. Capable of mining tungsten and thorium. Requires hydrogen and power.\nOptionally uses nitrogen to boost efficiency.
|
||||
block.cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power. Efficiency varies based on type of wall.
|
||||
block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
|
||||
block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and hydrogen. Efficiency varies based on type of wall. Optionally consumes graphite to increase efficiency.
|
||||
block.impact-drill.description = When placed on ore, outputs items in bursts indefinitely. Requires power and water.\nOptionally uses ozone to boost efficiency.
|
||||
block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.\nOptionally uses cyanogen to boost efficiency.
|
||||
block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
|
||||
|
||||
@@ -1796,6 +1796,8 @@ block.arkyic-vent.name = Аркіцытны Гейзер
|
||||
block.yellow-stone-vent.name = Жоутакаменны Гейзер
|
||||
block.red-stone-vent.name = Чырвонакаменны Гейзер
|
||||
block.crystalline-vent.name = Крыштальны Гейзер
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Красная Глеба
|
||||
block.bluemat.name = Сіняя Глеба
|
||||
block.core-zone.name = Зона Ядра
|
||||
|
||||
@@ -1814,6 +1814,8 @@ block.arkyic-vent.name = Аркичен отвор
|
||||
block.yellow-stone-vent.name = Отвор за жълт камък
|
||||
block.red-stone-vent.name = Отвор за червен камък
|
||||
block.crystalline-vent.name = Кристален отвор
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Червен килим
|
||||
block.bluemat.name = Син килим
|
||||
block.core-zone.name = Зона за ядро
|
||||
|
||||
@@ -1816,6 +1816,8 @@ block.arkyic-vent.name = Fumarola d’arquicita
|
||||
block.yellow-stone-vent.name = Fumarola de pedra groga
|
||||
block.red-stone-vent.name = Fumarola de pedra vermella
|
||||
block.crystalline-vent.name = Fumarola cristal·lina
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Mata vermella
|
||||
block.bluemat.name = Mata blava
|
||||
block.core-zone.name = Zona del nucli
|
||||
|
||||
@@ -1814,6 +1814,8 @@ block.arkyic-vent.name = Arkyic díra
|
||||
block.yellow-stone-vent.name = Yellow Stone díra
|
||||
block.red-stone-vent.name = Red Stone díra
|
||||
block.crystalline-vent.name = Crystalline díra
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Redmat
|
||||
block.bluemat.name = Bluemat
|
||||
block.core-zone.name = Zóna pro jádro
|
||||
|
||||
@@ -1798,6 +1798,8 @@ block.arkyic-vent.name = Arkyic Vent
|
||||
block.yellow-stone-vent.name = Yellow Stone Vent
|
||||
block.red-stone-vent.name = Red Stone Vent
|
||||
block.crystalline-vent.name = Crystalline Vent
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Redmat
|
||||
block.bluemat.name = Bluemat
|
||||
block.core-zone.name = Core Zone
|
||||
|
||||
@@ -1830,6 +1830,8 @@ block.arkyic-vent.name = Arkyzitschlot
|
||||
block.yellow-stone-vent.name = Gelbsteinschlot
|
||||
block.red-stone-vent.name = Rotsteinschlot
|
||||
block.crystalline-vent.name = Kristalliner Schlot
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Rote Erde
|
||||
block.bluemat.name = Blaue Erde
|
||||
block.core-zone.name = Kernzone
|
||||
|
||||
@@ -1822,6 +1822,8 @@ block.arkyic-vent.name = Grieta de arquicita
|
||||
block.yellow-stone-vent.name = Grieta de piedra amarillenta
|
||||
block.red-stone-vent.name = Grieta de piedra rojiza
|
||||
block.crystalline-vent.name = Grieta cristalina
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Manto rojo
|
||||
block.bluemat.name = Manto azul
|
||||
block.core-zone.name = Zona de núcleo
|
||||
|
||||
@@ -1801,6 +1801,8 @@ block.arkyic-vent.name = Arkyic Vent
|
||||
block.yellow-stone-vent.name = Yellow Stone Vent
|
||||
block.red-stone-vent.name = Red Stone Vent
|
||||
block.crystalline-vent.name = Crystalline Vent
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Redmat
|
||||
block.bluemat.name = Bluemat
|
||||
block.core-zone.name = Core Zone
|
||||
|
||||
@@ -1800,6 +1800,8 @@ block.arkyic-vent.name = Arkyic Vent
|
||||
block.yellow-stone-vent.name = Yellow Stone Vent
|
||||
block.red-stone-vent.name = Red Stone Vent
|
||||
block.crystalline-vent.name = Crystalline Vent
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Redmat
|
||||
block.bluemat.name = Bluemat
|
||||
block.core-zone.name = Core Zone
|
||||
|
||||
@@ -1802,6 +1802,8 @@ block.arkyic-vent.name = Arkyinen purkaus
|
||||
block.yellow-stone-vent.name = Keltakivipurkaus
|
||||
block.red-stone-vent.name = Punakivipurkaus
|
||||
block.crystalline-vent.name = Kiteinen purkaus
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Punamatto
|
||||
block.bluemat.name = Sinimatto
|
||||
block.core-zone.name = Ydinpohja
|
||||
|
||||
@@ -1808,6 +1808,8 @@ block.arkyic-vent.name = Arkyic Vent
|
||||
block.yellow-stone-vent.name = Yellow Stone Vent
|
||||
block.red-stone-vent.name = Red Stone Vent
|
||||
block.crystalline-vent.name = Crystalline Vent
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Redmat
|
||||
block.bluemat.name = Bluemat
|
||||
block.core-zone.name = Core Zone
|
||||
|
||||
@@ -1830,6 +1830,8 @@ block.arkyic-vent.name = Évent d'Arkyic
|
||||
block.yellow-stone-vent.name = Évent de Pierre Jaune
|
||||
block.red-stone-vent.name = Évent de Pierre Rouge
|
||||
block.crystalline-vent.name = Évent Crystallin
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Redmat
|
||||
block.bluemat.name = Bluemat
|
||||
block.core-zone.name = Zone de Noyau
|
||||
|
||||
@@ -1840,6 +1840,8 @@ block.arkyic-vent.name = Arkicites kürtő
|
||||
block.yellow-stone-vent.name = Sárgakő-kürtő
|
||||
block.red-stone-vent.name = Vöröskő-kürtő
|
||||
block.crystalline-vent.name = Kristályos kürtő
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Vörös padló
|
||||
block.bluemat.name = Kék padló
|
||||
block.core-zone.name = Támaszpontzóna
|
||||
|
||||
@@ -1839,6 +1839,8 @@ block.arkyic-vent.name = Ventilasi Arkisit
|
||||
block.yellow-stone-vent.name = Ventilasi Batu Kuning
|
||||
block.red-stone-vent.name = Ventilasi Batu Merah
|
||||
block.crystalline-vent.name = Ventilasi Kristal
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Matras Merah
|
||||
block.bluemat.name = Matras Biru
|
||||
block.core-zone.name = Zona Inti
|
||||
|
||||
@@ -1808,6 +1808,8 @@ block.arkyic-vent.name = Arkyic Vent
|
||||
block.yellow-stone-vent.name = Yellow Stone Vent
|
||||
block.red-stone-vent.name = Red Stone Vent
|
||||
block.crystalline-vent.name = Crystalline Vent
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Redmat
|
||||
block.bluemat.name = Bluemat
|
||||
block.core-zone.name = Core Zone
|
||||
|
||||
@@ -1811,6 +1811,8 @@ block.arkyic-vent.name = アーキサイトジェット
|
||||
block.yellow-stone-vent.name = イエローストーンジェット
|
||||
block.red-stone-vent.name = レッドストーンジェット
|
||||
block.crystalline-vent.name = クリスタルジェット
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = レッドマット
|
||||
block.bluemat.name = ブルーマット
|
||||
block.core-zone.name = コアゾーン
|
||||
|
||||
@@ -1840,6 +1840,8 @@ block.arkyic-vent.name = 아르킥 분출구
|
||||
block.yellow-stone-vent.name = 노란 돌 분출구
|
||||
block.red-stone-vent.name = 붉은 돌 분출구
|
||||
block.crystalline-vent.name = 수정형 분출구
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = 붉은 흙
|
||||
block.bluemat.name = 푸른 흙
|
||||
block.core-zone.name = 코어 구역
|
||||
|
||||
@@ -1798,6 +1798,8 @@ block.arkyic-vent.name = Arkyic Vent
|
||||
block.yellow-stone-vent.name = Yellow Stone Vent
|
||||
block.red-stone-vent.name = Red Stone Vent
|
||||
block.crystalline-vent.name = Crystalline Vent
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Redmat
|
||||
block.bluemat.name = Bluemat
|
||||
block.core-zone.name = Core Zone
|
||||
|
||||
@@ -1811,6 +1811,8 @@ block.arkyic-vent.name = Arkyic Vent
|
||||
block.yellow-stone-vent.name = Yellow Stone Vent
|
||||
block.red-stone-vent.name = Red Stone Vent
|
||||
block.crystalline-vent.name = Crystalline Vent
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Redmat
|
||||
block.bluemat.name = Bluemat
|
||||
block.core-zone.name = Core Zone
|
||||
|
||||
@@ -1798,6 +1798,8 @@ block.arkyic-vent.name = Arkyic Vent
|
||||
block.yellow-stone-vent.name = Yellow Stone Vent
|
||||
block.red-stone-vent.name = Red Stone Vent
|
||||
block.crystalline-vent.name = Crystalline Vent
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Redmat
|
||||
block.bluemat.name = Bluemat
|
||||
block.core-zone.name = Core Zone
|
||||
|
||||
@@ -1818,6 +1818,8 @@ block.arkyic-vent.name = Arkyiczny Gejzer
|
||||
block.yellow-stone-vent.name = Żółty Kamienny Gejzer
|
||||
block.red-stone-vent.name = Czerwony Kamienny Gejzer
|
||||
block.crystalline-vent.name = Crystalline Vent
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Redmat
|
||||
block.bluemat.name = Bluemat
|
||||
block.core-zone.name = Strefa Rdzenia
|
||||
|
||||
@@ -1828,6 +1828,8 @@ block.arkyic-vent.name = Ventilação Arkyic
|
||||
block.yellow-stone-vent.name = Ventilação de Pedra Amarela
|
||||
block.red-stone-vent.name = Ventilação de Pedra Vermelha
|
||||
block.crystalline-vent.name = Crystalline Vent
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Redmat
|
||||
block.bluemat.name = Bluemat
|
||||
block.core-zone.name = Zona do Núcleo
|
||||
|
||||
@@ -1845,6 +1845,8 @@ block.arkyic-vent.name = Arkyic Vent
|
||||
block.yellow-stone-vent.name = Yellow Stone Vent
|
||||
block.red-stone-vent.name = Red Stone Vent
|
||||
block.crystalline-vent.name = Crystalline Vent
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Redmat
|
||||
block.bluemat.name = Bluemat
|
||||
block.core-zone.name = Zona de Núcleo
|
||||
|
||||
@@ -1811,6 +1811,8 @@ block.arkyic-vent.name = Arkyic Vent
|
||||
block.yellow-stone-vent.name = Yellow Stone Vent
|
||||
block.red-stone-vent.name = Red Stone Vent
|
||||
block.crystalline-vent.name = Crystalline Vent
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Redmat
|
||||
block.bluemat.name = Bluemat
|
||||
block.core-zone.name = Core Zone
|
||||
|
||||
@@ -1816,6 +1816,8 @@ block.arkyic-vent.name = Аркическое жерло
|
||||
block.yellow-stone-vent.name = Жёлтокаменное жерло
|
||||
block.red-stone-vent.name = Краснокаменное жерло
|
||||
block.crystalline-vent.name = Кристаллическое жерло
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Красная земля
|
||||
block.bluemat.name = Синяя земля
|
||||
block.core-zone.name = Зона ядра
|
||||
|
||||
@@ -1813,6 +1813,8 @@ block.arkyic-vent.name = Lučarni Gejzir
|
||||
block.yellow-stone-vent.name = Gejzir Žute Stene
|
||||
block.red-stone-vent.name = Gejzir Crvene Stene
|
||||
block.crystalline-vent.name = Crystalline Vent
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Redmat
|
||||
block.bluemat.name = Bluemat
|
||||
block.core-zone.name = Zona Jezgra
|
||||
|
||||
@@ -1798,6 +1798,8 @@ block.arkyic-vent.name = Arkyic Vent
|
||||
block.yellow-stone-vent.name = Yellow Stone Vent
|
||||
block.red-stone-vent.name = Red Stone Vent
|
||||
block.crystalline-vent.name = Crystalline Vent
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Redmat
|
||||
block.bluemat.name = Bluemat
|
||||
block.core-zone.name = Core Zone
|
||||
|
||||
@@ -1815,6 +1815,8 @@ block.arkyic-vent.name = ปล่องอาร์ยคิค
|
||||
block.yellow-stone-vent.name = ปล่องหินเหลือง
|
||||
block.red-stone-vent.name = ปล่องหินแดง
|
||||
block.crystalline-vent.name = ปล่องหินตกผลืก
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = แมตแดง
|
||||
block.bluemat.name = แมตน้ำเงิน
|
||||
block.core-zone.name = โซนแกนกลาง
|
||||
|
||||
@@ -1798,6 +1798,8 @@ block.arkyic-vent.name = Arkyic Vent
|
||||
block.yellow-stone-vent.name = Yellow Stone Vent
|
||||
block.red-stone-vent.name = Red Stone Vent
|
||||
block.crystalline-vent.name = Crystalline Vent
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Redmat
|
||||
block.bluemat.name = Bluemat
|
||||
block.core-zone.name = Core Zone
|
||||
|
||||
@@ -1810,6 +1810,8 @@ block.arkyic-vent.name = Arkisit Baca
|
||||
block.yellow-stone-vent.name = Sarı Taş Baca
|
||||
block.red-stone-vent.name = Kızıl Taş Baca
|
||||
block.crystalline-vent.name = Kristal Baca
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = KızılMat
|
||||
block.bluemat.name = MaviMat
|
||||
block.core-zone.name = Merkez Alanı
|
||||
|
||||
@@ -1824,6 +1824,8 @@ block.arkyic-vent.name = Аркицитове джерело
|
||||
block.yellow-stone-vent.name = Жовте кам’яне джерело
|
||||
block.red-stone-vent.name = Червоне кам’яне джерело
|
||||
block.crystalline-vent.name = Кристалічне джерело
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Редмат
|
||||
block.bluemat.name = Блюмат
|
||||
block.core-zone.name = Зона ядра
|
||||
|
||||
@@ -1840,6 +1840,8 @@ block.arkyic-vent.name = Lỗ hơi nước Arkyic
|
||||
block.yellow-stone-vent.name = Lỗ hơi nước đá vàng
|
||||
block.red-stone-vent.name = Lỗ hơi nước đá đỏ
|
||||
block.crystalline-vent.name = Lỗ hơi nước pha lê
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = Thảm đỏ
|
||||
block.bluemat.name = Thảm xanh
|
||||
block.core-zone.name = Vùng đặt lõi
|
||||
|
||||
@@ -1829,6 +1829,8 @@ block.arkyic-vent.name = 芳石喷口
|
||||
block.yellow-stone-vent.name = 黄石喷口
|
||||
block.red-stone-vent.name = 红石喷口
|
||||
block.crystalline-vent.name = 晶石喷口
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = 红地垫
|
||||
block.bluemat.name = 蓝地垫
|
||||
block.core-zone.name = 核心区
|
||||
|
||||
@@ -1829,6 +1829,8 @@ block.arkyic-vent.name = 琥珀石噴口
|
||||
block.yellow-stone-vent.name = 黃岩噴口
|
||||
block.red-stone-vent.name = 紅岩噴口
|
||||
block.crystalline-vent.name = 晶岩噴口
|
||||
block.stone-vent.name = Stone Vent
|
||||
block.basalt-vent.name = Basalt Vent
|
||||
block.redmat.name = 紅地板
|
||||
block.bluemat.name = 藍地板
|
||||
block.core-zone.name = 核心地塊
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1339,7 +1339,7 @@ public class Blocks{
|
||||
}};
|
||||
|
||||
smallHeatRedirector = new HeatConductor("small-heat-redirector"){{
|
||||
requirements(Category.crafting, with(Items.surgeAlloy, 10, Items.graphite, 10));
|
||||
requirements(Category.crafting, with(Items.surgeAlloy, 8, Items.graphite, 8));
|
||||
|
||||
researchCostMultiplier = 10f;
|
||||
|
||||
@@ -2827,7 +2827,7 @@ public class Blocks{
|
||||
|
||||
largeCliffCrusher = new WallCrafter("large-cliff-crusher"){{
|
||||
requirements(Category.production, with(Items.silicon, 80, Items.surgeAlloy, 15, Items.beryllium, 100, Items.tungsten, 50));
|
||||
consumePower(30 / 60f);
|
||||
consumePower(1f);
|
||||
|
||||
drillTime = 48f;
|
||||
size = 3;
|
||||
@@ -2837,11 +2837,11 @@ public class Blocks{
|
||||
ambientSound = Sounds.drill;
|
||||
ambientSoundVolume = 0.08f;
|
||||
|
||||
consumeLiquid(Liquids.ozone, 1f / 60f);
|
||||
consumeLiquid(Liquids.hydrogen, 1f / 60f);
|
||||
|
||||
itemConsumer = consumeItem(Items.tungsten).boost();
|
||||
itemConsumer = consumeItem(Items.graphite).boost();
|
||||
itemCapacity = 20;
|
||||
boostItemUseTime = 60f * 10f;
|
||||
boostItemUseTime = 60f / 0.75f;
|
||||
|
||||
//alternatively, boost using nitrogen:
|
||||
//consumeLiquid(Liquids.nitrogen, 3f / 60f).boost();
|
||||
@@ -2892,7 +2892,7 @@ public class Blocks{
|
||||
blockedItem = Items.thorium;
|
||||
researchCostMultiplier = 0.5f;
|
||||
|
||||
drillMultipliers.put(Items.beryllium, 1.95f);
|
||||
drillMultipliers.put(Items.beryllium, 2f);
|
||||
liquidBoostIntensity = 1.75f;
|
||||
|
||||
fogRadius = 4;
|
||||
@@ -2923,13 +2923,13 @@ public class Blocks{
|
||||
glowColor.a = 0.6f;
|
||||
fogRadius = 5;
|
||||
|
||||
drillMultipliers.put(Items.beryllium, 1.35f);
|
||||
drillMultipliers.put(Items.beryllium, 2f);
|
||||
liquidBoostIntensity = 2f;
|
||||
|
||||
//TODO different requirements
|
||||
consumePower(6f);
|
||||
consumeLiquid(Liquids.hydrogen, 4f / 60f);
|
||||
consumeLiquid(Liquids.cyanogen, 3f / 60f).boost();
|
||||
consumeLiquid(Liquids.cyanogen, 0.75f / 60f).boost();
|
||||
}};
|
||||
|
||||
//endregion
|
||||
|
||||
Reference in New Issue
Block a user