Merge branch '16working' of https://github.com/mDiyo/TinkersConstruct into 16working

This commit is contained in:
mDiyo committed 2013-08-26 20:20:32 -07:00
commit 0f069787c4
16 files changed
+266 -305

No files matched your search

+70 -26
View File
@@ -278,6 +278,7 @@
<entry key="item.tconstruct.Bowstring.string.name">Bogensehne</entry>
<entry key="item.tconstruct.Bowstring.enchantedfabric.name">Verzauberte Bogensehne</entry>
<entry key="item.tconstruct.Bowstring.flamestring.name">Feurige Bogensehne</entry>
<entry key="item.tconstruct.Fletching.feather.name">Federne Befiederung</entry>
<entry key="item.tconstruct.Fletching.leaf.name">Blätterne Befiederung</entry>
<entry key="item.tconstruct.Fletching.slime.name">Schleimige Befiederung</entry>
@@ -316,30 +317,30 @@
<entry key="item.tconstruct.bowstring.string.name">Bogensehne</entry>
<entry key="item.tconstruct.bowstring.enchantedfabriI donc.name">Verzauberte Bogensehne</entry>
<entry key="LiquidMetal.Iron.name">Geschmolzenes Eisen</entry>
<entry key="LiquidMetal.Gold.name">Geschmolzenes Gold</entry>
<entry key="LiquidMetal.Copper.name">Geschmolzenes Kupfer</entry>
<entry key="LiquidMetal.Tin.name">Geschmolzenes Zinn</entry>
<entry key="LiquidMetal.Aluminum.name">Geschmolzenes Aluminium</entry>
<entry key="LiquidMetal.Cobalt.name">Geschmolzenes Cobalt</entry>
<entry key="LiquidMetal.Ardite.name">Geschmolzenes Ardit</entry>
<entry key="LiquidMetal.Bronze.name">Geschmolzene Bronze</entry>
<entry key="LiquidMetal.AluBrass.name">Geschmolzenes Duraluminium</entry>
<entry key="LiquidMetal.Manyullyn.name">Geschmolzenes Manyullyn</entry>
<entry key="LiquidMetal.Alumite.name">Geschmolzenes Alumit</entry>
<entry key="LiquidMetal.Obsidian.name">Geschmolzenes Obsidian</entry>
<entry key="LiquidMetal.Steel.name">Geschmolzener Stahl</entry>
<entry key="LiquidMetal.Glass.name">Geschmolzenes Glas</entry>
<entry key="LiquidMetal.Stone.name">Versengtes Gestein</entry>
<entry key="LiquidMetal.Villager.name">Verflüssigter Smaragd</entry>
<entry key="LiquidMetal.Cow.name">Blut</entry>
<entry key="LiquidMetal.Nickel.name">Geschmolzenes Nickel</entry>
<entry key="LiquidMetal.Silver.name">Geschmolzenes Silber</entry>
<entry key="LiquidMetal.Lead.name">Geschmolzenes Blei</entry>
<entry key="LiquidMetal.Shiny.name">Geschmolzenes Platin</entry>
<entry key="LiquidMetal.Invar.name">Geschmolzenes Invar</entry>
<entry key="LiquidMetal.Electrum.name">Geschmolzenes Elektrum</entry>
<entry key="LiquidMetal.Ender.name">Verflüssigtes Ender</entry>
<entry key="tile.metal.molten.iron.name">Geschmolzenes Eisen</entry>
<entry key="tile.metal.molten.gold.name">Geschmolzenes Gold</entry>
<entry key="tile.metal.molten.copper.name">Geschmolzenes Kupfer</entry>
<entry key="tile.metal.molten.tin.name">Geschmolzenes Zinn</entry>
<entry key="tile.metal.molten.aluminum.name">Geschmolzenes Aluminium</entry>
<entry key="tile.metal.molten.cobalt.name">Geschmolzenes Cobalt</entry>
<entry key="tile.metal.molten.ardite.name">Geschmolzenes Ardit</entry>
<entry key="tile.metal.molten.bronze.name">Geschmolzene Bronze</entry>
<entry key="tile.metal.molten.alubrass.name">Geschmolzenes Duraluminium</entry>
<entry key="tile.metal.molten.manyullyn.name">Geschmolzenes Manyullyn</entry>
<entry key="tile.metal.molten.alumite.name">Geschmolzenes Alumit</entry>
<entry key="tile.metal.molten.obsidian.name">Geschmolzenes Obsidian</entry>
<entry key="tile.metal.molten.steel.name">Geschmolzener Stahl</entry>
<entry key="tile.metal.molten.glass.name">Geschmolzenes Glas</entry>
<entry key="tile.molten.stone.name">Versengtes Gestein</entry>
<entry key="tile.molten.emerald.name">Verflüssigter Smaragd</entry>
<entry key="tile.liquid.blood.name">Blut</entry>
<entry key="tile.metal.molten.nickel.name">Geschmolzenes Nickel</entry>
<entry key="tile.metal.molten.silver.name">Geschmolzenes Silber</entry>
<entry key="tile.metal.molten.lead.name">Geschmolzenes Blei</entry>
<entry key="tile.metal.molten.shiny.name">Geschmolzenes Platin</entry>
<entry key="tile.metal.molten.invar.name">Geschmolzenes Invar</entry>
<entry key="tile.metal.molten.Electrum.name">Geschmolzenes Elektrum</entry>
<entry key="tile.liquid.ender.name">Verflüssigtes Ender</entry>
<entry key="item.food.apple.diamond.name">Verzierter Apfel</entry>
<entry key="item.tconstruct.strangefood.edibleslime.name">Essbarer Schleim</entry>
@@ -355,13 +356,56 @@
<entry key="entity.TConstruct.EdibleSlime.name">Blauer Schleim</entry>
<entry key="entity.TConstruct.KingSlime.name">Königsschleim</entry>
<entry key="entity.TConstruct.Gardeslime.name">Guardeschleim</entry>
<entry key="entity.TConstruct.MiniGardy.name">Guardeschleim</entry>
<entry key="key.tarmor">Rüstungs-GUI</entry>
<entry key="key.tcapes.reload">Lade Capes neu</entry>
<entry key="death.one.smeltery">%1$s wurde in eine Proteinmasse verwandelt</entry>
<entry key="death.two.smeltery">%1$s ist mit der Schmelzerei eins geworden</entry>
<entry key="death.three.smeltery">%1$s wird ein Meilenstein für unsere Revolution sein!</entry>
<entry key="death.four.smeltery">%1$s dachte, das Schwimmen in heißen Flüssigkeiten wäre eine gute Idee</entry>
<entry key="parttype.Wood">Holz -</entry>
<entry key="parttype.Stone">Stein -</entry>
<entry key="parttype.Iron">Eisen -</entry>
<entry key="parttype.Flint">Feuterstein -</entry>
<entry key="parttype.Cactus">Kaktus -</entry>
<entry key="parttype.Bone">Knochen -</entry>
<entry key="parttype.Obsidian">Obsidian -</entry>
<entry key="parttype.Slime">Schleim -</entry>
<entry key="parttype.Paper">Papier -</entry>
<entry key="parttype.Cobalt">Cobalt -</entry>
<entry key="parttype.Ardite">Ardit -</entry>
<entry key="parttype.Manyullyn">Manyullyn -</entry>
<entry key="parttype.Copper">Kupfer -</entry>
<entry key="parttype.Bronze">Bronze -</entry>
<entry key="parttype.Alumite">Alumit -</entry>
<entry key="parttype.Steel">Stahl -</entry>
<entry key="parttype.BlueSlime">Schleim -</entry>
<entry key="molten iron">Geschmolzenes Eisen</entry>
<entry key="molten gold">Geschmolzenes Gold</entry>
<entry key="molten copper">Geschmolzenes Kupfer</entry>
<entry key="molten tin">Geschmolzenes Zinn</entry>
<entry key="molten aluminum">Geschmolzenes Aluminum</entry>
<entry key="molten cobalt">Geschmolzenes Cobalt</entry>
<entry key="molten ardite">Geschmolzenes Ardit</entry>
<entry key="molten bronze">Geschmolzene Bronze</entry>
<entry key="molten aluminum brass">Geschmolzenes Duraluminium</entry>
<entry key="molten manyullyn">Geschmolzenes Manyullyn</entry>
<entry key="molten alumite">Geschmolzenes Alumit</entry>
<entry key="molten obsidian">Geschmolzenes Obsidian</entry>
<entry key="molten steel">Geschmolzener Stahl</entry>
<entry key="molten glass">Geschmolzenes Glas</entry>
<entry key="seared stone">Versengtes Gestein</entry>
<entry key="liquified emerald">Verflüssigter Smaragd</entry>
<entry key="blood">Blut</entry>
<entry key="molten nickel">Geschmolzenes Nickel</entry>
<entry key="molten lead">Geschmolzenes Blei</entry>
<entry key="molten silver">Geschmolzenes Silber</entry>
<entry key="molten platinum">Geschmolzenes Platin</entry>
<entry key="molten invar">Geschmolzenes Invar</entry>
<entry key="molten electrum">Geschmolzenes Elektrum</entry>
<entry key="ender">Flüssiges Ender</entry>
</properties>
</properties>
+27 -25
View File
@@ -277,6 +277,7 @@
<entry key="item.tconstruct.Bowstring.string.name">Bowstring</entry>
<entry key="item.tconstruct.Bowstring.enchantedfabric.name">Enchanted Bowstring</entry>
<entry key="item.tconstruct.Bowstring.flamestring.name">Fiery Bowstring</entry>
<entry key="item.tconstruct.Fletching.feather.name">Feather Fletching</entry>
<entry key="item.tconstruct.Fletching.leaf.name">Leaf Fletching</entry>
<entry key="item.tconstruct.Fletching.slime.name">Slime Fletching</entry>
@@ -315,30 +316,30 @@
<entry key="item.tconstruct.bowstring.string.name">Bowstring</entry>
<entry key="item.tconstruct.bowstring.enchantedfabriI donc.name">Enchanted Bowstring</entry>
<entry key="LiquidMetal.Iron.name">Molten Iron</entry>
<entry key="LiquidMetal.Gold.name">Molten Gold</entry>
<entry key="LiquidMetal.Copper.name">Molten Copper</entry>
<entry key="LiquidMetal.Tin.name">Liquid Tin</entry>
<entry key="LiquidMetal.Aluminum.name">Molten Aluminum</entry>
<entry key="LiquidMetal.Cobalt.name">Molten Cobalt</entry>
<entry key="LiquidMetal.Ardite.name">Molten Ardite</entry>
<entry key="LiquidMetal.Bronze.name">Molten Bronze</entry>
<entry key="LiquidMetal.AluBrass.name">Molten Aluminum Brass</entry>
<entry key="LiquidMetal.Manyullyn.name">Molten Manyullyn</entry>
<entry key="LiquidMetal.Alumite.name">Molten Alumite</entry>
<entry key="LiquidMetal.Obsidian.name">Molten Obsidian</entry>
<entry key="LiquidMetal.Steel.name">Molten Steel</entry>
<entry key="LiquidMetal.Glass.name">Molten Glass</entry>
<entry key="LiquidMetal.Stone.name">Seared Stone</entry>
<entry key="LiquidMetal.Villager.name">Liquified Emerald</entry>
<entry key="LiquidMetal.Cow.name">Blood</entry>
<entry key="LiquidMetal.Nickel.name">Molten Nickel</entry>
<entry key="LiquidMetal.Silver.name">Molten Silver</entry>
<entry key="LiquidMetal.Lead.name">Molten Lead</entry>
<entry key="LiquidMetal.Shiny.name">Molten Shiny</entry>
<entry key="LiquidMetal.Invar.name">Molten Invar</entry>
<entry key="LiquidMetal.Electrum.name">Molten Electrum</entry>
<entry key="LiquidMetal.Ender.name">Liquified Ender</entry>
<entry key="tile.metal.molten.iron.name">Molten Iron</entry>
<entry key="tile.metal.molten.gold.name">Molten Gold</entry>
<entry key="tile.metal.molten.copper.name">Molten Copper</entry>
<entry key="tile.metal.molten.tin.name">Liquid Tin</entry>
<entry key="tile.metal.molten.aluminum.name">Molten Aluminum</entry>
<entry key="tile.metal.molten.cobalt.name">Molten Cobalt</entry>
<entry key="tile.metal.molten.ardite.name">Molten Ardite</entry>
<entry key="tile.metal.molten.bronze.name">Molten Bronze</entry>
<entry key="tile.metal.molten.alubrass.name">Molten Aluminum Brass</entry>
<entry key="tile.metal.molten.manyullyn.name">Molten Manyullyn</entry>
<entry key="tile.metal.molten.alumite.name">Molten Alumite</entry>
<entry key="tile.metal.molten.obsidian.name">Molten Obsidian</entry>
<entry key="tile.metal.molten.steel.name">Molten Steel</entry>
<entry key="tile.metal.molten.glass.name">Molten Glass</entry>
<entry key="tile.molten.stone.name">Seared Stone</entry>
<entry key="tile.molten.emerald.name">Liquified Emerald</entry>
<entry key="tile.liquid.blood.name">Blood</entry>
<entry key="tile.metal.molten.nickel.name">Molten Nickel</entry>
<entry key="tile.metal.molten.silver.name">Molten Silver</entry>
<entry key="tile.metal.molten.lead.name">Molten Lead</entry>
<entry key="tile.metal.molten.shiny.name">Molten Shiny</entry>
<entry key="tile.metal.molten.invar.name">Molten Invar</entry>
<entry key="tile.metal.molten.Electrum.name">Molten Electrum</entry>
<entry key="tile.liquid.ender.name">Liquified Ender</entry>
<entry key="item.food.apple.diamond.name">Jeweled Apple</entry>
<entry key="item.tconstruct.strangefood.edibleslime.name">Gelatinous Slime</entry>
@@ -356,6 +357,7 @@
<entry key="entity.TConstruct.Gardeslime.name">Gardeslime</entry>
<entry key="key.tarmor">Armor Gui</entry>
<entry key="key.tcapes.reload">Reload Capes</entry>
<entry key="death.one.smeltery">%1$s transformed into Soylent Green</entry>
<entry key="death.two.smeltery">%1$s has fused with the Smeltery</entry>
@@ -405,4 +407,4 @@
<entry key="molten shiny">Molten Shiny</entry>
<entry key="ender">Liquid Ender</entry>
</properties>
</properties>
+82 -25
View File
@@ -54,7 +54,7 @@
<entry key="block.brownstone.rough.road.name">Дорога из грубого бурого песчаника</entry>
<entry key="block.brownstone.smooth.name">Бурый песчаник</entry>
<entry key="block.brownstone.smooth.brick.name">Кирпич из бурого песчаника</entry>
<entry key="block.brownstone.smooth.road.name">Дорога из бурго песчаника</entry>
<entry key="block.brownstone.smooth.road.name">Дорога из бурого песчаника</entry>
<entry key="block.brownstone.smooth.fancy.name">Красивый бурый песчаник</entry>
<entry key="block.brownstone.smooth.chiseled.name">Резной бурый песчаник</entry>
@@ -98,6 +98,23 @@
<entry key="block.fancybrick.stone.road.name">Каменная дорого</entry>
<entry key="block.fancybrick.stone.name">Кирпич из красивого камня</entry>
<entry key="tile.cloth.white.slab.name">Плита из шерсти</entry>
<entry key="tile.cloth.orange.slab.name">Плита из оранжевой шерсти</entry>
<entry key="tile.cloth.magenta.slab.name">Плита из сиреневой шерсти</entry>
<entry key="tile.cloth.lightBlue.slab.name">Плита из светло-синей шерсти</entry>
<entry key="tile.cloth.yellow.slab.name">Плита из жёлтой шерсти</entry>
<entry key="tile.cloth.lime.slab.name">Плита из лаймовой шерсти</entry>
<entry key="tile.cloth.pink.slab.name">Плита из розовой шерсти</entry>
<entry key="tile.cloth.gray.slab.name">Плита из серой шерсти</entry>
<entry key="tile.cloth.silver.slab.name">Плита светло-серой шерсти</entry>
<entry key="tile.cloth.cyan.slab.name">Плита из бирюзовой шерсти</entry>
<entry key="tile.cloth.purple.slab.name">Плита из фиолетовой шерсти</entry>
<entry key="tile.cloth.blue.slab.name">Плита из синей шерсти</entry>
<entry key="tile.cloth.brown.slab.name">Плита из коричневой шерсти</entry>
<entry key="tile.cloth.green.slab.name">Плита из зелёной шерсти</entry>
<entry key="tile.cloth.red.slab.name">Плита из красной шерсти</entry>
<entry key="tile.cloth.black.slab.name">Плита из чёрной шерсти</entry>
<entry key="item.oreberry.iron.name">Кусочки железа</entry>
<entry key="item.oreberry.gold.name">Кусочки золота</entry>
<entry key="item.oreberry.copper.name">Кусочки меди</entry>
@@ -133,6 +150,8 @@
<entry key="item.tconstruct.Materials.AluminumNugget.name">Алюминиевый самородок</entry>
<entry key="item.tconstruct.Materials.EssenceCrystal.name">Кристалл эссенции</entry>
<entry key="item.tconstruct.Materials.AluBrassNugget.name">Самородок алюминиевой латуни</entry>
<entry key="item.tconstruct.Materials.SilkyCloth.name">Шёлковистая ткань</entry>
<entry key="item.tconstruct.Materials.SilkyJewel.name">Шёлковистая драгоценность</entry>
<entry key="item.tconstruct.Materials.ObsidianNugget.name">Обсидиановый самородок</entry>
<entry key="item.tconstruct.Materials.CobaltNugget.name">Кобальтовый самородок</entry>
<entry key="item.tconstruct.Materials.ArditeNugget.name">Ардитовый самородок</entry>
@@ -141,6 +160,8 @@
<entry key="item.tconstruct.Materials.AlumiteNugget.name">Алюмитовый самородок</entry>
<entry key="item.tconstruct.Materials.SteelNugget.name">Кусочек стали</entry>
<entry key="item.tconstruct.crystal.essence.name">Кристалл эссенции</entry>
<entry key="Smeltery.Controller.name">Контроллер плавильни</entry>
<entry key="Smeltery.Drain.name">Водосток плавильни</entry>
<entry key="Smeltery.Brick.name">Обожжённые кирпичи</entry>
@@ -160,6 +181,12 @@
<entry key="block.drawbridge.name">Разводной мост</entry>
<entry key="block.firestarter.name">Воспламенитель</entry>
<entry key="tile.landmine.name">Фугас</entry>
<entry key="tile.trap.punji.name">Колышек</entry>
<entry key="tile.trap.barricade.oak.name">Баррикада из дуба</entry>
<entry key="tile.trap.barricade.spruce.name">Баррикада из ели</entry>
<entry key="tile.trap.barricade.birch.name">Баррикада из берёзы</entry>
<entry key="tile.trap.barricade.jungle.name">Баррикада из тропического дерева</entry>
<entry key="tile.extractor.essence.name">Экстрактор эссенции</entry>
<entry key="StorageMetals.Cobalt.name">Кобальтовый блок</entry>
<entry key="StorageMetals.Ardite.name">Ардитовый блок</entry>
@@ -171,8 +198,10 @@
<entry key="StorageMetals.AlBrass.name">Блок алюминиевой латуни</entry>
<entry key="StorageMetals.Alumite.name">Алюмитовый блок</entry>
<entry key="StorageMetals.Steel.name">Стальной блок</entry>
<entry key="StorageMetals.Ender.name">Блок твёрдого эндера</entry>
<entry key="tile.decoration.stonetorch.name">Факел</entry>
<entry key="tile.CraftingStation.name">Станция крафта</entry>
<entry key="block.glass.pure.name">Чистое стекло</entry>
<entry key="block.glass.soul.name">Душевное стекло</entry>
@@ -233,6 +262,15 @@
<entry key="block.soil.slab.graveyardsoil.name">Плита из кладбищенской почвы</entry>
<entry key="block.soil.slab.consecratedsoil.name">Плита из священной почвы</entry>
<entry key="block.slime.soil.blue.name">Земля из синей слизи</entry>
<entry key="block.slime.leaves.blue.name">Листва слизи</entry>
<entry key="block.slime.sapling.bluegreen.name">Слизистый саженец</entry>
<entry key="block.slime.grass.blue.name">Слизистая трава</entry>
<entry key="block.slime.grass.dirt.name">Слизистая трава</entry>
<entry key="block.slime.tallgrass.name">Слизистая трава</entry>
<entry key="block.slime.congealed.blue.name">Застывшая синяя слизь</entry>
<entry key="block.slime.congealed.green.name">Застывшая зелёная слизь</entry>
<entry key="item.tconstruct.storage.knapsack.name">Ранец</entry>
<entry key="item.tconstruct.blankpattern.pattern.name">Пустая схема</entry>
<entry key="item.tconstruct.blankpattern.cast.name">Чистый чугун</entry>
@@ -265,6 +303,14 @@
<entry key="item.tconstruct.bucket.Stone.name">Ведро расплавленного обожжённого камня</entry>
<entry key="item.tconstruct.bucket.Villager.name">Ведро сжиженного изумруда</entry>
<entry key="item.tconstruct.bucket.Cow.name">Ведро крови</entry>
<entry key="item.tconstruct.bucket.Nickel.name">Ведро расплавленного никеля</entry>
<entry key="item.tconstruct.bucket.Lead.name">Ведро расплавленного свинца</entry>
<entry key="item.tconstruct.bucket.Silver.name">Ведро расплавленного серебра</entry>
<entry key="item.tconstruct.bucket.Shiny.name">Ведро расплавленного блеска</entry>
<entry key="item.tconstruct.bucket.Invar.name">Ведро расплавленного инвара</entry>
<entry key="item.tconstruct.bucket.Electrum.name">Ведро расплавленного электрума</entry>
<entry key="item.tconstruct.bucket.Ender.name">Ведро сжиженного эндера</entry>
<entry key="item.tconstruct.bucket.Slime.name">Ведро жидкой слизи</entry>
<entry key="item.tconstruct.bowstring.string.name">Тетива</entry>
<entry key="item.tconstruct.bowstring.enchantedfabriI donc.name">Зачарованная тетива</entry>
@@ -285,14 +331,21 @@
<entry key="tile.metal.molten.glass.name">Расплавленное стекло</entry>
<entry key="tile.molten.stone.name">Расплавленный обожжённый камень</entry>
<entry key="tile.molten.emerald.name">Сжиженный изумруд</entry>
<entry key="tile.molten.blood.name">Кровь</entry>
<entry key="tile.liquid.blood.name">Кровь</entry>
<entry key="tile.metal.molten.nickel.name">Расплавленный никель</entry>
<entry key="tile.metal.molten.silver.name">Расплавленное серебро</entry>
<entry key="tile.metal.molten.lead.name">Расплавленный свинец</entry>
<entry key="tile.metal.molten.shiny.name">Расплавленный блеск</entry>
<entry key="tile.metal.molten.invar.name">Расплавленный инвар</entry>
<entry key="tile.metal.molten.Electrum.name">Расплавленный электрум</entry>
<entry key="tile.liquid.ender.name">Сжиженный эндер</entry>
<entry key="item.food.apple.diamond.name">Драгоценное яблоко</entry>
<entry key="item.tconstruct.strangefood.edibleslime.name">Желатиновая слизь</entry>
<entry key="item.tconstruct.canister.empty.name">Пустая жестяная коробка</entry>
<entry key="item.tconstruct.canister.miniheart.red.name">Миниатюрное красное сердце</entry>
<entry key="item.tconstruct.canister.heart.name">Лечащая жестяная коробка</entry>
<entry key="item.tconstruct.glove.name">Dirtmover Gloves</entry>
<entry key="item.tconstruct.glove.name">Перчатки для перемещения земли</entry>
<entry key="SearedBlock.Table.name">Литейный стол</entry>
<entry key="SearedBlock.Faucet.name">Seared Faucet</entry>
@@ -300,35 +353,39 @@
<entry key="entity.TConstruct.EdibleSlime.name">Синий слизень</entry>
<entry key="entity.TConstruct.KingSlime.name">Король слизней</entry>
<entry key="entity.TConstruct.MiniGardy.name">Слизень охраник</entry>
<entry key="entity.TConstruct.Gardeslime.name">Слизень охраник</entry>
<entry key="key.tarmor">Armor Gui</entry>
<entry key="key.tcapes.reload">Перезагрузить плащи</entry>
<entry key="death.one.smeltery">%1$s превратился в зелёный сойлент</entry>
<entry key="death.two.smeltery">%1$s сплавился с плавильней</entry>
<entry key="death.three.smeltery">%1$s станет ступенькой в нашей революции!</entry>
<entry key="death.four.smeltery">%1$s думал, что купание в горячих жидкостях хорошая идея</entry>
<entry key="death.attack.Landmine">%1$s наблюдал за тем как его ноги взорвались</entry>
<entry key="death.fell.assist.Landmine">%1$s был обречён на смерть от мины</entry>
<entry key="death.attack.LandmineFireworkExplode">%1$s взял поездку на фейерверк</entry>
<entry key="parttype.Wood">Wooden</entry>
<entry key="parttype.Stone">Stone</entry>
<entry key="parttype.Iron">Iron</entry>
<entry key="parttype.Flint">Flint</entry>
<entry key="parttype.Cactus">Cactus</entry>
<entry key="parttype.Bone">Bone</entry>
<entry key="parttype.Obsidian">Obsidian</entry>
<entry key="parttype.Slime">Slime</entry>
<entry key="parttype.Paper">Paper</entry>
<entry key="parttype.Cobalt">Cobalt</entry>
<entry key="parttype.Ardite">Ardite</entry>
<entry key="parttype.Manyullyn">Manyullyn</entry>
<entry key="parttype.Copper">Copper</entry>
<entry key="parttype.Bronze">Bronze</entry>
<entry key="parttype.Alumite">Alumite</entry>
<entry key="parttype.Steel">Steel</entry>
<entry key="parttype.BlueSlime">Slime</entry>
<entry key="molten iron">Расплавленное железо</entry>
<entry key="molten gold">Расплавленное золото</entry>
<entry key="molten copper">Расплавленная медь</entry>
<entry key="molten tin">Расплавленное олово</entry>
<entry key="molten aluminum">Расплавленный алюминий</entry>
<entry key="molten cobalt">Расплавленный кобальт</entry>
<entry key="molten ardite">Расплавленный ардит</entry>
<entry key="molten bronze">Расплавленная бронза</entry>
<entry key="molten aluminum brass">Расплавленная алюминиевая латунь</entry>
<entry key="molten manyullyn">Расплавленный мануллин</entry>
<entry key="molten alumite">Расплавленный алюмит</entry>
<entry key="molten obsidian">Расплавленный обсидиан</entry>
<entry key="molten steel">Расплавленная сталь</entry>
<entry key="molten glass">Расплавленное стекло</entry>
<entry key="seared stone">Обожжённый камень</entry>
<entry key="liquified emerald">Сжиженный изумруд</entry>
<entry key="blood">Кровь</entry>
<entry key="molten nickel">Расплавленный никель</entry>
<entry key="molten lead">Расплавленный свинец</entry>
<entry key="molten silver">Расплавленное серебро</entry>
<entry key="molten platinum">Расплавленная платина</entry>
<entry key="molten invar">Расплавленный инвар</entry>
<entry key="molten shiny">Расплавленный блеск</entry>
<entry key="ender">Жидкий эндер</entry>
</properties>
+18 -22
View File
@@ -271,23 +271,23 @@
<entry key="item.tconstruct.bowstring.string.name">弓弦</entry>
<entry key="item.tconstruct.bowstring.enchantedfabriI donc.name">附魔弓弦</entry>
<entry key="LiquidMetal.Iron.name">液态铁</entry>
<entry key="LiquidMetal.Gold.name">液态黄金</entry>
<entry key="LiquidMetal.Copper.name">液态铜</entry>
<entry key="LiquidMetal.Tin.name">液态锡</entry>
<entry key="LiquidMetal.Aluminum.name">液态铝</entry>
<entry key="LiquidMetal.Cobalt.name">液态钴</entry>
<entry key="LiquidMetal.Ardite.name">液态阿迪特</entry>
<entry key="LiquidMetal.Bronze.name">液态青铜</entry>
<entry key="LiquidMetal.AluBrass.name">液态含铝黄铜</entry>
<entry key="LiquidMetal.Manyullyn.name">液态玛玉灵</entry>
<entry key="LiquidMetal.Alumite.name">液态耐酸铝</entry>
<entry key="LiquidMetal.Obsidian.name">液态黑曜石</entry>
<entry key="LiquidMetal.Steel.name">液态钢</entry>
<entry key="LiquidMetal.Glass.name">液态玻璃</entry>
<entry key="LiquidMetal.Stone.name">熔融石头</entry>
<entry key="LiquidMetal.Villager.name">液态绿宝石</entry>
<entry key="LiquidMetal.Cow.name">血</entry>
<entry key="tile.metal.molten.iron.name">液态铁</entry>
<entry key="tile.metal.molten.gold.name">液态黄金</entry>
<entry key="tile.metal.molten.copper.name">液态铜</entry>
<entry key="tile.metal.molten.tin.name">液态锡</entry>
<entry key="tile.metal.molten.aluminum.name">液态铝</entry>
<entry key="tile.metal.molten.cobalt.name">液态钴</entry>
<entry key="tile.metal.molten.ardite.name">液态阿迪特</entry>
<entry key="tile.metal.molten.bronze.name">液态青铜</entry>
<entry key="tile.metal.molten.alubrass.name">液态含铝黄铜</entry>
<entry key="tile.metal.molten.manyullyn.name">液态玛玉灵</entry>
<entry key="tile.metal.molten.alumite.name">液态耐酸铝</entry>
<entry key="tile.metal.molten.obsidian.name">液态黑曜石</entry>
<entry key="tile.metal.molten.steel.name">液态钢</entry>
<entry key="tile.metal.molten.glass.name">液态玻璃</entry>
<entry key="tile.molten.stone.name">熔融石头</entry>
<entry key="tile.molten.emerald.name">液态绿宝石</entry>
<entry key="tile.liquid.blood.name">血</entry>
<entry key="item.food.apple.diamond.name">宝石苹果</entry>
<entry key="item.tconstruct.strangefood.edibleslime.name">胶状黏液</entry>
@@ -302,7 +302,7 @@
<entry key="entity.TConstruct.EdibleSlime.name">蓝色史莱姆</entry>
<entry key="entity.TConstruct.KingSlime.name">史莱姆王</entry>
<entry key="entity.TConstruct.MiniGardy.name">史莱姆护卫</entry>
<entry key="entity.TConstruct.Gardeslime.name">史莱姆护卫</entry>
<entry key="key.tarmor">装备界面</entry>
@@ -311,10 +311,6 @@
<entry key="death.three.smeltery">%1$s将成为我们革命的垫脚石!</entry>
<entry key="death.four.smeltery">%1$s认为在炽热的液体中游泳是个不错的注意!</entry>
<entry key="death.attack.Landmine">%1$s眼看着他们的腿被炸飞了!</entry>
<entry key="death.fell.assist.Landmine">%1$s被地雷炸死了!</entry>
<entry key="death.attack.LandmineFireworkExplode">%1$s骑着烟花火箭飞上了西天!</entry>
<entry key="parttype.Wood">木</entry>
<entry key="parttype.Stone">石</entry>
<entry key="parttype.Iron">铁</entry>
Binary file not shown.

