it's the bolter

src/main/java/assets/hbm/lang/de_DE.lang

@@ -1247,6 +1247,8 @@ item.mike_core.name=Mit Uran ummantelter Deuteriumtank
 item.mike_deut.name=Deuteriumtank
 item.mike_kit.name=Ivy Mike Kit
 item.mirror_tool.name=Spiegeleinstellungswerkzeug
+item.mirror_tool.linked=Position eingestellt!
+item.mirror_tool.desc=Rechtsclick merkt die Boilerposition.$Clicke auf Spiegel, um sie zum Boiler auszurichten.
 item.missile_anti_ballistic.name=Flugabwehrrakete
 item.missile_assembly.name=Kleines Raketen-Bauset
 item.missile_bhole.name=Schwarzes-Loch-Rakete
@@ -2334,6 +2336,7 @@ tile.machine_schrabidium_transmutator.name=Schrabidium-Transmutationsgerät
 tile.machine_selenium.name=Hochleistungs-Sternmotor
 tile.machine_shredder.name=Brecher
 tile.machine_siren.name=Sirene
+tile.machine_solar_boiler.name=Solarturmboiler
 tile.machine_spp_bottom.name=NPE-Potentialgenerator (Unterteil)
 tile.machine_spp_top.name=NPE-Potentialgenerator (Oberteil)
 tile.machine_telelinker.name=Geschütz-Telemetrie-Manager
@@ -2487,6 +2490,7 @@ tile.sellafield_3.name=Flammendes Sellafit
 tile.sellafield_4.name=Infernales Sellafit
 tile.sellafield_core.name=Sellafit-Corium
 tile.sellafield_slaked.name=Gelöschtes Sellafit
+tile.solar_mirror.name=Heliostatspiegel
 tile.soyuz_capsule.name=Landekapsel
 tile.soyuz_launcher.name=Soyuz-Startplatform
 tile.spikes.name=Stacheln

src/main/java/assets/hbm/lang/en_US.lang

@@ -1247,6 +1247,8 @@ item.mike_core.name=Uranium Coated Deuterium Tank
 item.mike_deut.name=Deuterium Tank
 item.mike_kit.name=Ivy Mike Kit
 item.mirror_tool.name=Mirror Adjustment Tool
+item.mirror_tool.linked=Alignment position set!
+item.mirror_tool.desc=Right-click boiler to memorize the position.$Click on mirrors to turn them towards the boiler.
 item.missile_anti_ballistic.name=Anti Ballistic Missile
 item.missile_assembly.name=Small Missile Assembly
 item.missile_bhole.name=Black Hole Missile
@@ -2246,7 +2248,7 @@ tile.hadron_coil_alloy.name=Dense Superconducting Coil
 tile.hadron_coil_mese.name=Dense Mese Coil
 tile.hadron_coil_schrabidium.name=Dense Schrabidic Coil
 tile.hadron_coil_starmetal.name=Dense Starmetal Coil
-tile.hadron_core.name=Particle Accelerator Core Commponent
+tile.hadron_core.name=Particle Accelerator Core Component
 tile.hadron_diode.name=Schottky Particle Diode
 tile.hadron_plating.name=Particle Accelerator Plating
 tile.hadron_plating_black.name=Particle Accelerator Plating (Black)
@@ -2255,7 +2257,7 @@ tile.hadron_plating_glass.name=Particle Accelerator Plating (Window)
 tile.hadron_plating_striped.name=Particle Accelerator Plating (Cool Hazard Stripes)
 tile.hadron_plating_voltz.name=Particle Accelerator Plating (VOLTZ)
 tile.hadron_plating_yellow.name=Particle Accelerator Plating (YelloDye)
-tile.hadron_power.name=Particle Accelerator Power Plug
+tile.hadron_power.name=Particle Accelerator Power Plugtankish wanted
 tile.hazmat.name=Hazmat Cloth Block
 tile.iter.name=Fusion Reactor
 tile.launch_pad.name=Missile Launch Pad
@@ -2334,6 +2336,7 @@ tile.machine_schrabidium_transmutator.name=Schrabidium Transmutation Device
 tile.machine_selenium.name=Radial Performance Engine
 tile.machine_shredder.name=Shredder
 tile.machine_siren.name=Siren
+tile.machine_solar_boiler.name=Solar Tower Boiler
 tile.machine_spp_bottom.name=ZPE Potential Generator (Bottom)
 tile.machine_spp_top.name=ZPE Potential Generator (Top)
 tile.machine_telelinker.name=Turret Telemetry Linker
@@ -2487,6 +2490,7 @@ tile.sellafield_3.name=Blazing Sellafite
 tile.sellafield_4.name=Infernal Sellafite
 tile.sellafield_core.name=Sellafite-Corium
 tile.sellafield_slaked.name=Slaked Sellafite
+tile.solar_mirror.name=Heliostat Mirror
 tile.soyuz_capsule.name=Cargo Landing Capsule
 tile.soyuz_launcher.name=Soyuz Launch Platform
 tile.spikes.name=Spikes

src/main/java/assets/hbm/lang/zh_CN.lang

@@ -1,4 +1,4 @@
-itemGroup.tabTest=HBM的核科技mod测试项[S166、Bismarck联合汉化]
+itemGroup.tabTest=HBM的核科技mod测试项[S166、Bismarck、nukesteve联合汉化]
 itemGroup.tabParts=NTM 资源和零件
 itemGroup.tabControl=NTM 机器项目和燃料
 itemGroup.tabTemplate=NTM 模板
@@ -7,9 +7,9 @@ itemGroup.tabMachine=NTM 机器
 itemGroup.tabNuke=NTM 炸弹
 itemGroup.tabMissile=NTM 导弹和卫星
 itemGroup.tabWeapon=NTM 武器和炮塔
-itemGroup.tabConsumable=NTM 食物和装备
+itemGroup.tabConsumable=NTM 食物和装备0
 
-achievement.FOEQ.desc=向火星传送信号...我是说Duna轨道
+achievement.FOEQ.desc=向火星传送信号...其实我是说Duna
 achievement.FOEQ=飞马座运载火箭和发射架
 achievement.assembly.desc=Bobmazon 2级 (装配机)
 achievement.assembly=制作
@@ -35,12 +35,16 @@ achievement.horizonsStart.desc=将一个小伙子送上月球
 achievement.horizonsStart=地平线？
 achievement.impossible.desc=你不可能取得该成就
 achievement.impossible=简直不可能
+achievement.meltdown.desc=你走了这么远，怎么能把事情搞砸？
+achievement.meltdown=快速非计划拆卸
 achievement.metalworks.desc=Bobmazon 1级 (高炉)
 achievement.metalworks=金属制品
 achievement.nuclear.desc=Bobmazon 5级 (铀燃料)
 achievement.nuclear=原子科学
 achievement.oil.desc=Bobmazon 4级 (电锅炉)
 achievement.oil=石油
+achievement.omega12.desc=解决在这个可怜的星球上继续生存的问题
+achievement.omega12=欧米茄-12粒子加速器
 achievement.potato.desc=你居然捅我！你怎—喔哦哦哦哦哦！
 achievement.potato=流氓AI
 achievement.radDeath.desc=居里夫人开创了放射性理论、放射性治疗和放射性死亡。。。。
@@ -51,6 +55,8 @@ achievement.sacrifice.desc=直面火海并存活
 achievement.sacrifice=牺牲
 achievement.selenium.desc=Yeah.
 achievement.selenium=XVIII 月亮女神
+achievement.stratum.desc=快刹车, Mitts！
+achievement.stratum=岩层
 achievement.soyuz.desc=变得松脆
 achievement.soyuz=土豆烹饪
 achievement.space.desc=屡试屡败，浪费了价值9000万美元的资金
@@ -59,7 +65,7 @@ achievement.tasteofblood.desc=这不是任何测试的一部分
 achievement.tasteofblood=血的味道
 
 chem.ASPHALT=沥青生产
-chem.BALEFIRE=BF火箭燃料混合
+chem.BALEFIRE=野火火箭燃料混合
 chem.BP_BIOFUEL=生物燃料酯化
 chem.BP_BIOGAS=沼气生产
 chem.CC_HEATING=高级煤液化
@@ -152,6 +158,7 @@ container.fusionaryWatzPlant=Watz聚变反应堆
 container.gasCentrifuge=气体离心机
 container.gasFlare=高架火炬
 container.generator=核反应堆
+container.hadron=粒子加速器
 container.iGenerator=工业发电机
 container.keyForge=锁匠桌
 container.launchPad=导弹发射台
@@ -162,6 +169,7 @@ container.machineCoal=火力发电机
 container.machineDiesel=柴油发电机
 container.machineElectricBoiler=电锅炉
 container.machineITER=聚变反应堆
+container.machineLargeTurbine=工业汽轮机
 container.machineRefinery=炼油厂
 container.machineSelenium=星型发动机
 container.machineShredder=粉碎机
@@ -169,13 +177,14 @@ container.machineTurbine=汽轮机
 container.machineTurbofan=涡扇发动机
 container.machine_deuterium=氘提取器
 container.machine_schrabidium_transmutator=Sa326嬗变装置
+container.microwave=微波炉
 container.miningDrill=自动采矿钻机
 container.miningLaser=采矿激光
 container.missileAssembly=导弹装配台
 container.nukeBoy=小男孩
 container.nukeCustom=自定义核弹
 container.nukeFleija=F.L.E.I.J.A.
-container.nukeFstbmb=BF炸弹
+container.nukeFstbmb=野火炸弹
 container.nukeFurnace=核熔炉
 container.nukeGadget=小玩意
 container.nukeMan=胖子
@@ -197,7 +206,6 @@ container.radiorec=FM收音机
 container.reactor=增殖反应堆
 container.reactorControl=反应堆遥控模块
 container.reactorLarge=大型核反应堆
-container.reix=Rei-X主机
 container.reactorSmall=核反应堆
 container.reix=Rei-X主机
 container.rtg=放射性同位素发电机
@@ -247,6 +255,7 @@ death.attack.radiation=%1$s 死于辐射
 death.attack.revolverBullet=%1$s 被 %2$s 爆头
 death.attack.rubble=%1$s 被碎片压扁了
 death.attack.shrapnel=%1$s 被榴弹碎片炸得千疮百孔
+death.attack.spikes=%1$s被刺穿了
 death.attack.subAtomic2=%1$s 因为被 %2$s 篡改了实际速度，导致QPU没有对准
 death.attack.subAtomic3=由于 %2$s，1$s 的偏差下降到1%以下
 death.attack.subAtomic4=%1$s 因为 %2$s 被零除了
@@ -259,6 +268,9 @@ death.attack.tauBlast=%1$s 对XVL1456充能时间过长，被炸成碎片
 death.attack.teleporter=%1$s 被传送到虚空
 
 entity.entity_cyber_crab.name=赛博螃蟹
+entity.entity_elder_one.name=老鸭子
+entity.entity_fucc_a_ducc.name=鸭子
+entity.entity_hbm_fbi.name=FBI特工
 entity.entity_mob_hunter_chopper.name=猎人直升机
 entity.entity_mob_mask_man.name=面具人
 entity.entity_mob_nuclear_creeper.name=核爆爬行者
@@ -273,10 +285,27 @@ fluid.acid_fluid=酸
 fluid.mud_fluid=毒泥
 fluid.toxic_fluid=绿色软泥
 
+geiger.chunkRad=当前区块辐射:
+geiger.playerRad=玩家辐射:
+geiger.playerRes=辐射抗性:
+geiger.title=盖革计数器
+
+hadron.analysis=正在分析...
+hadron.buttonOn=分析室启动(如果存在)
+hadron.buttonOff=分析室关闭
+hadron.error=错误!
+hadron.hopper0=§e正常模式:$将使用所有项目
+hadron.hopper1=§e料斗模式:$ 将始终保留一个项目
+hadron.idle=空闲
+hadron.modeCircular=§e环形加速器模式:$磁铁必须环绕核心$解锁更多配方
+hadron.modeLine=§e直线加速器模式:$加速器末端有分析室$更少的配方
+hadron.noresult=无结果
+hadron.progress=正在进行中...
+hadron.success=已完成!
 hbmfluid.acid=过氧化氢
 hbmfluid.amat=反物质
 hbmfluid.aschrab=反Sa326
