diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index c15ef361..f59fe2c4 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -574,6 +574,7 @@ fluid.electrum.molten=Molten Electrum fluid.ender=Liquid Ender fluid.slime.blue=Liquid Blueslime fluid.pigiron.molten=Pig Iron +fluid.glue=Glue tconstruct.achievementPage.name=TConstruct achievement.tconstruct.beginner=Learning to Tinker @@ -606,12 +607,12 @@ fancybrick1.tooltip=Somewhat expensive fancybrick2.tooltip=Quite expensive fancybrick3.tooltip=Emits Redstone signal up to fancybrick4.tooltip=4 blocks away -fancybrick4.tooltip=Bouncy! +fancybric54.tooltip=Bouncy! brick1.tooltip=Somewhat expensive brick2.tooltip=Quite expensive brick3.tooltip=Emits Redstone signal up to brick4.tooltip=4 blocks away -brick4.tooltip=Bouncy! +brick5.tooltip=Bouncy! craftedsoil.slab1.tooltip=Heals Undead craftedsoil.slab2.tooltip=Harmful to Undead speedblock1.tooltip=You run pretty fast on it @@ -638,6 +639,7 @@ landmine1.tooltip=everything landmine2.tooltip=mobs, players and redstone landmine3.tooltip=players and redstone landmine4.tooltip=redstone only +landmine5.tooltip=Interacts with: goldenhead1.tooltip=Some say consuming the head of a goldenhead2.tooltip=fallen foe strengthens the blood oreberrybush1.tooltip=Sweet Irony diff --git a/resources/assets/tinker/lang/it_IT.lang b/resources/assets/tinker/lang/it_IT.lang index c20dcb10..f5981008 100644 --- a/resources/assets/tinker/lang/it_IT.lang +++ b/resources/assets/tinker/lang/it_IT.lang @@ -245,7 +245,7 @@ item.tconstruct.Materials.AlumiteNugget.name=Pepita di Alumite item.tconstruct.Materials.SteelNugget.name=Pepita d'Acciaio item.tconstruct.Materials.PigIronIngot.name=Lingotto di Ferro Suino item.tconstruct.Materials.PigIronNugget.name=Piatto di Ferro Suino -item.tconstruct.Materials.GlueBall.name=Palla di Colla +item.tconstruct.Materials.GlueIngot.name=Lingotto di Colla item.tconstruct.helmetWood.name=Elmo di Legno item.tconstruct.chestplateWood.name=Corazza di Legno @@ -415,7 +415,7 @@ item.tconstruct.bucket.Invar.name=Secchio di Invaro Fuso item.tconstruct.bucket.Electrum.name=Secchio di Elettro Fuso item.tconstruct.bucket.Ender.name=Secchio di Ender Liquefatto item.tconstruct.bucket.Slime.name=Secchio di Slime Liquido -item.tconstruct.bucket.PigIron.name==Secchio di Ferro Suino Fuso +item.tconstruct.bucket.PigIron.name=Secchio di Ferro Suino Fuso item.tconstruct.bucket.Glue.name=Secchio di Colla Appiccicosa item.tconstruct.bowstring.string.name=Corda d'Arco @@ -594,9 +594,9 @@ achievement.tconstruct.enemySlayer.desc=Uccidi un mob achievement.tconstruct.convenientDuo=Uccidi un mob con una padella, e cuoci la sua carne in questa knapsack.tooltip=Uno Zaino per tenere le tue cosse. -strangefood1.tooltip=\u00a7b\u00a7opuzza terribimente, ma se= -strangefood2.tooltip=\u00a7b\u00a7onon hai nient'altro da mangiare...= -hambone1.tooltip=\u00A74Hambone! +strangefood1.tooltip=\u00a7b\u00a7opuzza terribimente, ma se +strangefood2.tooltip=\u00a7b\u00a7onon hai nient'altro da mangiare... +hambone1.tooltip=\u00A74Prosciutto! hambone2.tooltip=Usabile come base per il Faro metalblock.tooltip=Usabile come base per il Faro craftedsoil1.tooltip=Cura i non-morti @@ -637,15 +637,16 @@ landmine1.tooltip=tutto landmine2.tooltip=mob, giocatori e pietrarossa landmine3.tooltip=giocatori e pietrarossa landmine4.tooltip=solo pietrarossa +landmine5.tooltip=Interagisce con: goldenhead1.tooltip=\u00a75\u00a7oQualcuno di che mangiando la testa di un goldenhead2.tooltip=\u00a75\u00a7onemico caduto rinforza il sangue oreberrybush1.tooltip=Dolce Ferro oreberrybush2.tooltip=Puro Lustro -oreberrybush3.tooltip=Ha il gusto di metallo +oreberrybush3.tooltip=Sa di metallo oreberrybush4.tooltip=Uomo di Latta oreberrybush5.tooltip=Cioccolato Bianco oreberrybush6.tooltip=Ha il sapore di un Creeper -barricade.tooltip=Stacks up to 4 times -pattern1.tooltip=Costo di Materiale: -pattern2.tooltip=Costo di Materiale: -potionlauncher.tooltip=Oggetto di prova +barricade.tooltip=Ne puoi usare 4 alla volta +pattern1.tooltip=Costa di Materiale: +pattern2.tooltip=Costa di Materiale: +potionlauncher.tooltip=Oggetto di prova \ No newline at end of file diff --git a/resources/assets/tinker/lang/ru_RU.lang b/resources/assets/tinker/lang/ru_RU.lang index 5a2d7846..71cf4e6c 100644 --- a/resources/assets/tinker/lang/ru_RU.lang +++ b/resources/assets/tinker/lang/ru_RU.lang @@ -223,7 +223,7 @@ item.tconstruct.Materials.AlumiteNugget.name=Алюмитовый самород item.tconstruct.Materials.SteelNugget.name=Кусочек стали item.tconstruct.Materials.PigIronIngot.name=Чугунный слиток item.tconstruct.Materials.PigIronNugget.name=Чугунная тарелка -item.tconstruct.Materials.GlueIngot.name=Слиток клея +item.tconstruct.Materials.GlueBall.name=Шарик клея item.tconstruct.ArmorPattern.helmet.name=Слепок шлема item.tconstruct.ArmorPattern.chestplate.name=Слепок кирасы @@ -521,12 +521,12 @@ achievement.tconstruct.proTinkerer.desc=Создайте свой первый " achievement.tconstruct.smelteryMaker.desc=Создайте компонент плавильни achievement.tconstruct.preparedFight.desc=Создайте своё первое оружие achievement.tconstruct.enemySlayer.desc=Убейте моба -achievement.tconstruct.dualConvenience.desc=Убийте моба сковородой, а затем приготовьте его мясо на ней +achievement.tconstruct.dualConvenience.desc=Убейте моба сковородой, а затем приготовьте его мясо на ней knapsack.tooltip=Ранец для хранения ваших вещей. -strangefood1.tooltip=\u00a7b\u00a7oПахнет ужасно, но если вам= -strangefood2.tooltip=\u00a7b\u00a7oбольше нечего поесть...= -hambone1.tooltip=\u00A74Hambone! +strangefood1.tooltip=Пахнет ужасно, но если вам +strangefood2.tooltip=больше нечего поесть... +hambone1.tooltip=Hambone! hambone2.tooltip=Подходит для основания маяка metalblock.tooltip=Подходит для основания маяка craftedsoil1.tooltip=Лечит нежить @@ -535,21 +535,21 @@ fancybrick1.tooltip=Несколько дорогой fancybrick2.tooltip=Довольно дорогой fancybrick3.tooltip=Излучает сигнал красн. камня до fancybrick4.tooltip=4 блоков -fancybrick4.tooltip=Упругий! +fancybrick5.tooltip=Упругий! brick1.tooltip=Несколько дорогой brick2.tooltip=Довольно дорогой brick3.tooltip=Излучает сигнал красн. камня до brick4.tooltip=4 блоков -brick4.tooltip=Упругий! +brick5.tooltip=Упругий! craftedsoil.slab1.tooltip=Лечит нежить craftedsoil.slab2.tooltip=Губительно для нежити speedblock1.tooltip=Вы бегаете довольно быстро на этом speedblock2.tooltip=Вы бегаете немного быстрее на этом speedblock.slab1.tooltip=Вы бегаете довольно быстро на этом speedblock.slab2.tooltip=Вы бегаете немного быстрее на этом -manual1.tooltip=\u00a7oBy: Skyla -manual2.tooltip=\u00a7oBy: Skyla -manual3.tooltip=\u00a7oBy: Thruul M'gon +manual1.tooltip=Автор: Skyla +manual2.tooltip=Автор: Skyla +manual3.tooltip=Автор: Thruul M'gon searedtank1.tooltip=Содержит searedtank2.tooltip=Сохраняет любые имеющиеся жидкости, когда собирает их oreberries1.tooltip=Сладкое железо @@ -567,8 +567,9 @@ landmine1.tooltip=со всем landmine2.tooltip=мобами, игроками и красным камнем landmine3.tooltip=игроками и красным камнем landmine4.tooltip=только с красным камнем -goldenhead1.tooltip=\u00a75\u00a7oНекоторые говорят, что употребление головы -goldenhead2.tooltip=\u00a75\u00a7oпавшего врага укрепляет кровь +landmine5.tooltip=Взаимодействует с: +goldenhead1.tooltip=Некоторые говорят, что употребление головы +goldenhead2.tooltip=павшего врага укрепляет кровь oreberrybush1.tooltip=Сладкое железо oreberrybush2.tooltip=Чистый блеск oreberrybush3.tooltip=На вкус как металл @@ -579,3 +580,8 @@ barricade.tooltip=Stacks up to 4 times pattern1.tooltip=Material Cost: pattern2.tooltip=Material Cost: potionlauncher.tooltip=Тестовый предмет +smeltery.controller.tooltip=Мозг плавильни +smeltery.drain.tooltip1=Работает в качестве входа и выхода для +smeltery.drain.tooltip2=жидкостей в плавильне +smeltery.brick.tooltip1=Структурный блок плавильни +smeltery.brick.tooltip2=(Безопасен для декораций) diff --git a/resources/assets/tinker/lang/zh_CN.lang b/resources/assets/tinker/lang/zh_CN.lang index 7eb7dc11..e5ed9b6c 100644 --- a/resources/assets/tinker/lang/zh_CN.lang +++ b/resources/assets/tinker/lang/zh_CN.lang @@ -98,11 +98,6 @@ block.fancybrick.obsidian.ingot.name=平滑黑曜石锭砖 block.fancybrick.stone.road.name=铺路石 block.fancybrick.stone.name=平滑石砖 -tile.rail.wood.name=木轨 - -tile.signalbus.name=信号总线 -tile.signalterminal.name=信号终端 - tile.cloth.white.slab.name=羊毛台阶 tile.cloth.orange.slab.name=橙色羊毛台阶 tile.cloth.magenta.slab.name=品红色羊毛台阶 @@ -120,6 +115,9 @@ tile.cloth.green.slab.name=绿色羊毛台阶 tile.cloth.red.slab.name=红色羊毛台阶 tile.cloth.black.slab.name=黑色羊毛台阶 +tile.GlueBlock.name=凝胶方块 +tile.liquid.glue.name=凝胶 + item.oreberry.iron.name=铁矿莓 item.oreberry.gold.name=金矿莓 item.oreberry.copper.name=锡矿莓 @@ -130,9 +128,6 @@ item.oreberry.essence.name=精华莓 item.goldenhead.name=黄金头颅 item.tconstruct.titleicon.name=生成 -item.spoolwire.name=线轴 -item.lengthwire.name=线长 - item.InfiTool.Pickaxe.name=镐 item.InfiTool.Shovel.name=铲 item.InfiTool.Axe.name=手斧 @@ -152,7 +147,7 @@ item.InfiTool.Battleaxe.name=战斧 item.InfiTool.Cutlass.name=弯刀 item.InfiTool.Shortbow.name=短弓 item.InfiTool.Arrow.name=箭矢 -item.InfiTool.PotionLauncher.name=毒镖发射器 +item.InfiTool.PotionLauncher.name=药水枪 item.InfiTool.Mattock.name=鹤嘴锄 item.tconstruct.Pattern.blank_pattern.name=空白模具 @@ -209,6 +204,7 @@ item.tconstruct.MetalPattern.bowstring.name=弓弦铸形 item.tconstruct.MetalPattern.fletching.name=箭羽铸形 item.tconstruct.MetalPattern.arrowhead.name=箭头铸形 item.tconstruct.MetalPattern.ingot.name=锭铸形 +item.tconstruct.MetalPattern.gem.name=宝石铸形 item.tconstruct.Materials.PaperStack.name=纸叠 item.tconstruct.Materials.SlimeCrystal.name=粘液球水晶 @@ -227,6 +223,8 @@ item.tconstruct.Materials.BronzeIngot.name=青铜锭 item.tconstruct.Materials.AluBrassIngot.name=含铝黄铜锭 item.tconstruct.Materials.AlumiteIngot.name=耐酸铝锭 item.tconstruct.Materials.SteelIngot.name=钢锭 +item.tconstruct.Materials.PigIronIngot.name=生铁锭 +item.tconstruct.Materials.GlueBall.name=凝胶球 item.tconstruct.Materials.BlueSlimeCrystal.name=蓝色史莱姆水晶 item.tconstruct.Materials.ObsidianIngot.name=黑曜石锭 item.tconstruct.Materials.IronNugget.name=铁粒 @@ -244,6 +242,7 @@ item.tconstruct.Materials.ManyullynNugget.name=玛玉灵粒 item.tconstruct.Materials.BronzeNugget.name=青铜粒 item.tconstruct.Materials.AlumiteNugget.name=耐酸铝粒 item.tconstruct.Materials.SteelNugget.name=钢粒 +item.tconstruct.Materials.PigIronNugget.name=生铁粒 item.tconstruct.ArmorPattern.helmet.name=头盔铸形 item.tconstruct.ArmorPattern.chestplate.name=胸甲铸形 @@ -416,34 +415,36 @@ item.tconstruct.bucket.Invar.name=桶装液态因瓦合金 item.tconstruct.bucket.Electrum.name=桶装液态琥珀金 item.tconstruct.bucket.Ender.name=桶装液态末影珍珠 item.tconstruct.bucket.Slime.name=桶装史莱姆粘液 +item.tconstruct.bucket.PigIron.name=桶装液态生铁 +item.tconstruct.bucket.Glue.name=桶装粘性凝胶 item.tconstruct.bowstring.string.name=弓弦 item.tconstruct.bowstring.enchantedfabriI donc.name=附魔弓弦 -tile.metal.molten.Iron.name=液态铁 -tile.metal.molten.Gold.name=液态金 -tile.metal.molten.Copper.name=液态铜 -tile.metal.molten.Tin.name=液态锡 -tile.metal.molten.Aluminum.name=液态铝 -tile.metal.molten.Cobalt.name=液态钴 -tile.metal.molten.Ardite.name=液态阿迪特 -tile.metal.molten.Bronze.name=液态青铜 -tile.metal.molten.AluBrass.name=液态含铝黄铜 -tile.metal.molten.Manyullyn.name=液态玛玉灵 -tile.metal.molten.Alumite.name=液态耐酸铝 -tile.metal.molten.Obsidian.name=液态黑曜石 -tile.metal.molten.Steel.name=液态钢 -tile.metal.molten.Glass.name=液态玻璃 -tile.metal.molten.Stone.name=熔融石头 -tile.metal.molten.Villager.name=液态绿宝石 -tile.metal.molten.Cow.name=血 -tile.metal.molten.Nickel.name=液态镍 -tile.metal.molten.Silver.name=液态银 -tile.metal.molten.Lead.name=液态铅 -tile.metal.molten.Shiny.name=液态铂 -tile.metal.molten.Invar.name=液态因瓦合金 -tile.metal.molten.Electrum.name=液态琥珀金 -tile.metal.molten.Ender.name=液态末影珍珠 +tile.metal.molten.iron.name=液态铁 +tile.metal.molten.gold.name=液态金 +tile.metal.molten.copper.name=液态铜 +tile.metal.molten.tin.name=液态锡 +tile.metal.molten.aluminum.name=液态铝 +tile.metal.molten.cobalt.name=液态钴 +tile.metal.molten.ardite.name=液态阿迪特 +tile.metal.molten.bronze.name=液态青铜 +tile.metal.molten.aluBrass.name=液态含铝黄铜 +tile.metal.molten.manyullyn.name=液态玛玉灵 +tile.metal.molten.alumite.name=液态耐酸铝 +tile.metal.molten.obsidian.name=液态黑曜石 +tile.metal.molten.steel.name=液态钢 +tile.metal.molten.glass.name=液态玻璃 +tile.metal.molten.stone.name=熔融石头 +tile.metal.molten.villager.name=液态绿宝石 +tile.metal.molten.cow.name=血 +tile.metal.molten.nickel.name=液态镍 +tile.metal.molten.silver.name=液态银 +tile.metal.molten.lead.name=液态铅 +tile.metal.molten.shiny.name=液态铂 +tile.metal.molten.invar.name=液态因瓦合金 +tile.metal.molten.electrum.name=液态琥珀金 +tile.metal.molten.ender.name=液态末影珍珠 tile.liquid.slime.name=液态史莱姆 LiquidMetal.Iron.name=液态铁 @@ -517,6 +518,7 @@ parttype.alumite=耐酸铝 parttype.steel=钢 parttype.blueslime=史莱姆 parttype.thaumium=神秘 +parttype.pigiron=生铁 toolpart.ToolRod=%%手柄 toolpart.PickHead=%%镐头 @@ -567,6 +569,89 @@ fluid.lead.molten=液态铅 fluid.silver.molten=液态银 fluid.platinum.molten=液态铂 fluid.invar=液态因瓦合金 -fluid.shiny=液态琥珀金 +fluid.electrum.molten=液态琥珀金 +fluid.shiny=液态铂金 fluid.ender=液态末影珍珠 fluid.slime.blue=液态史莱姆 +fluid.pigiron.molten=生铁 + +tconstruct.achievementPage.name=匠魂 +achievement.tconstruct.beginner=初学手艺 +achievement.tconstruct.pattern=模具工人 +achievement.tconstruct.tinkerer=匠师 +achievement.tconstruct.proTinkerer=匠魂小成 +achievement.tconstruct.smelteryMaker=冶炼炉工 +achievement.tconstruct.preparedFight=准备战斗 +achievement.tconstruct.enemySlayer=杀敌 +achievement.tconstruct.dualConvenience=双重便利 + +achievement.tconstruct.beginner.desc=翻开《匠魂宝典Ⅰ》 +achievement.tconstruct.pattern.desc=合成出第一块模具 +achievement.tconstruct.tinkerer.desc=打造出第一柄工具 +achievement.tconstruct.proTinkerer.desc=打造出第一柄二阶工具 +achievement.tconstruct.smelteryMaker.desc=合成出冶炼炉组件 +achievement.tconstruct.preparedFight.desc=打造出第一柄武器 +achievement.tconstruct.enemySlayer.desc=杀死生物 +achievement.tconstruct.dualConvenience.desc=使用煎锅杀死生物后烹煮它们的肉 + +knapsack.tooltip=装东西用的背包. +strangefood1.tooltip=闻起来糟透了,但是万一 +strangefood2.tooltip=你真找不到其它吃的... +hambone1.tooltip=Hambone! +hambone2.tooltip=用作建筑信标 +metalblock.tooltip=用作建筑信标 +craftedsoil1.tooltip=治愈不死生物 +craftedsoil2.tooltip=伤害不死生物 +fancybrick1.tooltip=造价略高 +fancybrick2.tooltip=相当贵重 +fancybrick3.tooltip=能够发出红石信号,最多延伸 +fancybrick4.tooltip=4格远 +fancybrick4.tooltip=弹性! +brick1.tooltip=造价略高 +brick2.tooltip=相当贵重 +brick3.tooltip=能够发出红石信号,最多延伸 +brick4.tooltip=4格远 +brick4.tooltip=Bouncy! +craftedsoil.slab1.tooltip=治愈不死生物 +craftedsoil.slab2.tooltip=伤害不死生物 +speedblock1.tooltip=踩着它健步如飞 +speedblock2.tooltip=踩着它走得稍快 +speedblock.slab1.tooltip=踩着它健步如飞 +speedblock.slab2.tooltip=踩着它走得稍快 +manual1.tooltip=Skyla 著 +manual2.tooltip=Skyla 著 +manual3.tooltip=Thruul M'gon 著 +searedtank1.tooltip=容纳 +searedtank2.tooltip=保存获得的流体 +oreberries1.tooltip=甜甜铁 +oreberries2.tooltip=纯净光泽 +oreberries3.tooltip=金属的味道 +oreberries4.tooltip=锡皮人 +oreberries5.tooltip=白巧克力 +oreberries6.tooltip=爬行者的味道 +hearthcanister1.tooltip=用以合成物品 +hearthcanister2.tooltip=用以合成物品 +hearthcanister3.tooltip=低级心之容器部件 +hearthcanister4.tooltip=首饰 +hearthcanister5.tooltip=永久增加生命上限 +landmine1.tooltip=皆可触发 +landmine2.tooltip=生物,玩家和红石触发 +landmine3.tooltip=玩家和红石触发 +landmine4.tooltip=仅限红石触发 +goldenhead1.tooltip=有人说让我们吃了这个倒下敌人 +goldenhead2.tooltip=的头颅来强化自身的血脉 +oreberrybush1.tooltip=甜甜铁 +oreberrybush2.tooltip=纯净光泽 +oreberrybush3.tooltip=金属的味道 +oreberrybush4.tooltip=锡皮人 +oreberrybush5.tooltip=白巧克力 +oreberrybush6.tooltip=爬行者的味道 +barricade.tooltip=堆叠数X4 +pattern1.tooltip=材料耗费: +pattern2.tooltip=材料耗费: +potionlauncher.tooltip=测试物品 +smeltery.controller.tooltip=相当于冶炼炉的大脑 +smeltery.drain.tooltip1=可以用作向冶炼炉 +smeltery.drain.tooltip2=输入或输出流体 +smeltery.brick.tooltip1=冶炼炉构筑方块 +smeltery.brick.tooltip2=(可安全地用作装饰方块) diff --git a/resources/assets/tinker/manuals/firstday.xml b/resources/assets/tinker/manuals/firstday.xml index c7055513..38d4af18 100644 --- a/resources/assets/tinker/manuals/firstday.xml +++ b/resources/assets/tinker/manuals/firstday.xml @@ -187,6 +187,14 @@ Note: The Smeltery is required to process all metals, including iron. If you ever find yourself without this book, a new one is simple to make. Other books can be made from this one as well. + +Book + + alternatebook + three + + + Materials and You: v1 diff --git a/resources/assets/tinker/manuals/materials.xml b/resources/assets/tinker/manuals/materials.xml index b2bf4097..8717d313 100644 --- a/resources/assets/tinker/manuals/materials.xml +++ b/resources/assets/tinker/manuals/materials.xml @@ -998,13 +998,13 @@ Stackable: Yes -Electric -Adding a battery and a circuit to a tool gives it an electric field. The tool still functions properly when the battery has no charge. +Flux +Adding a Hardened Flux Capacitor or Leadstone Energy Cell gives a tool energy. The tool still functions properly when the Cell/Capacitor has no charge. Effects: -- Allows the tool to be charged with electricity +- Allows the tool to be charged with Redstone Flux - Uses energy instead of durability while charged -- Available from IndustrialCraft 2 +- Available from Thermal Expansion 3 Type: Single-use Stackable: No @@ -1012,7 +1012,25 @@ Stackable: No tool -electricmod +fluxmod + + + +Flux +Adding a Hardened Flux Capacitor or Leadstone Energy Cell gives a tool energy. The tool still functions properly when the Cell/Capacitor has no charge. + +Effects: +- Allows the tool to be charged with Redstone Flux +- Uses energy instead of durability while charged +- Available from Thermal Expansion 3 + +Type: Single-use +Stackable: No + + + +tool +fluxmod2 diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java index 6fac0127..d07fe374 100644 --- a/src/main/java/tconstruct/client/TProxyClient.java +++ b/src/main/java/tconstruct/client/TProxyClient.java @@ -540,7 +540,8 @@ public class TProxyClient extends TProxyCommon TConstructClientRegistry.registerManualModifier("spidermod", ironlongsword.copy(), new ItemStack(Item.fermentedSpiderEye)); TConstructClientRegistry.registerManualModifier("smitemod", ironlongsword.copy(), new ItemStack(TContent.craftedSoil, 1, 4)); - TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), new ItemStack(Block.dirt), new ItemStack(Block.dirt)); + TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), new ItemStack(Block.dirt)); + TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), new ItemStack(Block.dirt)); TConstructClientRegistry.registerManualModifier("tier1free", ironpick.copy(), new ItemStack(Item.diamond), new ItemStack(Block.blockGold)); TConstructClientRegistry.registerManualModifier("tier2free", ironpick.copy(), new ItemStack(Item.netherStar)); diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index a6b171c6..d45bf8f7 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -2256,6 +2256,11 @@ public class TContent implements IFuelHandler { modF.batteries.add(basicCell); } + if (batHardened != null) + TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), (ItemStack) batHardened); + if (basicCell != null) + TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), (ItemStack) basicCell); + /* Thaumcraft */ Object obj = getStaticItem("itemResource", "thaumcraft.common.config.ConfigItems"); diff --git a/src/main/java/tconstruct/items/MaterialItem.java b/src/main/java/tconstruct/items/MaterialItem.java index e9ecd050..3196b885 100644 --- a/src/main/java/tconstruct/items/MaterialItem.java +++ b/src/main/java/tconstruct/items/MaterialItem.java @@ -22,7 +22,7 @@ public class MaterialItem extends CraftingItem } static String[] materialNames = new String[] { "PaperStack", "SlimeCrystal", "SearedBrick", "CobaltIngot", "ArditeIngot", "ManyullynIngot", "Mossball", "LavaCrystal", "NecroticBone", - "CopperIngot", "TinIngot", "", "RawAluminum", "BronzeIngot", "AluBrassIngot", "AlumiteIngot", "SteelIngot", "BlueSlimeCrystal", "ObsidianIngot", "IronNugget", "CopperNugget", "TinNugget", + "CopperIngot", "TinIngot", "AluminumIngot", "RawAluminum", "BronzeIngot", "AluBrassIngot", "AlumiteIngot", "SteelIngot", "BlueSlimeCrystal", "ObsidianIngot", "IronNugget", "CopperNugget", "TinNugget", "AluminumNugget", "EssenceCrystal", "AluBrassNugget", "SilkyCloth", "SilkyJewel", "ObsidianNugget", "CobaltNugget", "ArditeNugget", "ManyullynNugget", "BronzeNugget", "AlumiteNugget", "SteelNugget", "PigIronIngot", "PigIronNugget", "GlueBall" }; diff --git a/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java b/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java index 7f9690f2..3c3e038d 100644 --- a/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java +++ b/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java @@ -46,7 +46,7 @@ public class ItemBlockLandmine extends ItemBlock break; } - par3List.add("Interacts with: " + interaction); + par3List.add(StatCollector.translateToLocal("landmine5.tooltip") + interaction); } @Override