After

Width:  |  Height:  |  Size: 496 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 184 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 214 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 215 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 220 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 B

+7 -1
View File
@@ -8,6 +8,8 @@ import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.gui.inventory.GuiInventory;
import net.minecraft.client.settings.KeyBinding;
import net.minecraft.network.packet.Packet250CustomPayload;
import tconstruct.client.event.EventCloakRender;
import tconstruct.client.tabs.TabRegistry;
import cpw.mods.fml.common.TickType;
import cpw.mods.fml.common.network.PacketDispatcher;
@@ -17,6 +19,7 @@ public class TControls extends TKeyHandler
//static KeyBinding grabKey = new KeyBinding("key.grab", 29);
//static KeyBinding stiltsKey = new KeyBinding("key.stilts", 46);
public static KeyBinding armorKey = new KeyBinding("key.tarmor", 24);
public static KeyBinding refreshCapes = new KeyBinding("key.tcapes.reload", 88);
static KeyBinding jumpKey;
static KeyBinding invKey;
static Minecraft mc;
@@ -33,7 +36,7 @@ public class TControls extends TKeyHandler
public TControls()
{
super(new KeyBinding[] { armorKey }, new boolean[] { false}, getVanillaKeyBindings(),
super(new KeyBinding[] { armorKey, refreshCapes }, new boolean[] { false, false }, getVanillaKeyBindings(),
new boolean[] { false, false });
//System.out.println("Controls registered");
}
@@ -65,6 +68,9 @@ public class TControls extends TKeyHandler
{
TabRegistry.addTabsToInventory((GuiContainer) mc.currentScreen);
}
if (kb == refreshCapes && mc.currentScreen == null){
EventCloakRender.instance.refreshCapes();
}
/*if (kb == jumpKey) //Double jump
{
if (jumping && !doubleJump)
+1 -1
View File
@@ -823,7 +823,7 @@ public class TProxyClient extends TProxyCommon
}
}
String[] bowstringTypes = { "string", "magicfabric" };
String[] bowstringTypes = { "string", "magicfabric", "flamestring" };
for (int bowIter = 0; bowIter < bowstringTypes.length; bowIter++)
{
TConstructClientRegistry.addAlternateMaterialRenderMapping(TContent.shortbow, bowIter, "tinker", bowstringTypes[bowIter], true);
+14 -2
View File
@@ -4,7 +4,7 @@ import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.*;
import java.net.*;
import java.util.HashMap;
import java.util.*;
import javax.swing.ImageIcon;
@@ -19,9 +19,13 @@ public class EventCloakRender {
private static final Graphics TEST_GRAPHICS = new BufferedImage(128, 128, BufferedImage.TYPE_INT_RGB).getGraphics();
private HashMap<String, String> cloaks = new HashMap<String, String>();
private ArrayList<AbstractClientPlayer> capePlayers = new ArrayList<AbstractClientPlayer>();
public static EventCloakRender instance;
public EventCloakRender(){
buildCloakURLDatabase();
instance = this;
}
@ForgeSubscribe
@@ -29,13 +33,15 @@ public class EventCloakRender {
if(event.entityPlayer instanceof AbstractClientPlayer){
AbstractClientPlayer abstractClientPlayer = (AbstractClientPlayer)event.entityPlayer;
if (abstractClientPlayer.func_110310_o().field_110560_d == null) {
if (!capePlayers.contains(abstractClientPlayer)) {
String cloakURL = cloaks.get(event.entityPlayer.username);
if(cloakURL == null){
return;
}
capePlayers.add(abstractClientPlayer);
abstractClientPlayer.func_110310_o().field_110559_g = false;
new Thread(new CloakThread(abstractClientPlayer, cloakURL)).start();
event.renderCape = true;
@@ -114,4 +120,10 @@ public class EventCloakRender {
}
}
}
public void refreshCapes(){
cloaks.clear();
capePlayers.clear();
buildCloakURLDatabase();
}
}
+39 -200
View File
@@ -1,216 +1,48 @@
package tconstruct.common;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.*;
import cpw.mods.fml.common.*;
import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.registry.*;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDispenser;
import net.minecraft.block.StepSound;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;
import net.minecraft.block.material.MaterialLiquid;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraft.item.crafting.ShapedRecipes;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.Potion;
import net.minecraft.util.WeightedRandomChestContent;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.common.BiomeDictionary;
import net.minecraftforge.common.ChestGenHooks;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
import tconstruct.TConstruct;
import tconstruct.blocks.Aggregator;
import tconstruct.blocks.CraftingSlab;
import tconstruct.blocks.CraftingStationBlock;
import tconstruct.blocks.DryingRack;
import tconstruct.blocks.EquipBlock;
import tconstruct.blocks.EssenceExtractor;
import tconstruct.blocks.GlassBlockConnected;
import tconstruct.blocks.GlassBlockConnectedMeta;
import tconstruct.blocks.GlassPane;
import tconstruct.blocks.GlassPaneStained;
import tconstruct.blocks.GravelOre;
import tconstruct.blocks.LavaTankBlock;
import tconstruct.blocks.LightCrystalBase;
import tconstruct.blocks.LiquidMetalFinite;
import tconstruct.blocks.MeatBlock;
import tconstruct.blocks.MetalOre;
import tconstruct.blocks.MultiBrick;
import tconstruct.blocks.MultiBrickFancy;
import tconstruct.blocks.OreberryBush;
import tconstruct.blocks.OreberryBushEssence;
import tconstruct.blocks.RedstoneMachine;
import tconstruct.blocks.SearedBlock;
import tconstruct.blocks.SearedSlab;
import tconstruct.blocks.SlabBase;
import tconstruct.blocks.SmelteryBlock;
import tconstruct.blocks.SoilBlock;
import tconstruct.blocks.SpeedBlock;
import tconstruct.blocks.SpeedSlab;
import tconstruct.blocks.StoneTorch;
import tconstruct.blocks.TMetalBlock;
import tconstruct.blocks.ToolForgeBlock;
import tconstruct.blocks.ToolStationBlock;
import tconstruct.blocks.logic.CastingBasinLogic;
import tconstruct.blocks.logic.CastingTableLogic;
import tconstruct.blocks.logic.CraftingStationLogic;
import tconstruct.blocks.logic.DrawbridgeLogic;
import tconstruct.blocks.logic.DryingRackLogic;
import tconstruct.blocks.logic.EssenceExtractorLogic;
import tconstruct.blocks.logic.FaucetLogic;
import tconstruct.blocks.logic.FirestarterLogic;
import tconstruct.blocks.logic.FrypanLogic;
import tconstruct.blocks.logic.GlowstoneAggregator;
import tconstruct.blocks.logic.LavaTankLogic;
import tconstruct.blocks.logic.MultiServantLogic;
import tconstruct.blocks.logic.PartBuilderLogic;
import tconstruct.blocks.logic.PatternChestLogic;
import tconstruct.blocks.logic.SmelteryDrainLogic;
import tconstruct.blocks.logic.SmelteryLogic;
import tconstruct.blocks.logic.StencilTableLogic;
import tconstruct.blocks.logic.ToolForgeLogic;
import tconstruct.blocks.logic.ToolStationLogic;
import tconstruct.blocks.slime.SlimeFluid;
import tconstruct.blocks.slime.SlimeGel;
import tconstruct.blocks.slime.SlimeGrass;
import tconstruct.blocks.slime.SlimeLeaves;
import tconstruct.blocks.slime.SlimeSapling;
import tconstruct.blocks.slime.SlimeTallGrass;
import tconstruct.blocks.traps.BarricadeBlock;
import tconstruct.blocks.traps.Punji;
import tconstruct.blocks.*;
import tconstruct.blocks.logic.*;
import tconstruct.blocks.slime.*;
import tconstruct.blocks.traps.*;
import tconstruct.client.StepSoundSlime;
import tconstruct.entity.Automaton;
import tconstruct.entity.BlueSlime;
import tconstruct.entity.Crystal;
import tconstruct.entity.FancyEntityItem;
import tconstruct.entity.MiniGardy;
import tconstruct.entity.SlimeClone;
import tconstruct.entity.projectile.ArrowEntity;
import tconstruct.entity.projectile.DaggerEntity;
import tconstruct.entity.projectile.LaunchedPotion;
import tconstruct.items.Bowstring;
import tconstruct.items.CraftingItem;
import tconstruct.items.DiamondApple;
import tconstruct.items.EssenceCrystal;
import tconstruct.items.FilledBucket;
import tconstruct.items.Fletching;
import tconstruct.items.GoldenHead;
import tconstruct.items.Manual;
import tconstruct.items.MaterialItem;
import tconstruct.items.MetalPattern;
import tconstruct.items.OreBerries;
import tconstruct.items.Pattern;
import tconstruct.items.StrangeFood;
import tconstruct.items.TitleIcon;
import tconstruct.items.ToolPart;
import tconstruct.items.ToolPartHidden;
import tconstruct.items.ToolShard;
import tconstruct.items.armor.Glove;
import tconstruct.items.armor.HeartCanister;
import tconstruct.items.armor.Knapsack;
import tconstruct.items.armor.TArmorBase;
import tconstruct.items.blocks.BarricadeItem;
import tconstruct.items.blocks.CraftedSoilItemBlock;
import tconstruct.items.blocks.CraftingSlabItemBlock;
import tconstruct.items.blocks.GlassBlockItem;
import tconstruct.items.blocks.GlassPaneItem;
import tconstruct.items.blocks.GravelOreItem;
import tconstruct.items.blocks.LavaTankItemBlock;
import tconstruct.items.blocks.LightCrystalItem;
import tconstruct.items.blocks.MetalItemBlock;
import tconstruct.items.blocks.MetalOreItemBlock;
import tconstruct.items.blocks.MultiBrickFancyItem;
import tconstruct.items.blocks.MultiBrickItem;
import tconstruct.items.blocks.OreberryBushItem;
import tconstruct.items.blocks.OreberryBushSecondItem;
import tconstruct.items.blocks.RedstoneMachineItem;
import tconstruct.items.blocks.SearedSlabItem;
import tconstruct.items.blocks.SearedTableItemBlock;
import tconstruct.items.blocks.SlimeGelItemBlock;
import tconstruct.items.blocks.SlimeGrassItemBlock;
import tconstruct.items.blocks.SlimeLeavesItemBlock;
import tconstruct.items.blocks.SlimeSaplingItemBlock;
import tconstruct.items.blocks.SlimeTallGrassItem;
import tconstruct.items.blocks.SmelteryItemBlock;
import tconstruct.items.blocks.SpeedBlockItem;
import tconstruct.items.blocks.SpeedSlabItem;
import tconstruct.items.blocks.StainedGlassClearItem;
import tconstruct.items.blocks.StainedGlassClearPaneItem;
import tconstruct.items.blocks.ToolForgeItemBlock;
import tconstruct.items.blocks.ToolStationItemBlock;
import tconstruct.items.blocks.WoolSlab1Item;
import tconstruct.items.blocks.WoolSlab2Item;
import tconstruct.items.tools.Arrow;
import tconstruct.items.tools.BattleSign;
import tconstruct.items.tools.Battleaxe;
import tconstruct.items.tools.Broadsword;
import tconstruct.items.tools.Chisel;
import tconstruct.items.tools.Cleaver;
import tconstruct.items.tools.Cutlass;
import tconstruct.items.tools.Dagger;
import tconstruct.items.tools.Excavator;
import tconstruct.items.tools.FryingPan;
import tconstruct.items.tools.Hammer;
import tconstruct.items.tools.Hatchet;
import tconstruct.items.tools.Longsword;
import tconstruct.items.tools.LumberAxe;
import tconstruct.items.tools.Mattock;
import tconstruct.items.tools.Pickaxe;
import tconstruct.items.tools.PotionLauncher;
import tconstruct.items.tools.Rapier;
import tconstruct.items.tools.Scythe;
import tconstruct.items.tools.Shortbow;
import tconstruct.items.tools.Shovel;
import tconstruct.entity.*;
import tconstruct.entity.projectile.*;
import tconstruct.items.*;
import tconstruct.items.armor.*;
import tconstruct.items.blocks.*;
import tconstruct.items.tools.*;
import tconstruct.landmine.block.BlockLandmine;
import tconstruct.landmine.item.ItemBlockLandmine;
import tconstruct.landmine.tileentity.TileEntityLandmine;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.client.TConstructClientRegistry;
import tconstruct.library.crafting.Detailing;
import tconstruct.library.crafting.DryingRackRecipes;
import tconstruct.library.crafting.LiquidCasting;
import tconstruct.library.crafting.PatternBuilder;
import tconstruct.library.crafting.Smeltery;
import tconstruct.library.crafting.ToolBuilder;
import tconstruct.library.crafting.*;
import tconstruct.library.tools.ToolCore;
import tconstruct.library.util.IPattern;
import tconstruct.modifiers.ModAntiSpider;
import tconstruct.modifiers.ModAttack;
import tconstruct.modifiers.ModAutoSmelt;
import tconstruct.modifiers.ModBlaze;
import tconstruct.modifiers.ModButtertouch;
import tconstruct.modifiers.ModDurability;
import tconstruct.modifiers.ModElectric;
import tconstruct.modifiers.ModExtraModifier;
import tconstruct.modifiers.ModInteger;
import tconstruct.modifiers.ModLapis;
import tconstruct.modifiers.ModPiston;
import tconstruct.modifiers.ModRedstone;
import tconstruct.modifiers.ModReinforced;
import tconstruct.modifiers.ModRepair;
import tconstruct.modifiers.ModSmite;
import tconstruct.modifiers.TActiveOmniMod;
import tconstruct.util.PHConstruct;
import tconstruct.util.RecipeRemover;
import tconstruct.util.TDispenserBehaviorSpawnEgg;
import cpw.mods.fml.common.IFuelHandler;
import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import tconstruct.modifiers.*;
import tconstruct.util.*;
import net.minecraft.block.*;
import net.minecraft.block.material.*;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.*;
import net.minecraft.item.crafting.*;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.Potion;
import net.minecraft.util.WeightedRandomChestContent;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.common.*;
import net.minecraftforge.fluids.*;
import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
import net.minecraftforge.oredict.*;
public class TContent implements IFuelHandler
{
@@ -2145,6 +1977,13 @@ public class TContent implements IFuelHandler
{
System.out.println("[TConstruct] Thaumcraft not detected.");
}
if(Loader.isModLoaded("Natura")){
try{
Object plantItem = getStaticItem("plantItem", "mods.natura.common.NContent");
TConstructRegistry.addBowstringMaterial(2, 2, new ItemStack((Item)plantItem, 1, 7), new ItemStack(bowstring, 1, 2), 1.2F, 0.8F, 1.3f);
}catch(Exception e){} //No need to handle
}
ItemStack ingotcast = new ItemStack(metalPattern, 1, 0);
LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting();
+7 -2
View File
@@ -2,11 +2,14 @@ package tconstruct.items;
import java.util.List;
import cpw.mods.fml.common.Loader;
import tconstruct.common.TContent;
import tconstruct.library.util.IToolPart;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
public class Bowstring extends CraftingItem implements IToolPart
{
@@ -30,9 +33,9 @@ public class Bowstring extends CraftingItem implements IToolPart
return names;
}
public static final String[] toolMaterialNames = new String[] { "string", "enchantedfabric" };
public static final String[] toolMaterialNames = new String[] { "string", "enchantedfabric", "flamestring" };
public static final String[] toolTextureNames = new String[] { "string", "magicfabric" };
public static final String[] toolTextureNames = new String[] { "string", "magicfabric", "flamestring" };
@Override
public int getMaterialID (ItemStack stack)
@@ -45,5 +48,7 @@ public class Bowstring extends CraftingItem implements IToolPart
list.add(new ItemStack(id, 1, 0));
if (TContent.thaumcraftAvailable)
list.add(new ItemStack(id, 1, 1));
if (Loader.isModLoaded("Natura"))
list.add(new ItemStack(id, 1, 2));
}
}
+1 -1
View File
@@ -57,7 +57,7 @@ public class BlockLandmine extends BlockContainer {
@Override
public int getLightValue(IBlockAccess world, int x, int y, int z) {
if (world.getBlockTileEntity(x, y, z) instanceof TileEntityLandmine) {
if (world.getBlockId(x, y, z) == this.blockID && world.getBlockTileEntity(x, y, z) instanceof TileEntityLandmine) {
TileEntityLandmine te = (TileEntityLandmine) world.getBlockTileEntity(x, y, z);
if (te != null) {