-hbmfluid.balefire=BF火箭燃料
+hbmfluid.balefire=野火火箭燃料
 hbmfluid.biofuel=生物燃料
 hbmfluid.biogas=沼气
 hbmfluid.bitumen=沥青
@@ -302,7 +331,7 @@ hbmfluid.oil=原油
 hbmfluid.oxygen=液氧
 hbmfluid.petroil=汽油
 hbmfluid.petroleum=石油气
-hbmfluid.plasma_bf=Balefire 等离子体
+hbmfluid.plasma_bf=野火等离子体
 hbmfluid.plasma_dt=氘-氚等离子体
 hbmfluid.plasma_hd=氢-氘等离子体
 hbmfluid.plasma_ht=氢-氚等离子体
@@ -320,6 +349,14 @@ hbmfluid.water=水
 hbmfluid.watz=毒泥浆
 hbmfluid.xenon=氙气
 
+info.coil=线圈强度
+info.templatefolder=需要使用机器模板文件夹创建
+info.template_in=输入:
+info.template_in_p=输入:
+info.template_out=输出:
+info.template_out_p=输出:
+info.template_seconds=秒
+info.template_time=生产耗时:
 item.alloy_axe.name=高级合金斧
 item.alloy_boots.name=高级合金靴子
 item.alloy_helmet.name=高级合金头盔
@@ -347,10 +384,12 @@ item.ammo_20gauge_slug.name=20号独头弹
 item.ammo_20gauge_wither.name=20号鹿弹[凋零]
 item.ammo_22lr.name=.22LR子弹
 item.ammo_22lr_ap.name=.22LR子弹[AP]
+item.ammo_22lr_chlorophyte.name=.22LR子弹[叶绿]
 item.ammo_357_desh.name=.357马格南Desh子弹
 item.ammo_44.name=.44马格南子弹
 item.ammo_44_ap.name=.44马格南子弹[AP]
 item.ammo_44_bj.name=.44马格南子弹[船]
+item.ammo_44_chlorophyte.name=.44马格南子弹[叶绿]
 item.ammo_44_du.name=.44马格南子弹[贫铀]
 item.ammo_44_phosphorus.name=.44马格南子弹[白磷]
 item.ammo_44_pip.name=.44马格南子弹[车厢]
@@ -358,15 +397,23 @@ item.ammo_44_rocket.name=.44马格南火箭
 item.ammo_44_silver.name=.44马格南子弹[建筑]
 item.ammo_44_star.name=.44马格南子弹[星辉]
 item.ammo_4gauge.name=四号鹿弹
+item.ammo_4gauge_balefire.name=23mm野火榴弹
+item.ammo_4gauge_canister.name=23mm 火箭弹[榴霰弹]
 item.ammo_4gauge_explosive.name=23mm榴弹
+item.ammo_4gauge_flechette.name=4号箭霰弹
+item.ammo_4gauge_flechette_phosphorus.name=4号箭霰弹[白磷]
+item.ammo_4gauge_kampf.name=23mm火箭弹
+item.ammo_4gauge_semtex.name=23mm采矿弹药
 item.ammo_4gauge_sleek.name=4号鹿弹[IF-R&D]
 item.ammo_4gauge_slug.name=四号实心独头弹
 item.ammo_50ae.name=.50AE子弹
 item.ammo_50ae_ap.name=.50AE子弹[AP]
+item.ammo_50ae_chlorophyte.name=.50AE子弹[叶绿]
 item.ammo_50ae_du.name=.50AE子弹[贫铀]
 item.ammo_50ae_star.name=.50AE子弹[星辉]
 item.ammo_50bmg.name=.50BMG子弹
-item.ammo_50bmg_ap.name=.50 BMG子弹[AP]
+item.ammo_50bmg_ap.name=.50BMG子弹[AP]
+item.ammo_50bmg_chlorophyte.name=.50BMG子弹[叶绿]
 item.ammo_50bmg_du.name=.50BMG子弹[贫铀]
 item.ammo_50bmg_explosive.name=.50BMG子弹[高爆]
 item.ammo_50bmg_incendiary.name=.50BMG子弹[燃烧]
@@ -375,8 +422,10 @@ item.ammo_50bmg_sleek.name=.50BMG子弹[IF-R&D]
 item.ammo_50bmg_star.name=.50BMG子弹[星辉]
 item.ammo_556.name=5.56mm子弹
 item.ammo_556_ap.name=5.56mm子弹[AP]
+item.ammo_556_chlorophyte.name=5.56mm子弹[叶绿]
 item.ammo_556_du.name=5.56mm子弹[贫铀]
 item.ammo_556_flechette.name=5.56mm弗莱彻子弹
+item.ammo_556_flechette_chlorophyte.name=5.56mm弗莱彻子弹[叶绿]
 item.ammo_556_flechette_du.name=5.56mm弗莱彻子弹 [贫铀穿甲]
 item.ammo_556_flechette_incendiary.name=5.56mm弗莱彻子弹 [燃烧]
 item.ammo_556_flechette_phosphorus.name=5.56mm弗莱彻子弹 [白磷穿甲]
@@ -387,14 +436,17 @@ item.ammo_556_sleek.name=5.56mm子弹[IF-R&D]
 item.ammo_556_star.name=5.56mm子弹 [星辉]
 item.ammo_556_tracer.name=5.56mm Round[曳光弹]
 item.ammo_5mm.name=5mm子弹
+item.ammo_5mm_chlorophyte.name=5mm子弹[叶绿]
 item.ammo_5mm_du.name=5mm子弹[贫铀]
 item.ammo_5mm_explosive.name=5mm子弹[高爆]
 item.ammo_5mm_star.name=5mm子弹[星辉]
 item.ammo_9mm.name=9mm子弹
 item.ammo_9mm_ap.name=9mm子弹[AP]
+item.ammo_9mm_chlorophyte.name=9mm子弹[叶绿]
 item.ammo_9mm_du.name=9mm子弹[贫铀]
 item.ammo_9mm_rocket.name=9mm火箭弹
 
+item.ammo_cell.name=能量单元
 item.ammo_container.name=万能弹药盒
 item.ammo_folly.name=银弹
 item.ammo_folly_du.name=银弹[贫铀, 不爆炸]
@@ -418,6 +470,7 @@ item.ammo_grenade_toxic.name=40mm榴弹[化学]
 item.ammo_grenade_tracer.name=40mm训练榴弹
 
 item.ammo_rocket.name=84mm火箭弹
+item.ammo_rocket_canister.name=84mm Rocket火箭弹[榴霰弹]
 item.ammo_rocket_emp.name=84mm火箭弹[EMP]
 item.ammo_rocket_glare.name=84mm火箭弹[红光]
 item.ammo_rocket_he.name=84mm火箭弹[HE]
@@ -487,9 +540,9 @@ item.australium_iii.name=MkIII寿命延长剂
 item.australium_iv.name=MkIV寿命延长剂
 item.australium_v.name=MkV寿命延长剂
 
-item.balefire_and_ham.name=火腿BF蛋
+item.balefire_and_ham.name=火腿野火蛋
-item.balefire_and_steel.name=BF打火器
+item.balefire_and_steel.name=野火打火石
-item.balefire_scrambled.name=炒BF蛋
+item.balefire_scrambled.name=炒野火蛋
 item.ballistite.name=混合无烟火药
 item.battery_advanced.name=高级电池
 item.battery_advanced_cell.name=高级电池组
@@ -526,6 +579,10 @@ item.battery_trixite.name=杂牌Spark电池
 item.big_sword.name=大剑
 item.biomass.name=生物质
 item.biomass_compressed.name=压缩生物质
+item.bj_boots.name=月球钉靴
+item.bj_helmet.name=热传感器眼罩
+item.bj_legs.name=月球控制护腿
+item.bj_plate.name=月球控制胸甲
 item.black_hole.name=微型黑洞
 item.blade_titanium.name=钛扇片
 item.blade_tungsten.name=钨强化扇片
@@ -657,7 +714,7 @@ item.casing_50.name=大口径弹壳[x8]
 item.casing_9.name=小口径弹壳[x24]
 item.casing_buckshot.name=鹿弹弹壳[x8]
 item.catalyst_clay.name=黏土催化剂
-item.cbt_device.name=CBT Device
+item.cbt_device.name=CBT装置
 item.cell_anti_schrabidium.name=反Sa326单元
 item.cell_antimatter.name=反物质单元
 item.cell_deuterium.name=氘单元
@@ -673,6 +730,7 @@ item.chainsaw.name=链锯
 item.chemistry_template.name=化工厂模板:
 item.chernobylsign.name=辐射警告标志战斧
 item.chlorine_pinwheel.name=氯气转轮
+item.chlorophyte_pickaxe.name=叶绿镐
 item.chocolate_milk.name=巧克力牛奶
 item.chopper.name=猎人直升机
 item.chopper_blades.name=猎人直升机旋翼
@@ -697,7 +755,7 @@ item.cladding_desh.name=Desh覆层
 item.cladding_lead.name=铅覆层
 item.cladding_paint.name=铅涂料
 item.cladding_rubber.name=橡胶覆层
-item.clip_bf.name=两包BF-子弹
+item.clip_bf.name=两包野火子弹
 item.clip_bolt_action.name=盒装12x74独头弹
 item.clip_cryolator.name=急冻单元箱
 item.clip_defabricator.name=毁灭者能量电池弹药带
@@ -815,6 +873,7 @@ item.detonator_de.name=死亡炸弹
 item.detonator_deadman.name=死亡雷管
 item.detonator_laser.name=激光起爆器
 item.detonator_multi.name=多发起爆器
+item.diamond_gavel.name=钻石槌
 item.door_bunker.name=仓门
 item.door_metal.name=金属门
 item.door_office.name=办公室门
@@ -835,8 +894,8 @@ item.dynosphere_schrabidium.name=Sa326动力球
 item.dynosphere_schrabidium_charged.name=Sa326动力球[带电]
 item.dysfunctional_reactor.name=失控反应堆
 
-item.egg_balefire.name=BF蛋
+item.egg_balefire.name=野火蛋
-item.egg_balefire_shard.name=BF蛋碎片
+item.egg_balefire_shard.name=野火蛋碎片
 item.elec_axe.name=电锯
 item.elec_pickaxe.name=冲击钻
 item.elec_shovel.name=螺旋钻
@@ -962,7 +1021,7 @@ item.gun_b92.name=§9B92能量手枪§r
 item.gun_b92_ammo.name=§9B92能量单元§r
 item.gun_b93.name=§cB93能量手枪§r
 item.gun_bf.name=BEL
-item.gun_bf_ammo.name=Mk.V小型AMAT-炮弹 -B.F.型
+item.gun_bf_ammo.name=Mk.V小型AMAT-炮弹 –野火型
 item.gun_bolt_action.name=栓动式霰弹枪[原版]
 item.gun_bolt_action_ammo.name=12x74 独头弹
 item.gun_bolt_action_green.name=栓动式霰弹枪[绿色]
@@ -992,7 +1051,7 @@ item.gun_immolator.name=焚烧者
 item.gun_immolator_ammo.name=焚烧者燃料
 item.gun_jack.name=汽锤
 item.gun_jack_ammo.name=四联散弹子弹
-item.gun_karl.name=卡尔·古斯塔夫M3式84mm火箭筒
+item.gun_karl.name=卡尔•古斯塔夫M3式84mm火箭筒
 item.gun_kit_1.name=枪械润滑油
 item.gun_kit_2.name=枪械修理包
 item.gun_ks23.name=KS-23霰弹枪
@@ -1035,22 +1094,23 @@ item.gun_revolver_nightmare2_ammo.name=激光子弹
 item.gun_revolver_nightmare_ammo.name=噩梦子弹
 item.gun_revolver_nopip.name=Novac
 item.gun_revolver_nopip_ammo.name=.44马格南子弹
-item.gun_revolver_pip.name=小矮人
+item.gun_revolver_pip.name=小麦金塔
 item.gun_revolver_pip_ammo.name=污染子弹
 item.gun_revolver_red.name=红钥匙左轮手枪
 item.gun_revolver_saturnite.name=土星手枪
 item.gun_revolver_schrabidium.name=Sa326左轮手枪
 item.gun_revolver_schrabidium_ammo.name=Sa326左轮子弹
 item.gun_revolver_silver.name=银质左轮手枪
-item.gun_rpg.name=卡尔·古斯塔夫M4无后座力炮
+item.gun_rpg.name=卡尔•古斯塔夫M4无后座力炮
 item.gun_rpg_ammo.name=火箭弹
-item.gun_sauer.name=斯坦·索尔的猎枪
+item.gun_sauer.name=斯坦•索尔的猎枪
 item.gun_skystinger.name=毒刺-The One Sky
 item.gun_spark.name=Spark Plug
 item.gun_spark_ammo.name=电磁弹
 item.gun_stinger.name=FIM-92毒刺导弹
 item.gun_stinger_ammo.name=毒刺导弹
 item.gun_super_shotgun.name="超级"猎枪
+item.gun_thompson.name=汤姆森冲锋枪
 item.gun_uboinik.name=Uboinik
 item.gun_uboinik_ammo.name=12x70 鹿弹
 item.gun_uzi.name=Uzi
@@ -1125,6 +1185,7 @@ item.ingot_neptunium.name=镎锭
 item.ingot_phosphorus.name=白磷锭
 item.ingot_plutonium.name=钚锭
 item.ingot_plutonium_fuel.name=钚燃料锭
+item.ingot_polonium.name=钋锭
 item.ingot_polymer.name=聚合物锭
 item.ingot_pu238.name=钚238锭
 item.ingot_pu239.name=钚239锭
@@ -1133,7 +1194,6 @@ item.ingot_red_copper.name=紫铜
 item.ingot_reiium.name=雷恩锭
 item.ingot_saturnite.name=土星锭
 item.ingot_schrabidium.name=Sa326锭
-item.ingot_schrabidium.name=Sa326锭
 item.ingot_schrabidium_fuel.name=Sa326燃料锭
 item.ingot_schraranium.name=低丰度Sa326锭
 item.ingot_semtex.name=塞姆汀塑胶炸药块
@@ -1167,6 +1227,7 @@ item.key_fake.name=伪造钥匙
 item.key_kit.name=钥匙仿制套件
 item.key_red.name=红色钥匙
 
+item.lead_gavel.name=铅槌
 item.lemon.name="柠檬"
 item.letter.name=快捷邮件
 item.levitation_unit.name=重力控制器
@@ -1190,6 +1251,7 @@ item.man_igniter.name=点火器
 item.man_kit.name=胖子 套件
 item.mask_of_infamy.name=耻辱面具
 item.matchstick.name=火柴
+item.mech_key.name=大号银钥匙
 item.mechanism_launcher_1.name=发射机构
 item.mechanism_launcher_2.name=先进发射机构
 item.mechanism_revolver_1.name=转轮机构
@@ -1201,14 +1263,16 @@ item.med_bag.name=医疗包
 item.med_ipecac.name=吐根酊催吐剂
 item.med_ptsd.name=PTSD治疗药物
 item.med_schiziphrenia.name=抗精神分裂症药物
-item.memespoon.name=§e花园园丁
+item.memespoon.name=§ee花园园丁
 item.memory.name=item.null.name
+item.mese_gavel.name=Mese槌
+item.mese_pickaxe.name=Mese镐
 item.meteor_remote.name=陨石召唤器
 item.mike_cooling_unit.name=氘冷却装置
 item.mike_core.name=铀涂层氘罐
 item.mike_deut.name=氘罐
 item.mike_kit.name=常青藤麦克 套件
-item.missile_anti_ballistic.name=反弹道导弹[开发中]
+item.missile_anti_ballistic.name=反弹道导弹
 item.missile_assembly.name=小型导弹[待装配]
 item.missile_bhole.name=黑洞导弹
 item.missile_burst.name=洲际导弹
@@ -1248,12 +1312,13 @@ item.missile_soyuz_lander.name=联盟号轨道舱
 item.missile_strong.name=强化型高爆导弹
 item.missile_taint.name=污染导弹
 item.motor.name=马达
+item.motor_desh.name=Desh马达
 item.mp_c_1.name=1级导弹制导芯片
 item.mp_c_2.name=2级导弹制导芯片
 item.mp_c_3.name=3级导弹制导芯片
 item.mp_c_4.name=4级导弹制导芯片
 item.mp_c_5.name=5级导弹制导芯片
-item.mp_fuselage_10_15_balefire.name=10/15号弹体[BF燃料]
+item.mp_fuselage_10_15_balefire.name=10/15号弹体[野火燃料]
 item.mp_fuselage_10_15_hydrogen.name=10/15号弹体[液氢]
 item.mp_fuselage_10_15_kerosene.name=10/15号弹体[煤油]
 item.mp_fuselage_10_15_solid.name=10/15号弹体[固体燃料]
@@ -1298,7 +1363,7 @@ item.mp_fuselage_10_xenon_bhole.name=10号弹体[氙]
 item.mp_fuselage_15_20_kerosene.name=15号/20 弹体[煤油]
 item.mp_fuselage_15_20_kerosene_magnusson.name=15号/20 弹体[煤油]
 item.mp_fuselage_15_20_solid.name=15号/20 弹体[固体燃料]
-item.mp_fuselage_15_balefire.name=15号弹体[液氢]
+item.mp_fuselage_15_balefire.name=15号弹体[野火燃料]
 item.mp_fuselage_15_hydrogen.name=15号弹体[液氢]
 item.mp_fuselage_15_hydrogen_cathedral.name=15号弹体[液氢]
 item.mp_fuselage_15_kerosene.name=15号弹体[煤油]
@@ -1335,10 +1400,10 @@ item.mp_stability_15_thin.name=15号薄翼
 item.mp_thruster_10_kerosene.name=10号液体燃料推进器
 item.mp_thruster_10_solid.name=10号固体燃料推进器
 item.mp_thruster_10_xenon.name=10号离子推进器
-item.mp_thruster_15_balefire.name=15号带核预热器的BF燃料推进器
+item.mp_thruster_15_balefire.name=15号带核预热器的野火燃料推进器
-item.mp_thruster_15_balefire_large.name=15号带核预热器的BF燃料推进器[重型喷管]
+item.mp_thruster_15_balefire_large.name=15号带核预热器的野火燃料推进器[重型喷管]
-item.mp_thruster_15_balefire_large_rad.name=15号带核预热器的BF燃料推进器[重型喷管]
+item.mp_thruster_15_balefire_large_rad.name=15号带核预热器的野火燃料推进器[重型喷管-稀有]
-item.mp_thruster_15_balefire_short.name=15号带核预热器的BF燃料推进器[简称]
+item.mp_thruster_15_balefire_short.name=15号带核预热器的野火燃料推进器[缩短版]
 item.mp_thruster_15_hydrogen.name=15号液氢推进器
 item.mp_thruster_15_hydrogen_dual.name=15号双喷管氢推进器
 item.mp_thruster_15_kerosene.name=15号液体燃料推进器
@@ -1359,7 +1424,7 @@ item.mp_warhead_10_incendiary.name=10号燃烧弹头
 item.mp_warhead_10_nuclear.name=10号微型核弹头
 item.mp_warhead_10_nuclear_large.name=10号核弹头
 item.mp_warhead_10_taint.name=10号污染弹头
-item.mp_warhead_15_balefire.name=15号烈火弹头
+item.mp_warhead_15_balefire.name=15号野火弹头
 item.mp_warhead_15_boxcar.name=15号 车厢?
 item.mp_warhead_15_he.name=15号HE弹头
 item.mp_warhead_15_incendiary.name=15号燃烧弹头
@@ -1385,6 +1450,7 @@ item.niter.name=硝石粉
 item.nothing.name=没有东西
 item.nuclear_waste.name=核废料
 item.nuclear_waste_tiny.name=小撮核废料
+item.nugget.name=鸡块
 item.nugget_australium.name=奥斯粒
 item.nugget_beryllium.name=铍粒
 item.nugget_daffergon.name=达夫贡粒
@@ -1424,6 +1490,11 @@ item.nuke_starter_kit.name=原子学入门工具箱
 
 item.oil_canola.name=菜籽油
 item.oil_detector.name=石油探测仪
+item.oil_detector.desc1=单击右键扫描地下是否存在油田
+item.oil_detector.desc2=探测仪只会发现大片油田
+item.oil_detector.bullseye=正下方发现油田!
+item.oil_detector.detected=附近存在油田
+item.oil_detector.noOil=未发现油田
 item.overfuse.name=奇异螺丝刀
 item.oxy_mask.name=氧气面罩
 
@@ -1434,17 +1505,34 @@ item.padlock.name=挂锁
 item.padlock_reinforced.name=加强挂锁
 item.padlock_rusty.name=生锈的挂锁
 item.padlock_unbreakable.name=牢不可破的挂锁
+item.pancake.name=用废金属、螺栓和宝石粉做成的薄饼
 item.part_beryllium.name=铍粉盒
 item.part_carbon.name=碳粉盒
 item.part_copper.name=铜粉盒
 item.part_lithium.name=锂粉盒
 item.part_plutonium.name=钚粉盒
-item.pch.name=Horse Nut Hammer
+item.pch.name=马奶锤
-item.pedestal_steel.name=钢底座
+item.particle_amat.name=反物质胶囊
+item.particle_aproton.name=反质子胶囊
+item.particle_aschrab.name=反Sa326胶囊
+item.particle_copper.name=铜离子胶囊
+item.particle_dark.name=暗物质胶囊
+item.particle_digamma.name=§c迪伽马粒子胶囊§r
+item.particle_empty.name=空粒子胶囊
+item.particle_higgs.name=希格斯玻色子胶囊
+item.particle_hydrogen.name=氢离子胶囊
+item.particle_lead.name=铅离子胶囊
+item.particle_muon.name=μ介子胶囊
+item.particle_sparkticle.name=Spark粒子胶囊
+item.particle_strange.name=奇夸克胶囊
+ item.pedestal_steel.name=钢底座
 item.pellet_advanced.name=高级Watz性能增强剂
 item.pellet_antimatter.name=反物质团
 item.pellet_beryllium.name=铍慢化靶丸
 item.pellet_buckshot.name=铅弹丸
+item.pellet_canister.name=榴霰弹弹丸
+item.pellet_charged.name=电离粒子
+item.pellet_chlorophyte.name=叶绿弹丸
 item.pellet_cluster.name=爆炸弹丸
 item.pellet_coal.name=致密煤
 item.pellet_coolant.name=冷却液组
@@ -1453,9 +1541,11 @@ item.pellet_gas.name=毒气筒
 item.pellet_hes.name=HES Watz靶丸
 item.pellet_lead.name=铅反射靶丸
 item.pellet_les.name=LES Watz靶丸
+item.pellet_mercury.name=水银弹丸
 item.pellet_mes.name=MES Watz靶丸
-item.pellet_neptunium.name=镎Watz靶丸
+item.pellet_meteorite.name=陨石弹丸item.pellet_neptunium.name=镎Watz靶丸
 item.pellet_rtg.name=钚238放射性同位素燃料靶丸
+item.pellet_rtg_polonium.name=钋210放射性同位素燃料靶丸
 item.pellet_rtg_weak.name=贫铀放射性同位素燃料靶丸
 item.pellet_schrabidium.name=纯Sa326Watz靶丸
 item.photo_panel.name=光伏板
@@ -1466,6 +1556,8 @@ item.piston_selenium.name=星型发动机活塞
 item.plan_c.name=C计划
 item.plate_advanced_alloy.name=高级合金板
 item.plate_aluminium.name=铝板
+item.plate_armor_lunar.name=月球镀层
+item.plate_armor_titanium.name=钛装甲板
 item.plate_combine_steel.name=CMB钢板
 item.plate_copper.name=铜板
 item.plate_dalekanium.name=愤怒的金属
@@ -1547,6 +1639,7 @@ item.powder_schrabidium.name=Sa326粉
 item.powder_semtex_mix.name=塞姆汀塑胶炸药混合物
 item.powder_spark_mix.name=Spark混合物
 item.powder_steel.name=钢粉
+item.powder_steel_tiny.name=小撮钢粉
 item.powder_strontium.name=锶粉
 item.powder_tennessine.name=Ts粉
 item.powder_thermite.name=铝热剂
@@ -1582,14 +1675,15 @@ item.redstone_sword.name=红石剑
 item.reer_graar.name=The Reer Graar
 item.remote.name=损坏的遥控器
 item.ring_pull.name=拉环
+item.ring_starmetal.name=§9星辉拉环§r
 item.rocket_fuel.name=固体燃料[火箭推进剂]
 item.rod_australium.name=奥斯棒
-item.rod_balefire.name=BF燃料棒
+item.rod_balefire.name=野火燃料棒
-item.rod_balefire_blazing.name=炽热的BF燃料棒
+item.rod_balefire_blazing.name=炽热的野火燃料棒
 item.rod_coolant.name=燃料棒[冷却液]
 item.rod_daffergon.name=达夫贡棒
-item.rod_dual_balefire.name=双联BF燃料棒
+item.rod_dual_balefire.name=双联野火燃料棒
-item.rod_dual_balefire_blazing.name=炽热的双联BF燃料棒
+item.rod_dual_balefire_blazing.name=炽热的双联野火燃料棒
 item.rod_dual_coolant.name=双联燃料棒[冷却液]
 item.rod_dual_empty.name=空双联燃料棒
 item.rod_dual_lead.name=双联铅棒
@@ -1627,16 +1721,15 @@ item.rod_lithium.name=锂棒
 item.rod_mox_fuel.name=MOX燃料棒
 item.rod_mox_fuel_depleted.name=枯竭MOX燃料棒
 item.rod_neptunium.name=镎燃料棒
-item.rod_plutonium.name=钚棒
+item.rod_of_discord.name=混沌传送杖
-item.rod_of_discord.name=不和谐燃料棒
+ item.rod_plutonium.name=钚棒item.rod_plutonium_fuel.name=钚燃料棒
-item.rod_plutonium_fuel.name=钚燃料棒
 item.rod_plutonium_fuel_depleted.name=枯竭钚燃料棒
 item.rod_polonium.name=钋棒
 item.rod_pu238.name=钚238燃料棒
 item.rod_pu239.name=钚239燃料棒
 item.rod_pu240.name=钚240燃料棒
-item.rod_quad_balefire.name=四联BF燃料棒
+item.rod_quad_balefire.name=四联野火燃料棒
-item.rod_quad_balefire_blazing.name=炽热的四联BF燃料棒
+item.rod_quad_balefire_blazing.name=炽热的四联野火燃料棒
 item.rod_quad_coolant.name=四联燃料棒[冷却液]
 item.rod_quad_empty.name=空四联燃料棒
 item.rod_quad_euphemium.name=枯竭的四联Sa326燃料棒
@@ -1645,7 +1738,7 @@ item.rod_quad_lithium.name=四联锂棒
 item.rod_quad_mox_fuel.name=四联MOX燃料棒
 item.rod_quad_mox_fuel_depleted.name=枯竭MOX燃料棒
 item.rod_quad_neptunium.name=四联镎燃料棒
-item.rod_quad_plutonium.name=四联钚燃料棒
+item.rod_quad_plutonium.name=四联钚棒
 item.rod_quad_plutonium_fuel.name=四联钚燃料棒
 item.rod_quad_plutonium_fuel_depleted.name=四联枯竭钚燃料棒
 item.rod_quad_polonium.name=四联钋棒
@@ -1750,9 +1843,9 @@ item.solinium_core.name=半稳定Sa327核心
 item.solinium_igniter.name=Sa327脉冲点火器
 item.solinium_kit.name=蔚蓝洗礼套件
 item.solinium_propellant.name=Sa327压缩装药
-item.sopsign.name=SOP标志战斧
+item.sopsign.name=Sop标志战斧
 item.sphere_steel.name=钢球
-item.stamp_357.name=.357马格南锻模
+item.spongebob_macaroni.name=海绵宝宝通心粉item.stamp_357.name=.357马格南锻模
 item.stamp_44.name=.44马格南锻模
 item.stamp_50.name=大口径锻模
 item.stamp_9.name=小口径锻模
@@ -1932,7 +2025,7 @@ item.waste_thorium.name=枯竭钍燃料
 item.waste_thorium_hot.name=枯竭钍燃料[热]
 item.waste_uranium.name=枯竭铀燃料
 item.waste_uranium_hot.name=枯竭铀燃料[热]
-item.watch.name=破怀表
+item.watch.name=破旧怀表
 item.weapon_bat.name=板球棒
 item.weapon_bat_nail.name=板上钉钉
 item.weapon_golf_club.name=黑手党快乐杆
@@ -1949,6 +2042,7 @@ item.wire_red_copper.name=紫铜线
 item.wire_schrabidium.name=Sa326线
 item.wire_tungsten.name=钨线
 item.wiring_red_copper.name=电缆卷
+item.wood_gavel.name=木槌
 item.wrench.name=管道扳手
 item.wrench_flipped.name=刺刀扳手
 
@@ -1989,6 +2083,14 @@ tile.block_aluminium.name=铝块
 tile.block_asbestos.name=石棉块
 tile.block_australium.name=奥斯块
 tile.block_beryllium.name=铍块
+tile.block_cap_fritz.name=Fritz瓶盖方块
+tile.block_cap_korl.name=Korl瓶盖方块
+tile.block_cap_nuka.name=核子可乐瓶盖方块
+tile.block_cap_quantum.name=樱桃味核子可乐瓶盖方块
+tile.block_cap_rad.name=辐射 S~核子可乐瓶盖方块
+tile.block_cap_sparkle.name=核子可乐瓶盖方块
+tile.block_cap_star.name=夕阳沙士星星瓶盖方块
+tile.block_cap_sunset.name=夕阳沙士瓶盖方块
 tile.block_cobalt.name=钴块
 tile.block_combine_steel.name=CMB钢块
 tile.block_copper.name=铜块
@@ -2051,13 +2153,18 @@ tile.bomb_multi.name=多功能炸弹
 tile.bomber.name=坠毁轰炸机
 tile.book_guide.name=HBM的核科技mod手册[遗留]
 tile.boxcar.name=车厢
-tile.block_asbestos.name=石棉砖块
+tile.brick_asbestos.name=石棉砖块
 tile.brick_compound.name=复合网格砖块
 tile.brick_concrete.name=混凝土砖块
 tile.brick_concrete_broken.name=破混凝土砖块
 tile.brick_concrete_cracked.name=裂混凝土砖块
 tile.brick_concrete_mossy.name=苔混凝土砖块
+tile.brick_dungeon.name=硒铜砖
+tile.brick_dungeon_circle.name=圆环硒铜块
+tile.brick_dungeon_flat.name=硒铜块
+tile.brick_dungeon_tile.name=硒铜瓦
 tile.brick_jungle.name=硫砷钢砖块
+tile.brick_jungle_circle.name=机械师之环
 tile.brick_jungle_cracked.name=开裂硫砷钢砖块
 tile.brick_jungle_glyph.name=硫砷钢石雕砖块
 tile.brick_jungle_lava.name=岩浆硫砷钢砖块
@@ -2151,6 +2258,23 @@ tile.glass_trinitite.name=核融玻璃
 tile.glass_uranium.name=铀玻璃
 tile.gravel_diamond.name=钻石砂砾
 tile.gravel_obsidian.name=碎黑曜石
+tile.hadron_access.name=粒子加速器接入终端
+tile.hadron_analysis.name=粒子加速器分析室壁
+tile.hadron_analysis_glass.name=粒子加速器分析室窗口
+tile.hadron_coil_alloy.name=密集超导线圈
+tile.hadron_coil_mese.name=密集Mese线圈
+tile.hadron_coil_schrabidium.name=密集Sa326线圈
+tile.hadron_coil_starmetal.name=密集星辉线圈
+tile.hadron_core.name=粒子加速器核心组件
+tile.hadron_diode.name=肖基特二极管
+tile.hadron_plating.name=粒子加速器镀层
+tile.hadron_plating_black.name=粒子加速器镀层 (黑)
+tile.hadron_plating_blue.name=粒子加速器镀层 (蓝)
+tile.hadron_plating_glass.name=粒子加速器镀层 (窗口)
+tile.hadron_plating_striped.name=粒子加速器镀层(低温危险)
+tile.hadron_plating_voltz.name=粒子加速器镀层 (VOLTZ)
+tile.hadron_plating_yellow.name=粒子加速器镀层(YelloDye)
+tile.hadron_power.name=粒子加速器电源接口
 tile.hazmat.name=防辐射布块
 tile.iter.name=聚变反应堆
 tile.launch_pad.name=导弹发射台
@@ -2196,11 +2320,13 @@ tile.machine_industrial_generator.name=工业发电机
 tile.machine_keyforge.name=锁匠桌
 tile.machine_large_turbine.name=工业汽轮机
 tile.machine_lithium_battery.name=锂蓄电池
+tile.machine_microwave.name=微波炉
 tile.machine_mining_laser.name=采矿激光
 tile.machine_minirtg.name=放射性同位素电池
 tile.machine_missile_assembly.name=导弹装配台
 tile.machine_nuke_furnace_off.name=核熔炉
 tile.machine_nuke_furnace_on.name=核熔炉
+tile.machine_powerrtg.name=PT同位素电池
 tile.machine_press.name=火力锻压机
 tile.machine_puf6_tank.name=六氟化钚储罐
 tile.machine_pumpjack.name=石油钻机
@@ -2275,9 +2401,20 @@ tile.ore_aluminium.name=铝矿石
 tile.ore_asbestos.name=石棉矿
 tile.ore_australium.name=奥斯矿石
 tile.ore_beryllium.name=铍矿石
+tile.ore_coal_oil.name=含油煤矿石
+tile.ore_coal_oil_burning.name=燃烧的含油煤矿石
 tile.ore_copper.name=铜矿石
 tile.ore_daffergon.name=达夫贡矿石
 tile.ore_fluorite.name=氟石矿石
+tile.ore_gneiss_asbestos.name=石棉矿页岩
+tile.ore_gneiss_copper.name=铜矿页岩
+tile.ore_gneiss_gold.name=金矿页岩
+tile.ore_gneiss_iron.name=铁矿页岩
+tile.ore_gneiss_lithium.name=锂矿页岩
+tile.ore_gneiss_rare.name=稀土矿页岩
+tile.ore_gneiss_schrabidium.name=Sa326矿页岩
+tile.ore_gneiss_uranium.name=铀矿页岩
+tile.ore_gneiss_uranium_scorched.name=烧焦的铀矿页岩
 tile.ore_lead.name=铅矿石
 tile.ore_lignite.name=褐煤矿石
 tile.ore_meteor_aluminium.name=铝矿陨石
@@ -2290,9 +2427,11 @@ tile.ore_meteor_thorium.name=钍矿陨石
 tile.ore_meteor_titanium.name=钛矿陨石
 tile.ore_meteor_tungsten.name=钨矿陨石
 tile.ore_meteor_uranium.name=铀矿陨石
+tile.ore_nether_coal.name=燃烧下界煤矿
 tile.ore_nether_fire.name=火矿石
 tile.ore_nether_plutonium.name=下界钚矿石
 tile.ore_nether_schrabidium.name=下界Sa326矿石
+tile.ore_nether_smoldering.name=阴燃下界岩
 tile.ore_nether_sulfur.name=下界硫磺矿石
 tile.ore_nether_tungsten.name=下界钨矿石
 tile.ore_nether_uranium.name=下界铀矿石
@@ -2360,21 +2499,23 @@ tile.sat_scanner.name=绘测和资源探测卫星[装饰块]
 tile.seal_controller.name=发射井舱门开关
 tile.seal_frame.name=发射井舱门框架
 tile.seal_hatch.name=发射井舱门
-tile.sellafield_0.name=Sellafite
+tile.sellafield_0.name=放射性熔融凝固物
-tile.sellafield_1.name=热Sellafite
+tile.sellafield_1.name=高温放射性熔融凝固物
-tile.sellafield_2.name=沸腾的Sellafite
+tile.sellafield_2.name=沸腾的放射性熔融凝固物
-tile.sellafield_3.name=灼热的Sellafite
+tile.sellafield_3.name=灼热的放射性熔融凝固物
-tile.sellafield_4.name=地狱的Sellafite
+tile.sellafield_4.name=地狱般的放射性熔融凝固物
-tile.sellafield_core.name=Sellafite核心
+tile.sellafield_core.name=放射性熔融凝固物核心
-tile.sellafield_slaked.name=消沉的Sellafite
+tile.sellafield_slaked.name=消沉的放射性熔融凝固物
 tile.soyuz_capsule.name=货物着陆舱
 tile.soyuz_launcher.name=联盟号发射平台
+tile.spikes.name=地刺
 tile.steel_beam.name=钢梁
 tile.steel_corner.name=钢墙角
 tile.steel_poles.name=钢杆
 tile.steel_roof.name=钢天花顶
 tile.steel_scaffold.name=钢脚手架
 tile.steel_wall.name=钢墙
+tile.stone_gneiss.name=石墨页岩
 tile.struct_iter_core.name=聚变反应堆核心组件
 tile.struct_launcher.name=发射台部件
 tile.struct_launcher_core.name=紧凑型发射台核心组件
@@ -2382,7 +2523,7 @@ tile.struct_launcher_core_large.name=发射台核心组件
 tile.struct_plasma_core.name=等离子加热器核心组件
 tile.struct_scaffold.name=发射台骨架
 tile.struct_soyuz_core.name=联盟号发射器核心组件
-tile.taint.name=污点
+tile.taint.name=腐质
 tile.taint_barrel.name=IMP残渣桶
 tile.tape_recorder.name=录音机
 tile.tesla.name=特斯拉线圈
@@ -2393,8 +2534,8 @@ tile.tile_lab.name=实验室瓷砖
 tile.tile_lab_broken.name=破损实验室瓷砖
 tile.tile_lab_cracked.name=开裂实验室瓷砖
 tile.toxic_block.name=绿色软泥
-tile.turret_cheapo.name=奇普·加特林哨兵
+tile.turret_cheapo.name=奇普•加特林哨兵
-tile.turret_cwis.name=MK-15“密集阵”近防系统
+tile.turret_cwis.name=Mk-15“密集阵”近防系统
 tile.turret_flamer.name=喷火炮塔
 tile.turret_heavy.name=重型机枪炮塔
 tile.turret_light.name=轻型机枪炮塔
@@ -2424,14 +2565,20 @@ tile.yellow_barrel.name=核废料桶
 
 tool.ability.centrifuge=自动离心
 tool.ability.crystallizer=自动结晶
+tool.ability.explosion=爆破
 tool.ability.hammer=范围挖掘
 tool.ability.luck=时运
+tool.ability.mercury=水银提取
 tool.ability.recursion=连锁挖矿
 tool.ability.shredder=自动粉碎
 tool.ability.silktouch=精准采集
 tool.ability.smelter=自动熔炼
 
+weapon.ability.beheader=斩首
+weapon.ability.chainsaw=痛苦面"锯"
+# 翻译时应和"电锯"押韵
 weapon.ability.radiation=辐射
+weapon.ability.phosphorus=白磷刀刃
 weapon.ability.stun=震撼
 weapon.ability.vampire=吸血
 

src/main/java/com/hbm/config/WorldConfig.java

@@ -22,6 +22,15 @@ public class WorldConfig {
 	public static int lithiumSpawn = 6;
 	public static int oilcoalSpawn = 128;
 
+	public static int netherUraniumuSpawn = 8;
+	public static int netherTungstenSpawn = 10;
+	public static int netherSulfurSpawn = 26;
+	public static int netherPhosphorusSpawn = 24;
+	public static int netherCoalSpawn = 24;
+	public static int netherPlutoniumSpawn = 8;
+
+	public static int endTikiteSpawn = 8;
+
 	public static int radioStructure = 500;
 	public static int antennaStructure = 250;
 	public static int atomStructure = 500;
@@ -71,6 +80,15 @@ public class WorldConfig {
 		rareSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.14_rareEarthSpawnRate", "Amount of rare earth ore veins per chunk", 6);
 		oilcoalSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.15_oilCoalSpawnRate", "Spawns an oily coal vein every nTH chunk", 128);
 
+		netherUraniumuSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.N00_uraniumSpawnrate", "Amount of nether uranium per chunk", 8);
+		netherTungstenSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.N01_tungstenSpawnrate", "Amount of nether tungsten per chunk", 10);
+		netherSulfurSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.N02_sulfurSpawnrate", "Amount of nether sulfur per chunk", 26);
+		netherPhosphorusSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.N03_phosphorusSpawnrate", "Amount of nether phosphorus per chunk", 24);
+		netherCoalSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.N04_coalSpawnrate", "Amount of nether coal per chunk", 24);
+		netherPlutoniumSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.N05_plutoniumSpawnrate", "Amount of nether plutonium per chunk, if enabled", 8);
+
+		endTikiteSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.E00_tikiteSpawnrate", "Amount of end trixite per chunk", 8);
+
 		final String CATEGORY_DUNGEON = "04_dungeons";
 		radioStructure = CommonConfig.createConfigInt(config, CATEGORY_DUNGEON, "4.00_radioSpawn", "Spawn radio station on every nTH chunk", 500);
 		antennaStructure = CommonConfig.createConfigInt(config, CATEGORY_DUNGEON, "4.01_antennaSpawn", "Spawn antenna on every nTH chunk", 250);

src/main/java/com/hbm/handler/BulletConfigSyncingUtil.java

@@ -149,6 +149,8 @@ public class BulletConfigSyncingUtil {
 	public static int R556_FLECHETTE_SLEEK = i++;
 	public static int R556_K = i++;
 	
+	public static int B75_NORMAL = i++;
+
 	public static int G20_NORMAL_FIRE = i++;
 	public static int G20_SHRAPNEL_FIRE = i++;
 	public static int G20_SLUG_FIRE = i++;
@@ -334,6 +336,8 @@ public class BulletConfigSyncingUtil {
 		configSet.put(R556_FLECHETTE_SLEEK, Gun556mmFactory.get556FlechetteSleekConfig());
 		configSet.put(R556_K, Gun556mmFactory.get556KConfig());
 		
+		configSet.put(B75_NORMAL, Gun75BoltFactory.get75BoltConfig());
+        
 		configSet.put(G20_NORMAL_FIRE, Gun20GaugeFactory.get20GaugeConfig().setToFire(3));
 		configSet.put(G20_SHRAPNEL_FIRE, Gun20GaugeFactory.get20GaugeShrapnelConfig().setToFire(3));
 		configSet.put(G20_SLUG_FIRE, Gun20GaugeFactory.get20GaugeSlugConfig().setToFire(3));

src/main/java/com/hbm/handler/GunConfiguration.java

@@ -53,6 +53,8 @@ public class GunConfiguration {
 	public int reloadType;
 	//whether or not the infinity enchantment should work
 	public boolean allowsInfinity;
+	//whether the ammo count should be displayed
+	public boolean showAmmo = true;
 	
 	public String name = "";
 	public String manufacturer = "";

src/main/java/com/hbm/handler/guncfg/Gun556mmFactory.java

@@ -39,7 +39,7 @@ public class Gun556mmFactory {
 		config.ammoCap = 40;
 		config.reloadType = GunConfiguration.RELOAD_FULL;
 		config.allowsInfinity = true;
-		config.crosshair = Crosshair.L_BOX;
+		config.crosshair = Crosshair.L_CROSS;
 		config.durability = 10000;
 		config.reloadSound = GunConfiguration.RSOUND_MAG;
 		config.firingSound = "hbm:weapon.hksShoot";

src/main/java/com/hbm/handler/guncfg/Gun75BoltFactory.java

@@ -0,0 +1,85 @@
+package com.hbm.handler.guncfg;
+
+import java.util.ArrayList;
+
+import com.hbm.handler.BulletConfigSyncingUtil;
+import com.hbm.handler.BulletConfiguration;
+import com.hbm.handler.GunConfiguration;
+import com.hbm.items.ModItems;
+import com.hbm.render.anim.BusAnimation;
+import com.hbm.render.anim.BusAnimationKeyframe;
+import com.hbm.render.anim.BusAnimationSequence;
+import com.hbm.render.anim.HbmAnimations.AnimType;
+import com.hbm.render.util.RenderScreenOverlay.Crosshair;
+
+public class Gun75BoltFactory {
+
+	public static GunConfiguration getBolterConfig() {
+		
+		GunConfiguration config = new GunConfiguration();
+		
+		config.rateOfFire = 2;
+		config.roundsPerCycle = 1;
+		config.gunMode = GunConfiguration.MODE_NORMAL;
+		config.firingMode = GunConfiguration.FIRE_AUTO;
+		config.hasSights = false;
+		config.reloadDuration = 40;
+		config.firingDuration = 0;
+		config.ammoCap = 30;
+		config.reloadType = GunConfiguration.RELOAD_FULL;
+		config.allowsInfinity = true;
+		config.crosshair = Crosshair.NONE;
+		config.durability = 10000;
+		config.reloadSound = GunConfiguration.RSOUND_MAG;
+		config.firingSound = "hbm:weapon.hksShoot";
+		config.reloadSoundEnd = false;
+		config.showAmmo = false;
+		
+		config.animations.put(AnimType.CYCLE, new BusAnimation()
+				.addBus("RECOIL", new BusAnimationSequence()
+						.addKeyframe(new BusAnimationKeyframe(1, 0, 0, 25))
+						.addKeyframe(new BusAnimationKeyframe(0, 0, 0, 75))
+						)
+				.addBus("EJECT", new BusAnimationSequence()
+						.addKeyframe(new BusAnimationKeyframe(0, 0, 0, 25))
+						.addKeyframe(new BusAnimationKeyframe(0, 0, 1, 75))
+						)
+				);
+		
+		config.animations.put(AnimType.RELOAD, new BusAnimation()
+				.addBus("TILT", new BusAnimationSequence()
+						.addKeyframe(new BusAnimationKeyframe(1, 0, 0, 250))
+						.addKeyframe(new BusAnimationKeyframe(1, 0, 0, 1500))
+						.addKeyframe(new BusAnimationKeyframe(0, 0, 0, 250))
+						)
+				.addBus("MAG", new BusAnimationSequence()
+						.addKeyframe(new BusAnimationKeyframe(0, 0, 1, 500))
+						.addKeyframe(new BusAnimationKeyframe(1, 0, 1, 500))
+						.addKeyframe(new BusAnimationKeyframe(0, 0, 0, 500))
+						)
+				);
+		
+		config.name = "Manticora Pattern Boltgun";
+		config.manufacturer = "Cerix Magnus";
+		
+		config.config = new ArrayList();
+		config.config.add(BulletConfigSyncingUtil.B75_NORMAL);
+		
+		return config;
+	}
+
+	static float inaccuracy = 0.5F;
+	public static BulletConfiguration get75BoltConfig() {
+		
+		BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig();
+		
+		bullet.ammo = ModItems.ammo_75bolt;
+		bullet.ammoCount = 30;
+		bullet.spread *= inaccuracy;
+		bullet.dmgMin = 5;
+		bullet.dmgMax = 10;
+		
+		return bullet;
+	}
+
+}

src/main/java/com/hbm/items/ModItems.java

@@ -1199,6 +1199,7 @@ public class ModItems {
 	public static Item ammo_50bmg_star;
 	public static Item ammo_50bmg_chlorophyte;
 	public static Item ammo_50bmg_sleek;
+	public static Item ammo_75bolt;
 	public static Item ammo_folly;
 	public static Item ammo_folly_nuclear;
 	public static Item ammo_folly_du;
@@ -1317,6 +1318,7 @@ public class ModItems {
 	public static Item gun_cryolator;
 	public static Item gun_cryolator_ammo;
 	public static Item gun_mp;
+	public static Item gun_bolter;
 	public static Item gun_brimstone;
 	public static Item gun_zomg;
 	public static Item gun_super_shotgun;
@@ -3082,6 +3084,7 @@ public class ModItems {
 		ammo_50bmg_star = new ItemAmmo().setUnlocalizedName("ammo_50bmg_star").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_star");
 		ammo_50bmg_chlorophyte = new ItemAmmo().setUnlocalizedName("ammo_50bmg_chlorophyte").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_chlorophyte");
 		ammo_50bmg_sleek = new ItemAmmo().setUnlocalizedName("ammo_50bmg_sleek").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_sleek");
+		ammo_75bolt = new ItemAmmo().setUnlocalizedName("ammo_75bolt").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_75bolt");
 		ammo_357_desh = new ItemAmmo().setUnlocalizedName("ammo_357_desh").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_357_desh");
 		ammo_44 = new ItemAmmo().setUnlocalizedName("ammo_44").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44");
 		ammo_44_ap = new ItemAmmo().setUnlocalizedName("ammo_44_ap").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_ap");
@@ -3215,6 +3218,7 @@ public class ModItems {
 		gun_cryolator = new GunCryolator().setUnlocalizedName("gun_cryolator").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_cryolator");
 		ammo_566_gold = new ItemCustomLore().setUnlocalizedName("gun_mp_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_pm_ammo");
 		gun_mp = new ItemGunBase(Gun556mmFactory.getEuphieConfig()).setUnlocalizedName("gun_mp").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_pm");
+		gun_bolter = new ItemGunBase(Gun75BoltFactory.getBolterConfig()).setUnlocalizedName("gun_bolter").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_bolter");
 		gun_brimstone = new GunBrimstone().setUnlocalizedName("gun_brimstone").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_brimstone");
 		gun_zomg = new ItemGunBase(GunEnergyFactory.getZOMGConfig()).setUnlocalizedName("gun_zomg").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_zomg");
 		gun_revolver_inverted = new GunSuicide().setUnlocalizedName("gun_revolver_inverted").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_inverted");
@@ -5356,6 +5360,7 @@ public class ModItems {
 		GameRegistry.registerItem(gun_flamer, gun_flamer.getUnlocalizedName());
 		GameRegistry.registerItem(gun_cryolator, gun_cryolator.getUnlocalizedName());
 		GameRegistry.registerItem(gun_mp, gun_mp.getUnlocalizedName());
+		GameRegistry.registerItem(gun_bolter, gun_bolter.getUnlocalizedName());
 		GameRegistry.registerItem(gun_brimstone, gun_brimstone.getUnlocalizedName());
 		GameRegistry.registerItem(gun_zomg, gun_zomg.getUnlocalizedName());
 		GameRegistry.registerItem(gun_emp, gun_emp.getUnlocalizedName());
@@ -5489,6 +5494,7 @@ public class ModItems {
 		GameRegistry.registerItem(ammo_50bmg_star, ammo_50bmg_star.getUnlocalizedName());
 		GameRegistry.registerItem(ammo_50bmg_chlorophyte, ammo_50bmg_chlorophyte.getUnlocalizedName());
 		GameRegistry.registerItem(ammo_50bmg_sleek, ammo_50bmg_sleek.getUnlocalizedName());
+		GameRegistry.registerItem(ammo_75bolt, ammo_75bolt.getUnlocalizedName());
 		GameRegistry.registerItem(ammo_fuel, ammo_fuel.getUnlocalizedName());
 		GameRegistry.registerItem(ammo_fuel_napalm, ammo_fuel_napalm.getUnlocalizedName());
 		GameRegistry.registerItem(ammo_fuel_phosphorus, ammo_fuel_phosphorus.getUnlocalizedName());

src/main/java/com/hbm/items/special/ItemCustomLore.java

@@ -377,6 +377,10 @@ public class ItemCustomLore extends Item {
 		{
 			list.add("It pulses with power.");
 		}
+		
+		if(this == ModItems.nugget_mox_fuel) {
+			list.add("Moxie says: " + EnumChatFormatting.BOLD + "TAX EVASION.");
+		}
 	}
 
     @Override

src/main/java/com/hbm/items/tool/ItemMirrorTool.java

@@ -1,10 +1,16 @@
 package com.hbm.items.tool;
 
+import java.util.List;
+
+import com.google.common.collect.Multimap;
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.tileentity.machine.TileEntitySolarMirror;
+import com.hbm.util.I18nUtil;
 
 import net.minecraft.block.Block;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -12,6 +18,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.util.ChatStyle;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 
 public class ItemMirrorTool extends Item {
@@ -34,7 +41,7 @@ public class ItemMirrorTool extends Item {
 				stack.stackTagCompound.setInteger("posY", pos[1] + 1);
 				stack.stackTagCompound.setInteger("posZ", pos[2]);
 				
-				player.addChatComponentMessage(new ChatComponentTranslation("solar.linked").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.YELLOW)));
+				player.addChatComponentMessage(new ChatComponentTranslation(this.getUnlocalizedName() + ".linked").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.YELLOW)));
 			}
 			
 			return true;
@@ -44,7 +51,12 @@ public class ItemMirrorTool extends Item {
 			
 			if(!world.isRemote) {
 				TileEntitySolarMirror mirror = (TileEntitySolarMirror)world.getTileEntity(x, y, z);
-				mirror.setTarget(stack.stackTagCompound.getInteger("posX"), stack.stackTagCompound.getInteger("posY"), stack.stackTagCompound.getInteger("posZ"));
+				int tx = stack.stackTagCompound.getInteger("posX");
+				int ty = stack.stackTagCompound.getInteger("posY");
+				int tz = stack.stackTagCompound.getInteger("posZ");
+				
+				if(Vec3.createVectorHelper(x - tx, y - ty, z - tz).lengthVector() < 25)
+					mirror.setTarget(tx, ty, tz);
 			}
 			
 			return true;
@@ -52,4 +64,19 @@ public class ItemMirrorTool extends Item {
 		
 		return false;
     }
+
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
+		
+		for(String s : I18nUtil.resolveKeyArray(this.getUnlocalizedName() + ".desc"))
+			list.add(EnumChatFormatting.YELLOW + s);
+	}
+
+	@Override
+	public Multimap getAttributeModifiers(ItemStack stack) {
+		
+		Multimap multimap = super.getAttributeModifiers(stack);
+		multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", 2, 0));
+		return multimap;
+	}
 }

src/main/java/com/hbm/items/weapon/ItemGunBase.java

@@ -721,6 +721,7 @@ public class ItemGunBase extends Item implements IHoldableWeapon, IItemHUD {
 			Item ammo = bcfg.ammo;
 			int count = ItemGunBase.getMag(stack);
 			int max = gcfg.ammoCap;
+			boolean showammo = gcfg.showAmmo;
 			
 			if(gcfg.reloadType == GunConfiguration.RELOAD_NONE) {
 				ammo = ItemGunBase.getBeltType(player, stack, true);
@@ -730,7 +731,7 @@ public class ItemGunBase extends Item implements IHoldableWeapon, IItemHUD {
 			
 			int dura = ItemGunBase.getItemWear(stack) * 50 / gcfg.durability;
 			
-			RenderScreenOverlay.renderAmmo(event.resolution, Minecraft.getMinecraft().ingameGUI, ammo, count, max, dura);
+			RenderScreenOverlay.renderAmmo(event.resolution, Minecraft.getMinecraft().ingameGUI, ammo, count, max, dura, showammo);
 			
 			if(gun.altConfig != null && gun.altConfig.reloadType == GunConfiguration.RELOAD_NONE) {
 				Item oldAmmo = ammo;

src/main/java/com/hbm/lib/HbmWorldGen.java

@@ -632,14 +632,14 @@ public class HbmWorldGen implements IWorldGenerator {
 
 	private void generateNether(World world, Random rand, int i, int j) {
 
-		DungeonToolbox.generateOre(world, rand, i, j, 8, 6, 0, 127, ModBlocks.ore_nether_uranium, Blocks.netherrack);
+		DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.netherUraniumuSpawn, 6, 0, 127, ModBlocks.ore_nether_uranium, Blocks.netherrack);
-		DungeonToolbox.generateOre(world, rand, i, j, 10, 10, 0, 127, ModBlocks.ore_nether_tungsten, Blocks.netherrack);
+		DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.netherTungstenSpawn, 10, 0, 127, ModBlocks.ore_nether_tungsten, Blocks.netherrack);
-		DungeonToolbox.generateOre(world, rand, i, j, 26, 12, 0, 127, ModBlocks.ore_nether_sulfur, Blocks.netherrack);
+		DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.netherSulfurSpawn, 12, 0, 127, ModBlocks.ore_nether_sulfur, Blocks.netherrack);
-		DungeonToolbox.generateOre(world, rand, i, j, 24, 6, 0, 127, ModBlocks.ore_nether_fire, Blocks.netherrack);
+		DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.netherPhosphorusSpawn, 6, 0, 127, ModBlocks.ore_nether_fire, Blocks.netherrack);
-		DungeonToolbox.generateOre(world, rand, i, j, 24, 32, 16, 96, ModBlocks.ore_nether_coal, Blocks.netherrack);
+		DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.netherCoalSpawn, 32, 16, 96, ModBlocks.ore_nether_coal, Blocks.netherrack);
 		
 		if(GeneralConfig.enablePlutoniumOre)
-			DungeonToolbox.generateOre(world, rand, i, j, 6, 4, 0, 127, ModBlocks.ore_nether_uranium, Blocks.netherrack);
+			DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.netherPlutoniumSpawn, 4, 0, 127, ModBlocks.ore_nether_uranium, Blocks.netherrack);
 
 		for(int k = 0; k < 30; k++){
 			int x = i + rand.nextInt(16);
@@ -663,7 +663,7 @@ public class HbmWorldGen implements IWorldGenerator {
 	}
 
 	private void generateEnd(World world, Random rand, int i, int j) {
-		DungeonToolbox.generateOre(world, rand, i, j, 8, 6, 0, 127, ModBlocks.ore_tikite, Blocks.end_stone);
+		DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.endTikiteSpawn, 6, 0, 127, ModBlocks.ore_tikite, Blocks.end_stone);
 	}
 
 }

src/main/java/com/hbm/main/ClientProxy.java

@@ -288,6 +288,7 @@ public class ClientProxy extends ServerProxy {
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_sauer, new ItemRenderWeaponSauer());
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_vortex, new ItemRenderWeaponVortex());
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_thompson, new ItemRenderWeaponThompson());
+		MinecraftForgeClient.registerItemRenderer(ModItems.gun_bolter, new ItemRenderWeaponBolter());
 		//ammo
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_fatman_ammo, new ItemRenderMiniNuke());
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_mirv_ammo, new ItemRenderMIRV());

src/main/java/com/hbm/main/CraftingManager.java

@@ -530,6 +530,9 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.coil_copper_torus, 2), new Object[] { " C ", "CPC", " C ", 'P', "plateIron", 'C', ModItems.coil_copper }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.coil_advanced_torus, 2), new Object[] { " C ", "CPC", " C ", 'P', "plateIron", 'C', ModItems.coil_advanced_alloy }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.coil_gold_torus, 2), new Object[] { " C ", "CPC", " C ", 'P', "plateIron", 'C', ModItems.coil_gold }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.coil_copper_torus, 2), new Object[] { " C ", "CPC", " C ", 'P', "plateSteel", 'C', ModItems.coil_copper }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.coil_advanced_torus, 2), new Object[] { " C ", "CPC", " C ", 'P', "plateSteel", 'C', ModItems.coil_advanced_alloy }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.coil_gold_torus, 2), new Object[] { " C ", "CPC", " C ", 'P', "plateSteel", 'C', ModItems.coil_gold }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.coil_tungsten, 1), new Object[] { "WWW", "WIW", "WWW", 'W', ModItems.wire_tungsten, 'I', "ingotIron" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.coil_magnetized_tungsten, 1), new Object[] { "WWW", "WIW", "WWW", 'W', ModItems.wire_magnetized_tungsten, 'I', "ingotIron" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.tank_steel, 2), new Object[] { "STS", "S S", "STS", 'S', "plateSteel", 'T', "plateTitanium" }));
@@ -627,6 +630,8 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_press, 1), new Object[] { "IRI", "IPI", "IBI", 'I', "ingotIron", 'R', Blocks.furnace, 'B', "blockIron", 'P', Blocks.piston }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_siren, 1), new Object[] { "SIS", "ICI", "SRS", 'S', "plateSteel", 'I', ModItems.plate_polymer, 'C', ModItems.circuit_copper, 'R', "dustRedstone" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_microwave, 1), new Object[] { "III", "SGM", "IDI", 'I', ModItems.plate_polymer, 'S', "plateSteel", 'G', "paneGlass", 'M', ModItems.magnetron, 'D', ModItems.motor }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_solar_boiler), new Object[] { "SHS", "DHD", "SHS", 'S', "ingotSteel", 'H', ModItems.hull_big_steel, 'D', "dyeBlack" }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.solar_mirror, 3), new Object[] { "AAA", " B ", "SSS", 'A', "plateAluminum", 'B', ModBlocks.steel_beam, 'S', "ingotSteel" }));
 
 		GameRegistry.addRecipe(new ItemStack(ModBlocks.muffler, 1), new Object[] { "III", "IWI", "III", 'I', ModItems.plate_polymer, 'W', Blocks.wool });
 
@@ -750,6 +755,7 @@ public class CraftingManager {
 		GameRegistry.addShapelessRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.steel_corner)), new Object[] { Item.getItemFromBlock(ModBlocks.steel_wall), Item.getItemFromBlock(ModBlocks.steel_wall) });
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.steel_roof), 2), new Object[] { "SSS", 'S', "ingotSteel" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.steel_scaffold), 8), new Object[] { "SSS", " S ", "SSS", 'S', "ingotSteel" }));
+		GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.steel_beam), 8), new Object[] { "S", "S", "S", 'S', ModBlocks.steel_scaffold });
 		
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_rpg, 1), new Object[] { "SSW", " MW", 'S', ModItems.hull_small_steel, 'W', "plateIron", 'M', ModItems.mechanism_launcher_1 }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_panzerschreck, 1), new Object[] { "SSS", " MW", 'S', ModItems.hull_small_steel, 'W', "plateCopper", 'M', ModItems.mechanism_launcher_1 }));
@@ -1378,6 +1384,7 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.turret_biometry, 1), new Object[] { "CC ", "GGS", "SSS", 'C', ModItems.circuit_copper, 'S', "plateSteel", 'G', "plateGold", 'I', "plateLead" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.survey_scanner, 1), new Object[] { "SWS", " G ", "PCP", 'W', ModItems.wire_gold, 'P', ModItems.ingot_polymer, 'C', ModItems.circuit_gold, 'S', "plateSteel", 'G', "ingotGold" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.geiger_counter, 1), new Object[] { "GPP", "WCS", "WBB", 'W', ModItems.wire_gold, 'P', ModItems.ingot_polymer, 'C', ModItems.circuit_copper, 'G', "ingotGold", 'S', "plateSteel", 'B', ModItems.ingot_beryllium }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mirror_tool), new Object[] { " A ", " IA", "I  ", 'A', "ingotAluminum", 'I', "ingotIron" }));
 
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.key, 1), new Object[] { "  B", " B ", "P  ", 'P', "plateSteel", 'B', ModItems.bolt_tungsten }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.key_kit, 1), new Object[] { "PKP", "DTD", "PKP", 'P', "plateGold", 'K', ModItems.key, 'D', "dustDiamond", 'T', ModItems.screwdriver }));
@@ -1639,8 +1646,8 @@ public class CraftingManager {
 
 		GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.waste_trinitite), new Object[] { new ItemStack(Blocks.sand, 1, 0), ModItems.trinitite });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.waste_trinitite_red), new Object[] { new ItemStack(Blocks.sand, 1, 1), ModItems.trinitite });
-		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.sand_uranium), new Object[] { "sand", "dustUranium" }));
+		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.sand_uranium), new Object[] { "sand", "sand", "sand", "sand", "sand", "sand", "sand", "sand", "dustUranium" }));
-		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.sand_polonium), new Object[] { "sand", "dustPolonium" }));
+		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.sand_polonium), new Object[] { "sand", "sand", "sand", "sand", "sand", "sand", "sand", "sand", "dustPolonium" }));
 
 		GameRegistry.addRecipe(new ItemStack(ModItems.rune_blank, 1), new Object[] { "PSP", "SDS", "PSP", 'P', ModItems.powder_magic, 'S', ModItems.ingot_starmetal, 'D', ModItems.dynosphere_dineutronium_charged });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rune_isa, 1), new Object[] { ModItems.rune_blank, ModItems.powder_spark_mix, ModItems.singularity_counter_resonant });

src/main/java/com/hbm/main/ModEventHandler.java

@@ -4,7 +4,9 @@ import java.lang.reflect.Field;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Random;
 
 import org.apache.commons.lang3.math.NumberUtils;
@@ -26,6 +28,7 @@ import com.hbm.handler.RadiationWorldHandler;
 import com.hbm.handler.HTTPHandler;
 import com.hbm.items.ModItems;
 import com.hbm.items.armor.ArmorFSB;
+import com.hbm.items.weapon.ItemGunBase;
 import com.hbm.lib.Library;
 import com.hbm.lib.ModDamageSource;
 import com.hbm.lib.RefStrings;
@@ -36,6 +39,7 @@ import com.hbm.saveddata.AuxSavedData;
 import com.hbm.saveddata.RadiationSavedData;
 import com.hbm.util.ArmorUtil;
 import com.hbm.util.ContaminationUtil;
+import com.hbm.util.EnchantmentUtil;
 import com.hbm.world.generator.TimedGenerator;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@@ -44,6 +48,8 @@ import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.Phase;
 import cpw.mods.fml.common.gameevent.TickEvent.WorldTickEvent;
 import cpw.mods.fml.relauncher.ReflectionHelper;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.monster.EntityCreeper;
@@ -55,6 +61,7 @@ import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.potion.Potion;
@@ -67,6 +74,7 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
+import net.minecraftforge.event.AnvilUpdateEvent;
 import net.minecraftforge.event.ServerChatEvent;
 import net.minecraftforge.event.entity.EntityEvent.EnteringChunk;
 import net.minecraftforge.event.entity.living.LivingAttackEvent;
@@ -725,4 +733,28 @@ public class ModEventHandler
 			event.setCanceled(true);
 		}
 	}
+	
+	@SubscribeEvent
+	public void anvilUpdateEvent(AnvilUpdateEvent event) {
+		
+		if(event.left.getItem() instanceof ItemGunBase && event.right.getItem() == Items.enchanted_book) {
+			
+			event.output = event.left.copy();
+
+            Map mapright = EnchantmentHelper.getEnchantments(event.right);
+            Iterator itr = mapright.keySet().iterator();
+
+            while (itr.hasNext()) {
+            	
+            	int i = ((Integer)itr.next()).intValue();
+            	int j = ((Integer)mapright.get(Integer.valueOf(i))).intValue();
+            	Enchantment e = Enchantment.enchantmentsList[i];
+            	
+            	EnchantmentUtil.removeEnchantment(event.output, e);
+            	EnchantmentUtil.addEnchantment(event.output, e, j);
+            }
+            
+            event.cost = 10;
+		}
+	}
 }

src/main/java/com/hbm/main/ModEventHandlerClient.java

@@ -46,6 +46,7 @@ import net.minecraft.client.entity.AbstractClientPlayer;
 import net.minecraft.client.multiplayer.WorldClient;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.RenderPlayer;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -58,6 +59,7 @@ import net.minecraft.util.Vec3;
 import net.minecraftforge.client.event.MouseEvent;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
+import net.minecraftforge.client.event.RenderItemInFrameEvent;
 import net.minecraftforge.client.event.RenderLivingEvent;
 import net.minecraftforge.client.event.RenderPlayerEvent;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
@@ -381,4 +383,28 @@ public class ModEventHandlerClient {
 		if(event.map.getTextureType() == 0)
 			particleBase = event.map.registerIcon(RefStrings.MODID + ":particle/particle_base");
 	}
+
+	private static final ResourceLocation poster = new ResourceLocation(RefStrings.MODID + ":textures/models/misc/poster.png");
+	
+	@SubscribeEvent
+	public void renderFrame(RenderItemInFrameEvent event) {
+		
+		if(event.item != null && event.item.getItem() == ModItems.flame_pony) {
+			event.setCanceled(true);
+			
+			double p = 0.0625D;
+			double o = p * 2.75D;
+			
+			GL11.glDisable(GL11.GL_LIGHTING);
+			Minecraft.getMinecraft().renderEngine.bindTexture(poster);
+			Tessellator tess = Tessellator.instance;
+			tess.startDrawingQuads();
+			tess.addVertexWithUV(0.5, 0.5 + o, p * 0.5, 1, 0);
+			tess.addVertexWithUV(-0.5, 0.5 + o, p * 0.5, 0, 0);
+			tess.addVertexWithUV(-0.5, -0.5 + o, p * 0.5, 0, 1);
+			tess.addVertexWithUV(0.5, -0.5 + o, p * 0.5, 1, 1);
+			tess.draw();
+			GL11.glEnable(GL11.GL_LIGHTING);
+		}
+	}
 }

src/main/java/com/hbm/main/ResourceManager.java

@@ -492,6 +492,7 @@ public class ResourceManager {
 	public static final IModelCustom sauergun = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/sauergun.obj"));
 	public static final IModelCustom vortex = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/vortex.obj"));
 	public static final IModelCustom thompson = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/thompson.obj"));
+	public static final IModelCustom bolter = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/bolter.obj"));
 
 	public static final IModelCustom grenade_frag = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/grenade_frag.obj"));
 	public static final IModelCustom grenade_aschrab = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/grenade_aschrab.obj"));
@@ -533,6 +534,7 @@ public class ResourceManager {
 	public static final ResourceLocation sauergun_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/sauergun.png");
 	public static final ResourceLocation vortex_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/vortex.png");
 	public static final ResourceLocation thompson_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/thompson.png");
+	public static final ResourceLocation bolter_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/bolter.png");
 
 	public static final ResourceLocation grenade_mk2 = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/grenade_mk2.png");
 	public static final ResourceLocation grenade_aschrab_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/grenade_aschrab.png");

src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponBolter.java

@@ -0,0 +1,150 @@
+package com.hbm.render.item.weapon;
+
+import org.lwjgl.opengl.GL11;
+
+import com.hbm.items.weapon.ItemGunBase;
+import com.hbm.main.ResourceManager;
+import com.hbm.render.anim.HbmAnimations;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.client.IItemRenderer;
+
+public class ItemRenderWeaponBolter implements IItemRenderer {
+	
+	public ItemRenderWeaponBolter() { }
+
+	@Override
+	public boolean handleRenderType(ItemStack item, ItemRenderType type) {
+		switch(type) {
+		case EQUIPPED:
+		case EQUIPPED_FIRST_PERSON:
+		case ENTITY:
+		case INVENTORY:
+			return true;
+		default: return false;
+		}
+	}
+
+	@Override
+	public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
+		
+		return type == ItemRenderType.ENTITY && (helper == ItemRendererHelper.ENTITY_ROTATION || helper == ItemRendererHelper.ENTITY_BOBBING);
+	}
+
+	@Override
+	public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
+		
+		GL11.glPushMatrix();
+		
+		GL11.glEnable(GL11.GL_CULL_FACE);
+		GL11.glShadeModel(GL11.GL_SMOOTH);
+
+		Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.bolter_tex);
+		
+		switch(type) {
+		
+		case EQUIPPED_FIRST_PERSON:
+			
+			double s0 = 0.25D;
+			GL11.glRotated(25, 0, 0, 1);
+			GL11.glTranslated(1.25, -0.25, -0.25);
+			GL11.glRotated(-100, 0, 1, 0);
+			GL11.glScaled(s0, s0, s0);
+			
+			double[] recoil = HbmAnimations.getRelevantTransformation("RECOIL");
+			GL11.glRotated(recoil[0] * 5, 1, 0, 0);
+			GL11.glTranslated(0, 0, recoil[0]);
+
+			double[] tilt = HbmAnimations.getRelevantTransformation("TILT");
+			GL11.glTranslated(0, tilt[0], 3);
+			GL11.glRotated(tilt[0] * 35, 1, 0, 0);
+			GL11.glTranslated(0, 0, -3);
+			
+			ResourceManager.bolter.renderPart("Body");
+
+			double[] mag = HbmAnimations.getRelevantTransformation("MAG");
+			GL11.glPushMatrix();
+			GL11.glTranslated(0, 0, 5);
+			GL11.glRotated(mag[0] * 60 * (mag[2] == 1 ? 2.5 : 1), -1, 0, 0);
+			GL11.glTranslated(0, 0, -5);
+			ResourceManager.bolter.renderPart("Mag");
+			if(mag[2] != 1)
+				ResourceManager.bolter.renderPart("Bullet");
+			GL11.glPopMatrix();
+
+			GL11.glPushMatrix();
+			double[] casing = HbmAnimations.getRelevantTransformation("EJECT");
+			GL11.glTranslated(casing[2] * 5, casing[2] * 2, 0);
+			GL11.glRotated(casing[2] * 60, 1, 0, 0);
+			ResourceManager.bolter.renderPart("Casing");
+			GL11.glPopMatrix();
+			
+			break;
+			
+		case EQUIPPED:
+
+			double scale = 0.25D;
+			GL11.glScaled(scale, scale, scale);
+			GL11.glRotatef(15F, 0.0F, 0.0F, 1.0F);
+			GL11.glRotatef(-170, 0.0F, 1.0F, 0.0F);
+			GL11.glRotatef(-15F, 1.0F, 0.0F, 0.0F);
+			GL11.glTranslatef(-2F, -0.9F, -0.75F);
+			
+			break;
+			
+		case ENTITY:
+
+			double s1 = 0.2D;
+			GL11.glScaled(s1, s1, s1);
+			GL11.glTranslated(0, 1, 0);
+			
+			break;
+			
+		case INVENTORY:
+
+			GL11.glEnable(GL11.GL_LIGHTING);
+			
+			double s = 2.5D;
+			GL11.glTranslated(6, 10, 0);
+			GL11.glRotated(90, 0, 1, 0);
+			GL11.glRotated(135, 1, 0, 0);
+			GL11.glScaled(s, s, -s);
+			
+			break;
+			
+		default: break;
+		}
+		
+		if(type != ItemRenderType.EQUIPPED_FIRST_PERSON) {
+			ResourceManager.bolter.renderAll();
+		}
+		
+		GL11.glShadeModel(GL11.GL_FLAT);
+
+		GL11.glPushMatrix();
+        GL11.glPushAttrib(GL11.GL_LIGHTING_BIT);
+        GL11.glDisable(GL11.GL_LIGHTING);
+        GL11.glDisable(GL11.GL_CULL_FACE);
+        OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240F, 240F);
+        
+        FontRenderer font = Minecraft.getMinecraft().fontRenderer;
+        String s = ((ItemGunBase)item.getItem()).getMag(item) + "";
+        float f3 = 0.04F;
+        GL11.glTranslatef(-0.025F - (font.getStringWidth(s) / 2) * 0.04F, 2.15F, 2.95F);
+        GL11.glScalef(f3, -f3, f3);
+        GL11.glRotatef(45, 1, 0, 0);
+        GL11.glNormal3f(0.0F, 0.0F, -1.0F * f3);
+        font.drawString(s, 0, 0, 0xff0000);
+        
+        GL11.glEnable(GL11.GL_LIGHTING);
+        GL11.glPopAttrib();
+        RenderHelper.enableGUIStandardItemLighting();
+		GL11.glPopMatrix();
+		
+		GL11.glPopMatrix();
+	}
+}

src/main/java/com/hbm/render/tileentity/RenderSolarMirror.java

@@ -8,6 +8,7 @@ import com.hbm.tileentity.machine.TileEntitySolarMirror;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.EnumSkyBlock;
 
 public class RenderSolarMirror extends TileEntitySpecialRenderer {
 
@@ -43,7 +44,7 @@ public class RenderSolarMirror extends TileEntitySpecialRenderer {
         GL11.glTranslated(0, -1, 0);
         ResourceManager.solar_mirror.renderPart("Mirror");
         
-        if(mirror.tY >= mirror.yCoord && te.getWorldObj().canBlockSeeTheSky(te.xCoord, te.yCoord + 1, te.zCoord)) {
+        if(mirror.isOn) {
 	        
 	        Tessellator tess = Tessellator.instance;
 	        GL11.glDisable(GL11.GL_TEXTURE_2D);
@@ -56,7 +57,7 @@ public class RenderSolarMirror extends TileEntitySpecialRenderer {
 	        GL11.glDepthMask(false);
 	        
 	        float min = 0.005F;
-	        float max = 0.02F;
+	        float max = 0.01F;
 	        
 	        tess.startDrawingQuads();
 	        tess.setColorRGBA_F(1F, 1F, 1F, max);

src/main/java/com/hbm/render/util/RenderScreenOverlay.java

@@ -108,7 +108,7 @@ public class RenderScreenOverlay {
 		Minecraft.getMinecraft().renderEngine.bindTexture(Gui.icons);
 	}
 	
-	public static void renderAmmo(ScaledResolution resolution, Gui gui, Item ammo, int count, int max, int dura) {
+	public static void renderAmmo(ScaledResolution resolution, Gui gui, Item ammo, int count, int max, int dura, boolean renderCount) {
 		
 		GL11.glPushMatrix();
         
@@ -123,7 +123,8 @@ public class RenderScreenOverlay {
 		
 		String cap = max == -1 ? ("∞") : ("" + max);
 		
-		Minecraft.getMinecraft().fontRenderer.drawString(count + " / " + cap, pX + 16, pZ + 6, 0xFFFFFF);
+		if(renderCount)
+			Minecraft.getMinecraft().fontRenderer.drawString(count + " / " + cap, pX + 16, pZ + 6, 0xFFFFFF);
 
         GL11.glDisable(GL11.GL_BLEND);
         GL11.glEnable(GL12.GL_RESCALE_NORMAL);

src/main/java/com/hbm/tileentity/machine/TileEntitySolarBoiler.java

@@ -32,9 +32,9 @@ public class TileEntitySolarBoiler extends TileEntity implements IFluidAcceptor,
 		
 		if(!worldObj.isRemote) {
 			
-			if(worldObj.getTotalWorldTime() % 10 == 0) {
+			//if(worldObj.getTotalWorldTime() % 5 == 0) {
 				fillFluidInit(FluidType.STEAM);
-			}
+			//}
 			
 			int process = heat / 10;
 			process = Math.min(process, water.getFill());
@@ -46,8 +46,8 @@ public class TileEntitySolarBoiler extends TileEntity implements IFluidAcceptor,
 			water.setFill(water.getFill() - process);
 			steam.setFill(steam.getFill() + process * 100);
 			
-			if(steam.getFill() > steam.getMaxFill() * 0.9)
+			//if(steam.getFill() > steam.getMaxFill() * 0.9)
-				System.out.println("*" + steam.getFill());
+			//	System.out.println("*" + steam.getFill());
 			
 			heat = 0;
 		}
@@ -105,7 +105,7 @@ public class TileEntitySolarBoiler extends TileEntity implements IFluidAcceptor,
 	
 	@Override
 	public boolean getTact() {
-		return worldObj.getTotalWorldTime() % 20 < 10;
+		return worldObj.getTotalWorldTime() % 2 == 0;
 	}
 
 	@Override

src/main/java/com/hbm/tileentity/machine/TileEntitySolarMirror.java

@@ -2,8 +2,11 @@ package com.hbm.tileentity.machine;
 
 import com.hbm.tileentity.TileEntityTickingBase;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.EnumSkyBlock;
 
 public class TileEntitySolarMirror extends TileEntityTickingBase {
@@ -11,6 +14,7 @@ public class TileEntitySolarMirror extends TileEntityTickingBase {
 	public int tX;
 	public int tY;
 	public int tZ;
+	public boolean isOn;
 
 	@Override
 	public String getInventoryName() {
@@ -25,13 +29,19 @@ public class TileEntitySolarMirror extends TileEntityTickingBase {
 			if(worldObj.getTotalWorldTime() % 20 == 0)
 				sendUpdate();
 			
-			if(tY < yCoord)
+			if(tY < yCoord) {
+				isOn = false;
 				return;
+			}
 			
 			int sun = worldObj.getSavedLightValue(EnumSkyBlock.Sky, xCoord, yCoord, zCoord) - worldObj.skylightSubtracted - 11;
 			
-			if(sun <= 0 || !worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord))
+			if(sun <= 0 || !worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord)) {
+				isOn = false;
 				return;
+			}
+			
+			isOn = true;
 			
 			TileEntity te = worldObj.getTileEntity(tX, tY - 1, tZ);
 			
@@ -48,6 +58,7 @@ public class TileEntitySolarMirror extends TileEntityTickingBase {
 		data.setInteger("posX", tX);
 		data.setInteger("posY", tY);
 		data.setInteger("posZ", tZ);
+		data.setBoolean("isOn", isOn);
 		this.networkPack(data, 200);
 	}
 
@@ -56,6 +67,7 @@ public class TileEntitySolarMirror extends TileEntityTickingBase {
 		tX = nbt.getInteger("posX");
 		tY = nbt.getInteger("posY");
 		tZ = nbt.getInteger("posZ");
+		isOn = nbt.getBoolean("isOn");
 	}
 	
 	public void setTarget(int x, int y, int z) {
@@ -79,4 +91,29 @@ public class TileEntitySolarMirror extends TileEntityTickingBase {
 		nbt.setInteger("targetY", tY);
 		nbt.setInteger("targetZ", tZ);
 	}
+	
+	AxisAlignedBB bb = null;
+	
+	@Override
+	public AxisAlignedBB getRenderBoundingBox() {
+		
+		if(bb == null) {
+			bb = AxisAlignedBB.getBoundingBox(
+					xCoord - 0.25,
+					yCoord,
+					zCoord - 0.25,
+					xCoord + 1.25,
+					yCoord + 1.5,
+					zCoord + 1.25
+					);
+		}
+		
+		return bb;
+	}
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public double getMaxRenderDistanceSquared() {
+		return 65536.0D;
+	}
 }

src/main/java/com/hbm/util/EnchantmentUtil.java

@@ -12,13 +12,17 @@ public class EnchantmentUtil {
 	
 	public static void removeEnchantment(ItemStack stack, Enchantment enchantment) {
 		
+		if(stack.getEnchantmentTagList() == null)
+			return;
+		
 		int i = 0;
 		for( ; i < stack.getEnchantmentTagList().tagCount(); i++) {
 			if(stack.getEnchantmentTagList().getCompoundTagAt(i).getShort("id") == enchantment.effectId)
 				break;
 		}
 		
-		stack.getEnchantmentTagList().removeTag(i);
+		if(i < stack.getEnchantmentTagList().tagCount())
+			stack.getEnchantmentTagList().removeTag(i);
 		
 		if(stack.getEnchantmentTagList().tagCount() == 0)
 			stack.getTagCompound().removeTag("ench");