Packet sending, more sounds, drill

2026-03-13 05:05:36 +00:00 · 2017-06-24 12:50:39 +02:00 · 2017-06-24 12:50:39 +02:00 · 54442c1ae4
commit 54442c1ae4
parent eb98f5a844
134 changed files with 8499 additions and 1099 deletions
--- a/Factory1.png
+++ b/Factory1.png
--- a/Factory2.png
+++ b/Factory2.png
--- a/Factory3.png
+++ b/Factory3.png
--- a/Fusion1.png
+++ b/Fusion1.png
--- a/Fusion2.png
+++ b/Fusion2.png
--- a/Fusion3.png
+++ b/Fusion3.png
--- a/Fusion4.png
+++ b/Fusion4.png
--- a/Fusion5.png
+++ b/Fusion5.png
--- a/Info.txt
+++ b/Info.txt
@ -1,2 +0,0 @@
-The included images are schematics for all multiblock structures, layer by layer. If a block is seperated by a black line, it is interchangeable, such as the electricity ports of factories which are opitonal, the inner tungsten blanket of the fusion reactor which can be removed completely and the concrete around the nuclear reactor (leaving out these parts will have it's downsites, such as less energy, missing ports or radiation)
-The advanced factory can be built like the basic one, but with it's own parts.
--- a/Reactor1.png
+++ b/Reactor1.png
--- a/Reactor2.png
+++ b/Reactor2.png
--- a/Reactor3.png
+++ b/Reactor3.png
--- a/Reactor4.png
+++ b/Reactor4.png
--- a/Reactor5.png
+++ b/Reactor5.png
--- a/assets/hbm/lang/de_DE.lang
+++ b/assets/hbm/lang/de_DE.lang
@ -106,6 +106,7 @@ tile.therm_exo.name=Exothermische Bombe
 tile.crashed_bomb.name=Blindgänger

 tile.crate.name=Vorratskiste
+tile.marker_structure.name=Multiblock-Strukturvorlage

 tile.machine_difurnace_off.name=Legierungshochofen
 tile.machine_difurnace_on.name=Legierungshochofen
@ -167,6 +168,11 @@ tile.machine_flare.name=Abfackelturm
 container.gasFlare=Abfackelturm
 tile.gas_duct.name=Gasleitung
 tile.gas_duct_solid.name=Verstärkte Gasleitung
+tile.machine_drill.name=Automatischer Minenbohrer
+container.miningDrill=Automatischer Minenbohrer
+
+tile.red_pylon.name=Strommasten
+item.wiring_red_copper.name=Kabeltrommel

 tile.rail_highspeed.name=Hochgeschwindigkeitsschienen
 tile.rail_booster.name=Hochgeschwindigkeits-Boosterschienen
@ -291,6 +297,10 @@ item.nugget_unobtainium.name=Unobtainiumnugget
 item.nugget_daffergon.name=Daffergonnugget
 item.nugget_verticium.name=Verticiumnugget

+item.ingot_desh.name=Deshbarren
+item.nugget_desh.name=Deshnugget
+item.powder_desh.name=Deshstaub
+
 item.nugget_u235.name=U235-Nugget
 item.nugget_u238.name=U238-Nugget
 item.nugget_pu238.name=Pu238-Nugget
@ -337,6 +347,7 @@ tile.block_reiium.name=Reiiumblock
 tile.block_unobtainium.name=Unobtainiumblock
 tile.block_daffergon.name=Daffergonblock
 tile.block_verticium.name=Verticiumblock
+tile.block_desh.name=Verstärketer Deshblock

 tile.ore_aluminium.name=Aluminiumerz
 tile.ore_copper.name=Kupfererz
@ -376,6 +387,7 @@ tile.reinforced_lamp_on.name=Verstärkte Lampe
 tile.brick_concrete.name=Betonziegel
 tile.brick_obsidian.name=Obsidianziegel
 tile.brick_light.name=Helle Ziegel
+tile.asphalt.name=Asphalt

 tile.cmb_brick.name=CMB-Stahlfliese
 tile.cmb_brick_reinforced.name=Verstärkte CMB-Ziegel
@ -441,6 +453,8 @@ item.powder_dura_steel.name=Schnellarbeitsstahlstaub
 item.powder_polymer.name=Polymerstaub
 item.powder_lanthanium.name=Lanthanstaub
 item.powder_actinium.name=Actiniumstaub
+item.powder_lithium_tiny.name=Kleiner Haufen Lithiumstaub
+item.powder_cobalt_tiny.name=Kleiner Haufen Cobaltstaub

 item.battery_generic.name=Batterie
 item.battery_advanced.name=Fortgeschrittene Batterie
@ -461,6 +475,20 @@ item.battery_advanced_cell_12.name=Zwölffache fortgeschrittene Energiezelle
 item.battery_lithium_cell_6.name=Sechsfache Lithium-Ionen-Energiezelle
 item.battery_schrabidium_cell_4.name=Vierfache Schrabidium-Energiezelle

+item.upgrade_template.name=Maschinenupgrade-Vorlage
+item.upgrade_speed_1.name=Rotes Maschinenupgrade Mk.I
+item.upgrade_speed_2.name=Rotes Maschinenupgrade Mk.II
+item.upgrade_speed_3.name=Rotes Maschinenupgrade Mk.III
+item.upgrade_effect_1.name=Grünes Maschinenupgrade Mk.I
+item.upgrade_effect_2.name=Grünes Maschinenupgrade Mk.II
+item.upgrade_effect_3.name=Grünes Maschinenupgrade Mk.III
+item.upgrade_power_1.name=Blaues Maschinenupgrade Mk.I
+item.upgrade_power_2.name=Blaues Maschinenupgrade Mk.II
+item.upgrade_power_3.name=Blaues Maschinenupgrade Mk.III
+item.upgrade_fortune_1.name=Lila Maschinenupgrade Mk.I
+item.upgrade_fortune_2.name=Lila Maschinenupgrade Mk.II
+item.upgrade_fortune_3.name=Lila Maschinenupgrade Mk.III
+
 item.fusion_core.name=Fusionskern
 item.energy_core.name=Selbstgebauter Energiekern

@ -489,6 +517,7 @@ item.ducttape.name=Klebeband
 item.magnet_dee.name=Duantenmagnete
 item.magnet_circular.name=Flachmagnet
 item.cyclotron_tower.name=Zyklotronenturm
+item.plate_dalekanium.name=Wütendes Metall

 item.cell_empty.name=Leere Zelle
 item.cell_uf6.name=Uranhexafluorit-Zelle
@ -521,6 +550,8 @@ item.canister_canola.name=Schmiermittelkanister
 item.canister_oil.name=Rohölkanister
 item.canister_fuel.name=Treibstoffkanister
 item.canister_kerosene.name=Kerosinkanister
+item.canister_reoil.name=Kanister voll aufbereitetem Industrieöl
+item.canister_petroil.name=Gemischkanister
 item.canister_napalm.name=Napalm B
 item.canister_NITAN.name=NITAN© 100 Oktan Supertreibstoff
 item.gas_empty.name=Leerer Gastank
@ -747,6 +778,7 @@ item.gun_jack.name=Jackhammer
 item.gun_spark.name=Die Zündkerze
 item.gun_hp.name=HPP Lazerjet
 item.gun_euthanasia.name=Euthanasia
+item.gun_defabricator.name=Defabrikator

 item.gun_revolver_iron_ammo.name=Patrone
 item.gun_revolver_ammo.name=Bleipatrone
@ -772,6 +804,7 @@ item.gun_jack_ammo.name=Vierfache Schrotpatrone
 item.gun_spark_ammo.name=Elektromagnetische Katusche
 item.gun_hp_ammo.name=Tintenpatrone
 item.gun_euthanasia_ammo.name=Spritze
+item.gun_defabricator_ammo.name=Defabrikator-Energiezelle

 item.clip_revolver_iron.name=Box voll Eisenkugeln
 item.clip_revolver.name=.357 Magnum Patronen
@ -815,6 +848,7 @@ entity.hbm.entity_rocket.name=Rakete
 entity.hbm.entity_schrabnel.name=Schrabnel
 entity.entity_mob_nuclear_creeper.name=Nuklearer Creeper
 entity.entity_mob_hunter_chopper.name=Jagdschrauber
+entity.entity_cyber_crab.name=Cyber-Krabbe

 item.cap_aluminium.name=Aluminiumdeckel
 item.hull_small_steel.name=Kleine Stahlhülle
--- a/assets/hbm/lang/en_US.lang
+++ b/assets/hbm/lang/en_US.lang
@ -106,6 +106,7 @@ tile.therm_exo.name=Exothermic Bomb
 tile.crashed_bomb.name=Dud

 tile.crate.name=Supply Crate
+tile.marker_structure.name=Multiblock Structure Marker

 tile.machine_difurnace_off.name=Alloy Furnace
 tile.machine_difurnace_on.name=Alloy Furnace
@ -167,6 +168,11 @@ tile.machine_flare.name=Gas Flare
 container.gasFlare=Gas Flare
 tile.gas_duct.name=Gas Pipe
 tile.gas_duct_solid.name=Coated Gas Pipe
+tile.machine_drill.name=Automatic Mining Drill
+container.miningDrill=Automatic Mining Drill
+
+tile.red_pylon.name=Electricity Pole
+item.wiring_red_copper.name=Cable Drum

 tile.rail_highspeed.name=High Speed Rail
 tile.rail_booster.name=High Speed Booster Rail
@ -291,6 +297,10 @@ item.nugget_unobtainium.name=Unobtainium Nugget
 item.nugget_daffergon.name=Daffergon Nugget
 item.nugget_verticium.name=Verticium Nugget

+item.ingot_desh.name=Desh Ingot
+item.nugget_desh.name=Desh Nugget
+item.powder_desh.name=Desh Powder
+
 item.nugget_u235.name=U235 Nugget
 item.nugget_u238.name=U238 Nugget
 item.nugget_pu238.name=Pu238 Nugget
@ -337,6 +347,7 @@ tile.block_reiium.name=Block of Reiium
 tile.block_unobtainium.name=Block of Unobtainium
 tile.block_daffergon.name=Block of Daffergon
 tile.block_verticium.name=Block of Verticium
+tile.block_desh.name=Reinfoced Block of Desh

 tile.ore_aluminium.name=Aluminium Ore
 tile.ore_copper.name=Copper Ore
@ -376,6 +387,7 @@ tile.reinforced_lamp_on.name=Reinforced Lamp
 tile.brick_concrete.name=Concrete Bricks
 tile.brick_obsidian.name=Obsidian Bricks
 tile.brick_light.name=Light Bricks
+tile.asphalt.name=Asphalt

 tile.cmb_brick.name=CMB Steel Tile
 tile.cmb_brick_reinforced.name=Reinforced CMB Bricks
@ -441,6 +453,8 @@ item.powder_dura_steel.name=High-Speed Steel Powder
 item.powder_polymer.name=Polymer Powder
 item.powder_lanthanium.name=Lanthanium Powder
 item.powder_actinium.name=Actinium Powder
+item.powder_lithium_tiny.name=Tiny Pile of Lithium Powder
+item.powder_cobalt_tiny.name=Tiny Pile of Cobalt Powder

 item.battery_generic.name=Battery
 item.battery_advanced.name=Advanced Battery
@ -461,6 +475,20 @@ item.battery_advanced_cell_12.name=Twelvefold Advanced Power Cell
 item.battery_lithium_cell_6.name=Sixfold Lithium-Ion Power Cell
 item.battery_schrabidium_cell_4.name=Quadruple Schrabidium Power Cell

+item.upgrade_template.name=Machine Upgrade Piece Template
+item.upgrade_speed_1.name=Red Machine Upgrade Mk.I
+item.upgrade_speed_2.name=Red Machine Upgrade Mk.II
+item.upgrade_speed_3.name=Red Machine Upgrade Mk.III
+item.upgrade_effect_1.name=Green Machine Upgrade Mk.I
+item.upgrade_effect_2.name=Green Machine Upgrade Mk.II
+item.upgrade_effect_3.name=Green Machine Upgrade Mk.III
+item.upgrade_power_1.name=Blue Machine Upgrade Mk.I
+item.upgrade_power_2.name=Blue Machine Upgrade Mk.II
+item.upgrade_power_3.name=Blue Machine Upgrade Mk.III
+item.upgrade_fortune_1.name=Purple Machine Upgrade Mk.I
+item.upgrade_fortune_2.name=Purple Machine Upgrade Mk.II
+item.upgrade_fortune_3.name=Purple Machine Upgrade Mk.III
+
 item.fusion_core.name=Fusion Core
 item.energy_core.name=Makeshift Energy Core

@ -489,6 +517,7 @@ item.ducttape.name=Duct Tape
 item.magnet_dee.name=Dee Magnets
 item.magnet_circular.name=Flat Magnet
 item.cyclotron_tower.name=Cyclotron Tower
+item.plate_dalekanium.name=Angry Metal

 item.cell_empty.name=Empty Cell
 item.cell_uf6.name=Uranium Hexafluorite Cell
@ -521,6 +550,8 @@ item.canister_canola.name=Engine Lubricant
 item.canister_oil.name=Crude Oil Canister
 item.canister_fuel.name=Fuel Canister
 item.canister_kerosene.name=Kerosene Canister
+item.canister_reoil.name=Canister of Reclaimed Industrial Oil
+item.canister_petroil.name=Petroil Canister
 item.canister_napalm.name=Napalm B
 item.canister_NITAN.name=NITAN© 100 Octane Super Fuel
 item.gas_empty.name=Empty Gas Tank
@ -747,6 +778,7 @@ item.gun_jack.name=Jackhammer
 item.gun_spark.name=Spark Plug
 item.gun_hp.name=HPP Lazerjet
 item.gun_euthanasia.name=Euthanasia
+item.gun_defabricator.name=Defabricator

 item.gun_revolver_iron_ammo.name=Bullet
 item.gun_revolver_ammo.name=Lead Bullet
@ -772,6 +804,7 @@ item.gun_jack_ammo.name=Quadruple Shotgun Shell
 item.gun_spark_ammo.name=Electromagnetic Cartridge
 item.gun_hp_ammo.name=Ink Cartridge
 item.gun_euthanasia_ammo.name=Syringe
+item.gun_defabricator_ammo.name=Defabricator Energy Cell

 item.clip_revolver_iron.name=Box of Iron Rounds
 item.clip_revolver.name=Box of .357 Rounds
@ -814,7 +847,8 @@ entity.hbm.entity_bullet.name=Bullet
 entity.hbm.entity_rocket.name=Rocket
 entity.hbm.entity_schrabnel.name=Schrabnel
 entity.entity_mob_nuclear_creeper.name=Nuclear Creeper
-entity.entity_mob_hunter_chopper.name=Hunter Chopper
+entity.entity_mob_hunter_chopper.name=Hunter ChopperCreeper
+entity.entity_cyber_crab.name=Cyber Crab

 item.cap_aluminium.name=Aluminium Cap
 item.hull_small_steel.name=Small Steel Shell
--- a/assets/hbm/models/drill_bolt.obj
+++ b/assets/hbm/models/drill_bolt.obj
--- a/assets/hbm/models/drill_main.obj
+++ b/assets/hbm/models/drill_main.obj
--- a/assets/hbm/sounds.json
+++ b/assets/hbm/sounds.json
@ -34,6 +34,9 @@
 	"weapon.immolatorShoot": {"category": "player", "sounds": [{"name": "weapon/immolatorShoot", "stream": false}]},
 	"weapon.cryolatorShoot": {"category": "player", "sounds": [{"name": "weapon/cryolatorShoot", "stream": false}]},
 	"weapon.missileTakeOff": {"category": "player", "sounds": [{"name": "weapon/missileTakeOff", "stream": false}]},
+	"weapon.defabSpinup": {"category": "player", "sounds": [{"name": "weapon/defabSpinup", "stream": false}]},
+	"weapon.defabShoot": {"category": "player", "sounds": [{"name": "weapon/defabShoot", "stream": false}]},
+	"weapon.sparkShoot": {"category": "player", "sounds": ["weapon/sparkShoot1", "weapon/sparkShoot2", "weapon/sparkShoot3"]},

 	"entity.chopperFlyingLoop": {"category": "hostile", "sounds": [{"name": "entity/chopperFlyingLoop", "stream": true}]},
 	"entity.chopperDrop": {"category": "hostile", "sounds": [{"name": "entity/chopperDrop", "stream": false}]},
--- a/assets/hbm/sounds/weapon/defabShoot.ogg
+++ b/assets/hbm/sounds/weapon/defabShoot.ogg
--- a/assets/hbm/sounds/weapon/defabSpinup.ogg
+++ b/assets/hbm/sounds/weapon/defabSpinup.ogg
--- a/assets/hbm/sounds/weapon/sparkShoot1.ogg
+++ b/assets/hbm/sounds/weapon/sparkShoot1.ogg
--- a/assets/hbm/sounds/weapon/sparkShoot2.ogg
+++ b/assets/hbm/sounds/weapon/sparkShoot2.ogg
--- a/assets/hbm/sounds/weapon/sparkShoot3.ogg
+++ b/assets/hbm/sounds/weapon/sparkShoot3.ogg
--- a/assets/hbm/textures/blocks/crate_iron_side.png
+++ b/assets/hbm/textures/blocks/crate_iron_side.png
--- a/assets/hbm/textures/blocks/crate_iron_top.png
+++ b/assets/hbm/textures/blocks/crate_iron_top.png
--- a/assets/hbm/textures/blocks/crate_steel_side.png
+++ b/assets/hbm/textures/blocks/crate_steel_side.png
--- a/assets/hbm/textures/blocks/crate_steel_top.png
+++ b/assets/hbm/textures/blocks/crate_steel_top.png
--- a/assets/hbm/textures/blocks/drill_pipe.png
+++ b/assets/hbm/textures/blocks/drill_pipe.png
--- a/assets/hbm/textures/blocks/marker_structure.png
+++ b/assets/hbm/textures/blocks/marker_structure.png
--- a/assets/hbm/textures/blocks/red_pylon.png
+++ b/assets/hbm/textures/blocks/red_pylon.png
--- a/assets/hbm/textures/gui/gui_drill.png
+++ b/assets/hbm/textures/gui/gui_drill.png
--- a/assets/hbm/textures/gui/gui_nei_refinery.png
+++ b/assets/hbm/textures/gui/gui_nei_refinery.png
--- a/assets/hbm/textures/items/canister_petroil.png
+++ b/assets/hbm/textures/items/canister_petroil.png
--- a/assets/hbm/textures/items/canister_reoil.png
+++ b/assets/hbm/textures/items/canister_reoil.png
--- a/assets/hbm/textures/items/fragment_actinium.png
+++ b/assets/hbm/textures/items/fragment_actinium.png
--- a/assets/hbm/textures/items/fragment_cerium.png
+++ b/assets/hbm/textures/items/fragment_cerium.png
--- a/assets/hbm/textures/items/fragment_cobalt.png
+++ b/assets/hbm/textures/items/fragment_cobalt.png
--- a/assets/hbm/textures/items/fragment_lanthanium.png
+++ b/assets/hbm/textures/items/fragment_lanthanium.png
--- a/assets/hbm/textures/items/fragment_neodymium.png
+++ b/assets/hbm/textures/items/fragment_neodymium.png
--- a/assets/hbm/textures/items/fragment_niobium.png
+++ b/assets/hbm/textures/items/fragment_niobium.png
--- a/assets/hbm/textures/items/gun_defabricator.png
+++ b/assets/hbm/textures/items/gun_defabricator.png
--- a/assets/hbm/textures/items/gun_defabricator_ammo.png
+++ b/assets/hbm/textures/items/gun_defabricator_ammo.png
--- a/assets/hbm/textures/items/gun_hp.png
+++ b/assets/hbm/textures/items/gun_hp.png
--- a/assets/hbm/textures/items/gun_hp_ammo.png
+++ b/assets/hbm/textures/items/gun_hp_ammo.png
--- a/assets/hbm/textures/items/gun_spark.png
+++ b/assets/hbm/textures/items/gun_spark.png
--- a/assets/hbm/textures/items/gun_spark_ammo.png
+++ b/assets/hbm/textures/items/gun_spark_ammo.png
--- a/assets/hbm/textures/items/ingot_desh.png
+++ b/assets/hbm/textures/items/ingot_desh.png
--- a/assets/hbm/textures/items/nugget_desh.png
+++ b/assets/hbm/textures/items/nugget_desh.png
--- a/assets/hbm/textures/items/plate_dalekanium.png
+++ b/assets/hbm/textures/items/plate_dalekanium.png
--- a/assets/hbm/textures/items/powder_cobalt_tiny.png
+++ b/assets/hbm/textures/items/powder_cobalt_tiny.png
--- a/assets/hbm/textures/items/powder_desh.png
+++ b/assets/hbm/textures/items/powder_desh.png
--- a/assets/hbm/textures/items/powder_lithium_tiny.png
+++ b/assets/hbm/textures/items/powder_lithium_tiny.png
--- a/assets/hbm/textures/items/upgrade_effect_1.png
+++ b/assets/hbm/textures/items/upgrade_effect_1.png
--- a/assets/hbm/textures/items/upgrade_effect_2.png
+++ b/assets/hbm/textures/items/upgrade_effect_2.png
--- a/assets/hbm/textures/items/upgrade_effect_3.png
+++ b/assets/hbm/textures/items/upgrade_effect_3.png
--- a/assets/hbm/textures/items/upgrade_fortune_1.png
+++ b/assets/hbm/textures/items/upgrade_fortune_1.png
--- a/assets/hbm/textures/items/upgrade_fortune_2.png
+++ b/assets/hbm/textures/items/upgrade_fortune_2.png
--- a/assets/hbm/textures/items/upgrade_fortune_3.png
+++ b/assets/hbm/textures/items/upgrade_fortune_3.png
--- a/assets/hbm/textures/items/upgrade_power_1.png
+++ b/assets/hbm/textures/items/upgrade_power_1.png
--- a/assets/hbm/textures/items/upgrade_power_2.png
+++ b/assets/hbm/textures/items/upgrade_power_2.png
--- a/assets/hbm/textures/items/upgrade_power_3.png
+++ b/assets/hbm/textures/items/upgrade_power_3.png
--- a/assets/hbm/textures/items/upgrade_speed_1.png
+++ b/assets/hbm/textures/items/upgrade_speed_1.png
--- a/assets/hbm/textures/items/upgrade_speed_2.png
+++ b/assets/hbm/textures/items/upgrade_speed_2.png
--- a/assets/hbm/textures/items/upgrade_speed_3.png
+++ b/assets/hbm/textures/items/upgrade_speed_3.png
--- a/assets/hbm/textures/items/upgrade_template.png
+++ b/assets/hbm/textures/items/upgrade_template.png
--- a/assets/hbm/textures/models/ModelHP.png
+++ b/assets/hbm/textures/models/ModelHP.png
--- a/assets/hbm/textures/models/ModelPylon.png
+++ b/assets/hbm/textures/models/ModelPylon.png
--- a/com/hbm/blocks/ModBlocks.java
+++ b/com/hbm/blocks/ModBlocks.java
@ -1,114 +1,10 @@
 package com.hbm.blocks;

-import com.hbm.blocks.bomb.BlockCrashedBomb;
-import com.hbm.blocks.bomb.BombFlameWar;
-import com.hbm.blocks.bomb.BombFloat;
-import com.hbm.blocks.bomb.BombMulti;
-import com.hbm.blocks.bomb.BombThermo;
-import com.hbm.blocks.bomb.CheaterVirus;
-import com.hbm.blocks.bomb.CheaterVirusSeed;
-import com.hbm.blocks.bomb.CrystalPulsar;
-import com.hbm.blocks.bomb.CrystalVirus;
-import com.hbm.blocks.bomb.DetCord;
-import com.hbm.blocks.bomb.LaunchPad;
-import com.hbm.blocks.bomb.NukeBoy;
-import com.hbm.blocks.bomb.NukeCustom;
-import com.hbm.blocks.bomb.NukeFleija;
-import com.hbm.blocks.bomb.NukeGadget;
-import com.hbm.blocks.bomb.NukeMan;
-import com.hbm.blocks.bomb.NukeMike;
-import com.hbm.blocks.bomb.NukePrototype;
-import com.hbm.blocks.bomb.NukeTsar;
-import com.hbm.blocks.fluid.AcidBlock;
-import com.hbm.blocks.fluid.AcidFluid;
-import com.hbm.blocks.fluid.MudBlock;
-import com.hbm.blocks.fluid.MudFluid;
-import com.hbm.blocks.fluid.ToxicBlock;
-import com.hbm.blocks.fluid.ToxicFluid;
-import com.hbm.blocks.generic.BlockCrate;
-import com.hbm.blocks.generic.BlockGeneric;
-import com.hbm.blocks.generic.BlockMush;
-import com.hbm.blocks.generic.BlockMushHuge;
-import com.hbm.blocks.generic.BlockNoDrop;
-import com.hbm.blocks.generic.BlockOre;
-import com.hbm.blocks.generic.BlockPlasma;
-import com.hbm.blocks.generic.DecoBlock;
-import com.hbm.blocks.generic.DecoBlockAlt;
-import com.hbm.blocks.generic.DecoPoleSatelliteReceiver;
-import com.hbm.blocks.generic.DecoPoleTop;
-import com.hbm.blocks.generic.DecoSteelPoles;
-import com.hbm.blocks.generic.DecoTapeRecorder;
-import com.hbm.blocks.generic.Guide;
-import com.hbm.blocks.generic.RedBarrel;
-import com.hbm.blocks.generic.ReinforcedBlock;
-import com.hbm.blocks.generic.ReinforcedLamp;
-import com.hbm.blocks.generic.WasteEarth;
-import com.hbm.blocks.generic.WasteLog;
-import com.hbm.blocks.generic.YellowBarrel;
-import com.hbm.blocks.machine.BlockCable;
-import com.hbm.blocks.machine.BlockConverterHeRf;
-import com.hbm.blocks.machine.BlockConverterRfHe;
-import com.hbm.blocks.machine.BlockGasDuct;
-import com.hbm.blocks.machine.BlockHatch;
-import com.hbm.blocks.machine.BlockOilDuct;
-import com.hbm.blocks.machine.OilDuctSolid;
-import com.hbm.blocks.machine.PylonRedWire;
-import com.hbm.blocks.machine.BlockReactor;
-import com.hbm.blocks.machine.BlockSeal;
-import com.hbm.blocks.machine.DummyBlockCentrifuge;
-import com.hbm.blocks.machine.DummyBlockCyclotron;
-import com.hbm.blocks.machine.DummyBlockFlare;
-import com.hbm.blocks.machine.DummyBlockIGenerator;
-import com.hbm.blocks.machine.DummyBlockWell;
-import com.hbm.blocks.machine.FWatzCore;
-import com.hbm.blocks.machine.FWatzHatch;
-import com.hbm.blocks.machine.FactoryCoreAdvanced;
-import com.hbm.blocks.machine.FactoryCoreTitanium;
-import com.hbm.blocks.machine.FactoryHatch;
-import com.hbm.blocks.machine.FusionCore;
-import com.hbm.blocks.machine.FusionHatch;
-import com.hbm.blocks.machine.GasDuctSolid;
-import com.hbm.blocks.machine.MachineBattery;
-import com.hbm.blocks.machine.MachineCMBFactory;
-import com.hbm.blocks.machine.MachineCentrifuge;
-import com.hbm.blocks.machine.MachineCoal;
-import com.hbm.blocks.machine.MachineCyclotron;
-import com.hbm.blocks.machine.MachineDeuterium;
-import com.hbm.blocks.machine.MachineDiFurnace;
-import com.hbm.blocks.machine.MachineDiesel;
-import com.hbm.blocks.machine.MachineElectricFurnace;
-import com.hbm.blocks.machine.MachineGasFlare;
-import com.hbm.blocks.machine.MachineGenerator;
-import com.hbm.blocks.machine.MachineIGenerator;
-import com.hbm.blocks.machine.MachineNukeFurnace;
-import com.hbm.blocks.machine.MachineOilWell;
-import com.hbm.blocks.machine.MachinePuF6Tank;
-import com.hbm.blocks.machine.MachineRTG;
-import com.hbm.blocks.machine.MachineReactor;
-import com.hbm.blocks.machine.MachineRefinery;
-import com.hbm.blocks.machine.MachineReiXMainframe;
-import com.hbm.blocks.machine.MachineRtgFurnace;
-import com.hbm.blocks.machine.MachineSchrabidiumTransmutator;
-import com.hbm.blocks.machine.MachineShredder;
-import com.hbm.blocks.machine.MachineTeleporter;
-import com.hbm.blocks.machine.MachineUF6Tank;
-import com.hbm.blocks.machine.RailBooster;
-import com.hbm.blocks.machine.RailHighspeed;
-import com.hbm.blocks.machine.ReactorCore;
-import com.hbm.blocks.machine.ReactorHatch;
-import com.hbm.blocks.machine.WatzCore;
-import com.hbm.blocks.machine.WatzHatch;
-import com.hbm.blocks.machine.WireCoated;
-import com.hbm.blocks.test.TestBomb;
-import com.hbm.blocks.test.TestBombAdvanced;
-import com.hbm.blocks.test.TestContainer;
-import com.hbm.blocks.test.TestEventTester;
-import com.hbm.blocks.test.TestMissile;
-import com.hbm.blocks.test.TestNuke;
-import com.hbm.blocks.test.TestObjTester;
-import com.hbm.blocks.test.TestRender;
-import com.hbm.blocks.test.TestRotationTester;
-import com.hbm.blocks.test.TestTicker;
+import com.hbm.blocks.generic.*;
+import com.hbm.blocks.bomb.*;
+import com.hbm.blocks.fluid.*;
+import com.hbm.blocks.machine.*;
+import com.hbm.blocks.test.*;
 import com.hbm.items.bomb.ItemPrototypeBlock;
 import com.hbm.items.special.ItemOreBlock;
 import com.hbm.items.special.ItemPlasmaBlock;
@ -267,6 +163,14 @@ public class ModBlocks {
 	public static Block seal_frame;
 	public static Block seal_controller;
 	public static Block seal_hatch;
+
+	public static Block marker_structure;
+	
+	public static Block crate_iron;
+	public static final int guiID_crate_iron = 46;
+	
+	public static Block crate_steel;
+	public static final int guiID_crate_steel = 47;
 	
 	public static Block nuke_gadget;
 	public static final int guiID_nuke_gadget = 3;
@ -444,6 +348,10 @@ public class ModBlocks {
 	public static Block machine_refinery;
 	public static final int guiID_machine_refinery = 43;

+	public static Block machine_drill;
+	public static Block drill_pipe;
+	public static final int guiID_machine_drill = 45;
+
 	public static Block launch_pad;
 	public static Block launch_pad_generic;
 	public static Block launch_pad_incendiary;
@ -501,6 +409,8 @@ public class ModBlocks {
 	public static Block dummy_port_well;
 	public static Block dummy_block_flare;
 	public static Block dummy_port_flare;
+	public static Block dummy_block_drill;
+	public static Block dummy_port_drill;
 	

 	private static void initializeBlock() {
@ -580,7 +490,7 @@ public class ModBlocks {
 		block_verticium = new BlockGeneric(Material.iron).setBlockName("block_verticium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_verticium");
 		
 		gravel_obsidian = new BlockFalling(Material.iron).setBlockName("gravel_obsidian").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeGravel).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":gravel_obsidian");
-		asphalt = new BlockGeneric(Material.rock).setBlockName("asphalt").setCreativeTab(MainRegistry.tabBlock).setLightOpacity(15).setHardness(15.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":asphalt");
+		asphalt = new BlockGeneric(Material.rock).setBlockName("asphalt").setCreativeTab(MainRegistry.tabBlock).setLightOpacity(15).setHardness(15.0F).setResistance(100.0F).setBlockTextureName(RefStrings.MODID + ":asphalt");

 		reinforced_brick = new BlockGeneric(Material.rock).setBlockName("reinforced_brick").setCreativeTab(MainRegistry.tabBlock).setLightOpacity(15).setHardness(15.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_brick");
 		reinforced_glass = new ReinforcedBlock(Material.glass).setBlockName("reinforced_glass").setCreativeTab(MainRegistry.tabBlock).setLightOpacity(0).setHardness(15.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_glass");
@ -596,7 +506,7 @@ public class ModBlocks {
 		cmb_brick = new BlockGeneric(Material.rock).setBlockName("cmb_brick").setCreativeTab(MainRegistry.tabBlock).setHardness(25.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":cmb_brick");
 		cmb_brick_reinforced = new BlockGeneric(Material.rock).setBlockName("cmb_brick_reinforced").setCreativeTab(MainRegistry.tabBlock).setHardness(25.0F).setResistance(60000.0F).setBlockTextureName(RefStrings.MODID + ":cmb_brick_reinforced");

-		block_meteor = new BlockGeneric(Material.rock).setBlockName("block_meteor").setCreativeTab(MainRegistry.tabBlock).setHardness(15.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":block_meteor");
+		block_meteor = new BlockOre(Material.rock).setBlockName("block_meteor").setCreativeTab(MainRegistry.tabBlock).setHardness(15.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":block_meteor");
 		
 		tape_recorder = new DecoTapeRecorder(Material.rock).setBlockName("tape_recorder").setCreativeTab(MainRegistry.tabBlock).setHardness(15.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":deco_tape_recorder");
 		steel_poles = new DecoSteelPoles(Material.rock).setBlockName("steel_poles").setCreativeTab(MainRegistry.tabBlock).setHardness(15.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":deco_steel_poles");
@ -748,6 +658,8 @@ public class ModBlocks {
 		seal_controller = new BlockSeal(Material.iron).setBlockName("seal_controller").setHardness(10.0F).setResistance(100.0F).setCreativeTab(MainRegistry.tabBlock);
 		seal_hatch = new BlockHatch(Material.iron).setBlockName("seal_hatch").setHardness(Float.POSITIVE_INFINITY).setResistance(Float.POSITIVE_INFINITY).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":seal_hatch_3");
 		
+		marker_structure = new BlockMarker(Material.iron).setBlockName("marker_structure").setHardness(0.0F).setResistance(0.0F).setLightLevel(1.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":marker_structure");
+		
 		launch_pad = new LaunchPad(Material.iron).setBlockName("launch_pad").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":launch_pad");
 		launch_pad_generic = new LaunchPad(Material.iron).setBlockName("launch_pad_generic").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":launch_pad");
 		launch_pad_incendiary = new LaunchPad(Material.iron).setBlockName("launch_pad_incendiary").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":launch_pad");
@ -773,11 +685,15 @@ public class ModBlocks {
 		rail_booster = new RailBooster().setBlockName("rail_booster").setHardness(5.0F).setResistance(10.0F).setCreativeTab(CreativeTabs.tabTransport).setBlockTextureName(RefStrings.MODID + ":rail_booster");

 		crate = new BlockCrate(Material.iron).setBlockName("crate").setStepSound(Block.soundTypeWood).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":crate");
+		crate_iron = new BlockStorageCrate(Material.iron).setBlockName("crate_iron").setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock);
+		crate_steel = new BlockStorageCrate(Material.iron).setBlockName("crate_steel").setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock);

 		machine_well = new MachineOilWell(Material.iron).setBlockName("machine_well").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":machine_well");
 		oil_pipe = new BlockNoDrop(Material.iron).setBlockName("oil_pipe").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":oil_pipe");
 		machine_flare = new MachineGasFlare(Material.iron).setBlockName("machine_flare").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":machine_flare");
 		machine_refinery = new MachineRefinery(Material.iron).setBlockName("machine_refinery").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":machine_refinery_side");
+		machine_drill = new MachineMiningDrill(Material.iron).setBlockName("machine_drill").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":machine_drill");
+		drill_pipe = new BlockNoDrop(Material.iron).setBlockName("drill_pipe").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":drill_pipe");

 		machine_schrabidium_transmutator = new MachineSchrabidiumTransmutator(Material.iron).setBlockName("machine_schrabidium_transmutator").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.tabBlock);

@ -815,6 +731,8 @@ public class ModBlocks {
 		dummy_port_well = new DummyBlockWell(Material.iron).setBlockName("dummy_port_well").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel");
 		dummy_block_flare = new DummyBlockFlare(Material.iron).setBlockName("dummy_block_flare").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel");
 		dummy_port_flare = new DummyBlockFlare(Material.iron).setBlockName("dummy_port_flare").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel");
+		dummy_block_drill = new DummyBlockDrill(Material.iron).setBlockName("dummy_block_drill").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel");
+		dummy_port_drill = new DummyBlockDrill(Material.iron).setBlockName("dummy_port_drill").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel");
 	}

 	private static void registerBlock() {
@ -970,6 +888,10 @@ public class ModBlocks {
 		GameRegistry.registerBlock(seal_controller, seal_controller.getUnlocalizedName());
 		GameRegistry.registerBlock(seal_hatch, seal_hatch.getUnlocalizedName());
 		
+		//Crates
+		GameRegistry.registerBlock(crate_iron, crate_iron.getUnlocalizedName());
+		GameRegistry.registerBlock(crate_steel, crate_steel.getUnlocalizedName());
+		
 		//Machines
 		GameRegistry.registerBlock(machine_difurnace_off, machine_difurnace_off.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_difurnace_on, machine_difurnace_on.getUnlocalizedName());
@ -1012,6 +934,7 @@ public class ModBlocks {
 		GameRegistry.registerBlock(machine_well, machine_well.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_flare, machine_flare.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_refinery, machine_refinery.getUnlocalizedName());
+		GameRegistry.registerBlock(machine_drill, machine_drill.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_schrabidium_transmutator, machine_schrabidium_transmutator.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_combine_factory, machine_combine_factory.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_teleporter, machine_teleporter.getUnlocalizedName());
@ -1019,6 +942,9 @@ public class ModBlocks {
 		//ReiX Machines
 		//GameRegistry.registerBlock(machine_reix_mainframe, machine_reix_mainframe.getUnlocalizedName());
 		
+		//Multiblock Helpers
+		GameRegistry.registerBlock(marker_structure, marker_structure.getUnlocalizedName());
+		
 		//Industrial Factories
 		GameRegistry.registerBlock(factory_titanium_hull, factory_titanium_hull.getUnlocalizedName());
 		GameRegistry.registerBlock(factory_titanium_furnace, factory_titanium_furnace.getUnlocalizedName());
@ -1112,9 +1038,12 @@ public class ModBlocks {
 		GameRegistry.registerBlock(dummy_port_well, dummy_port_well.getUnlocalizedName());
 		GameRegistry.registerBlock(dummy_block_flare, dummy_block_flare.getUnlocalizedName());
 		GameRegistry.registerBlock(dummy_port_flare, dummy_port_flare.getUnlocalizedName());
+		GameRegistry.registerBlock(dummy_block_drill, dummy_block_drill.getUnlocalizedName());
+		GameRegistry.registerBlock(dummy_port_drill, dummy_port_drill.getUnlocalizedName());
 		
 		//Other Technical Blocks
 		GameRegistry.registerBlock(oil_pipe, oil_pipe.getUnlocalizedName());
+		GameRegistry.registerBlock(drill_pipe, drill_pipe.getUnlocalizedName());
 		
 		//???
 		GameRegistry.registerBlock(crystal_virus, crystal_virus.getUnlocalizedName());
--- a/com/hbm/blocks/generic/BlockMarker.java
+++ b/com/hbm/blocks/generic/BlockMarker.java
@ -0,0 +1,209 @@
+package com.hbm.blocks.generic;
+
+import static net.minecraftforge.common.util.ForgeDirection.EAST;
+import static net.minecraftforge.common.util.ForgeDirection.NORTH;
+import static net.minecraftforge.common.util.ForgeDirection.SOUTH;
+import static net.minecraftforge.common.util.ForgeDirection.WEST;
+
+import java.util.Random;
+
+import com.hbm.blocks.ModBlocks;
+import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityCoreAdvanced;
+import com.hbm.tileentity.TileEntityCoreTitanium;
+import com.hbm.tileentity.TileEntityStructureMarker;
+
+import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public class BlockMarker extends BlockContainer {
+
+	public BlockMarker(Material p_i45386_1_) {
+		super(p_i45386_1_);
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
+		return new TileEntityStructureMarker();
+	}
+
+    public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_)
+    {
+        return null;
+    }
+
+    public boolean isOpaqueCube()
+    {
+        return false;
+    }
+
+    public boolean renderAsNormalBlock()
+    {
+        return false;
+    }
+
+    public int getRenderType()
+    {
+        return 2;
+    }
+
+    private boolean func_150107_m(World p_150107_1_, int p_150107_2_, int p_150107_3_, int p_150107_4_)
+    {
+        if (World.doesBlockHaveSolidTopSurface(p_150107_1_, p_150107_2_, p_150107_3_, p_150107_4_))
+        {
+            return true;
+        }
+        else
+        {
+            Block block = p_150107_1_.getBlock(p_150107_2_, p_150107_3_, p_150107_4_);
+            return block.canPlaceTorchOnTop(p_150107_1_, p_150107_2_, p_150107_3_, p_150107_4_);
+        }
+    }
+
+    public boolean canPlaceBlockAt(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_)
+    {
+        return func_150107_m(p_149742_1_, p_149742_2_, p_149742_3_ - 1, p_149742_4_);
+    }
+
+	@Override
+	public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) {
+		int i = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
+		
+		if(i == 0)
+		{
+			world.setBlockMetadataWithNotify(x, y, z, 6, 2);
+		}
+		if(i == 1)
+		{
+			world.setBlockMetadataWithNotify(x, y, z, 7, 2);
+		}
+		if(i == 2)
+		{
+			world.setBlockMetadataWithNotify(x, y, z, 8, 2);
+		}
+		if(i == 3)
+		{
+			world.setBlockMetadataWithNotify(x, y, z, 9, 2);
+		}
+	}
+
+    public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_)
+    {
+        super.updateTick(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_, p_149674_5_);
+
+        if (p_149674_1_.getBlockMetadata(p_149674_2_, p_149674_3_, p_149674_4_) == 0)
+        {
+            this.onBlockAdded(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_);
+        }
+    }
+
+    public void onNeighborBlockChange(World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_)
+    {
+        this.func_150108_b(p_149695_1_, p_149695_2_, p_149695_3_, p_149695_4_, p_149695_5_);
+    }
+
+    protected boolean func_150108_b(World p_150108_1_, int p_150108_2_, int p_150108_3_, int p_150108_4_, Block p_150108_5_)
+    {
+        if (this.func_150109_e(p_150108_1_, p_150108_2_, p_150108_3_, p_150108_4_))
+        {
+            int l = p_150108_1_.getBlockMetadata(p_150108_2_, p_150108_3_, p_150108_4_);
+            boolean flag = false;
+
+            if (!this.func_150107_m(p_150108_1_, p_150108_2_, p_150108_3_ - 1, p_150108_4_))
+            {
+                flag = true;
+            }
+
+            if (flag)
+            {
+                this.dropBlockAsItem(p_150108_1_, p_150108_2_, p_150108_3_, p_150108_4_, p_150108_1_.getBlockMetadata(p_150108_2_, p_150108_3_, p_150108_4_), 0);
+                p_150108_1_.setBlockToAir(p_150108_2_, p_150108_3_, p_150108_4_);
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        else
+        {
+            return true;
+        }
+    }
+
+    protected boolean func_150109_e(World p_150109_1_, int p_150109_2_, int p_150109_3_, int p_150109_4_)
+    {
+        if (!this.canPlaceBlockAt(p_150109_1_, p_150109_2_, p_150109_3_, p_150109_4_))
+        {
+            if (p_150109_1_.getBlock(p_150109_2_, p_150109_3_, p_150109_4_) == this)
+            {
+                this.dropBlockAsItem(p_150109_1_, p_150109_2_, p_150109_3_, p_150109_4_, p_150109_1_.getBlockMetadata(p_150109_2_, p_150109_3_, p_150109_4_), 0);
+                p_150109_1_.setBlockToAir(p_150109_2_, p_150109_3_, p_150109_4_);
+            }
+
+            return false;
+        }
+        else
+        {
+            return true;
+        }
+    }
+
+    public MovingObjectPosition collisionRayTrace(World p_149731_1_, int p_149731_2_, int p_149731_3_, int p_149731_4_, Vec3 p_149731_5_, Vec3 p_149731_6_)
+    {
+        int l = p_149731_1_.getBlockMetadata(p_149731_2_, p_149731_3_, p_149731_4_) & 7;
+        float f = 0.15F;
+        f = 0.1F;
+        this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.6F, 0.5F + f);
+
+        return super.collisionRayTrace(p_149731_1_, p_149731_2_, p_149731_3_, p_149731_4_, p_149731_5_, p_149731_6_);
+    }
+	
+	@Override
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
+		if(world.isRemote)
+		{
+			int i = ((TileEntityStructureMarker)world.getTileEntity(x, y, z)).type + 1;
+			if(i > 6)
+				i -= 7;
+			if(i == 0)
+		        player.addChatMessage(new ChatComponentText("[Structure Marker] Set template: Factory"));
+			if(i == 1)
+		        player.addChatMessage(new ChatComponentText("[Structure Marker] Set template: Nuclear Reactor"));
+			if(i == 2)
+		        player.addChatMessage(new ChatComponentText("[Structure Marker] Set template: Nuclear Reactor with Concrete Casing"));
+			if(i == 3)
+		        player.addChatMessage(new ChatComponentText("[Structure Marker] Set template: Fusion Reactor"));
+			if(i == 4)
+		        player.addChatMessage(new ChatComponentText("[Structure Marker] Set template: Fusion Reactor with Internal Coating"));
+			if(i == 5)
+		        player.addChatMessage(new ChatComponentText("[Structure Marker] Set template: Watz Power Plant"));
+			if(i == 6)
+		        player.addChatMessage(new ChatComponentText("[Structure Marker] Set template: Fusionary Watz Plant"));
+			return true;
+		} else if(!player.isSneaking())
+		{
+			if(world.getTileEntity(x, y, z) != null && world.getTileEntity(x, y, z) instanceof TileEntityStructureMarker) {
+				((TileEntityStructureMarker)world.getTileEntity(x, y, z)).type ++;
+			}
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+}
--- a/com/hbm/blocks/generic/BlockOre.java
+++ b/com/hbm/blocks/generic/BlockOre.java
@ -34,7 +34,7 @@ public class BlockOre extends Block {
 	}

 	@Override
-	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
+	public Item getItemDropped(int i, Random rand, int j)
    {
 		if(this == ModBlocks.ore_fluorite)
 		{
@ -66,7 +66,11 @@ public class BlockOre extends Block {
 		}
 		if(this == ModBlocks.ore_nether_fire)
 		{
-			return p_149650_2_.nextInt(2) == 0 ? ModItems.powder_fire : Items.blaze_powder;
+			return rand.nextInt(2) == 0 ? ModItems.powder_fire : Items.blaze_powder;
+		}
+		if(this == ModBlocks.block_meteor)
+		{
+			return rand.nextInt(10) == 0 ? ModItems.plate_dalekanium : Item.getItemFromBlock(ModBlocks.block_meteor);
 		}
 		
 		return Item.getItemFromBlock(this);
--- a/com/hbm/blocks/generic/BlockStorageCrate.java
+++ b/com/hbm/blocks/generic/BlockStorageCrate.java
@ -0,0 +1,43 @@
+package com.hbm.blocks.generic;
+
+import com.hbm.blocks.ModBlocks;
+import com.hbm.lib.RefStrings;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+
+public class BlockStorageCrate extends Block {
+	
+	@SideOnly(Side.CLIENT)
+	private IIcon iconTop;
+
+	public BlockStorageCrate(Material p_i45394_1_) {
+		super(p_i45394_1_);
+	}
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(IIconRegister iconRegister) {
+		if(this == ModBlocks.crate_iron)
+		{
+			this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":crate_iron_top");
+			this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":crate_iron_side");
+		}
+		if(this == ModBlocks.crate_steel)
+		{
+			this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":crate_steel_top");
+			this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":crate_steel_side");
+		}
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(int side, int metadata) {
+		return side == 1 ? this.iconTop : (side == 0 ? this.iconTop : this.blockIcon);
+	}
+
+}
--- a/com/hbm/blocks/machine/DummyBlockDrill.java
+++ b/com/hbm/blocks/machine/DummyBlockDrill.java
@ -0,0 +1,109 @@
+package com.hbm.blocks.machine;
+
+import java.util.Random;
+
+import com.hbm.blocks.ModBlocks;
+import com.hbm.interfaces.IDummy;
+import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityDummy;
+import com.hbm.tileentity.TileEntityMachineIGenerator;
+import com.hbm.tileentity.TileEntityMachineMiningDrill;
+import com.hbm.tileentity.TileEntityMachineCentrifuge;
+import com.hbm.tileentity.TileEntityMachineElectricFurnace;
+
+import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+public class DummyBlockDrill extends BlockContainer implements IDummy {
+	
+	public static boolean safeBreak = false;
+
+	public DummyBlockDrill(Material p_i45386_1_) {
+		super(p_i45386_1_);
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
+		return new TileEntityDummy();
+	}
+
+    public void breakBlock(World world, int x, int y, int z, Block block, int i)
+    {
+    	if(!safeBreak) {
+    		TileEntity te = world.getTileEntity(x, y, z);
+    		if(te != null && te instanceof TileEntityDummy) {
+    			int a = ((TileEntityDummy)te).targetX;
+    			int b = ((TileEntityDummy)te).targetY;
+    			int c = ((TileEntityDummy)te).targetZ;
+    		
+    			//world.getBlock(a, b, c).breakBlock(world, a, b, c, block, i);
+    			if(!world.isRemote)
+    				world.func_147480_a(a, b, c, true);
+    		}
+    	}
+    	world.removeTileEntity(x, y, z);
+    }
+
+	@Override
+	public int getRenderType() {
+		return -1;
+	}
+
+	@Override
+	public boolean isOpaqueCube() {
+		return false;
+	}
+
+	@Override
+	public boolean renderAsNormalBlock() {
+		return false;
+	}
+	
+	@Override
+	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
+    {
+        return null;
+    }
+
+    @Override
+	@SideOnly(Side.CLIENT)
+    public Item getItem(World world, int x, int y, int z)
+    {
+        return Item.getItemFromBlock(ModBlocks.machine_drill);
+    }
+	
+	@Override
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
+		if(world.isRemote)
+		{
+			return true;
+		} else if(!player.isSneaking())
+		{
+    		TileEntity te = world.getTileEntity(x, y, z);
+    		if(te != null && te instanceof TileEntityDummy) {
+    			int a = ((TileEntityDummy)te).targetX;
+    			int b = ((TileEntityDummy)te).targetY;
+    			int c = ((TileEntityDummy)te).targetZ;
+    			
+    			TileEntityMachineMiningDrill entity = (TileEntityMachineMiningDrill) world.getTileEntity(a, b, c);
+    			if(entity != null)
+    			{
+    				FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_drill, world, a, b, c);
+    			}
+    		}
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+}
--- a/com/hbm/blocks/machine/MachineMiningDrill.java
+++ b/com/hbm/blocks/machine/MachineMiningDrill.java
@ -0,0 +1,180 @@
+package com.hbm.blocks.machine;
+
+import java.util.Random;
+
+import com.hbm.blocks.ModBlocks;
+import com.hbm.handler.MultiblockHandler;
+import com.hbm.interfaces.IMultiblock;
+import com.hbm.tileentity.TileEntityDummy;
+import com.hbm.tileentity.TileEntityMachineIGenerator;
+import com.hbm.tileentity.TileEntityMachineMiningDrill;
+
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class MachineMiningDrill extends BlockContainer implements IMultiblock {
+
+	public MachineMiningDrill(Material p_i45386_1_) {
+		super(p_i45386_1_);
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
+		return new TileEntityMachineMiningDrill();
+
+	}
+
+	@Override
+	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
+		return Item.getItemFromBlock(ModBlocks.machine_drill);
+	}
+
+	@Override
+	public int getRenderType() {
+		return -1;
+	}
+
+	@Override
+	public boolean isOpaqueCube() {
+		return false;
+	}
+
+	@Override
+	public boolean renderAsNormalBlock() {
+		return false;
+	}
+
+	@Override
+	public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) {
+		int i = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
+
+		if (i == 0) {
+			world.setBlockMetadataWithNotify(x, y, z, 5, 2);
+			if(MultiblockHandler.checkSpace(world, x, y, z, MultiblockHandler.drillDimension)) {
+				MultiblockHandler.fillUp(world, x, y, z, MultiblockHandler.drillDimension, ModBlocks.dummy_block_drill);
+				
+				//
+				DummyBlockDrill.safeBreak = true;
+				world.setBlock(x + 1, y, z, ModBlocks.dummy_port_drill);
+				TileEntity te = world.getTileEntity(x + 1, y, z);
+				if(te instanceof TileEntityDummy) {
+					TileEntityDummy dummy = (TileEntityDummy)te;
+					dummy.targetX = x;
+					dummy.targetY = y;
+					dummy.targetZ = z;
+				}
+				world.setBlock(x - 1, y, z, ModBlocks.dummy_port_drill);
+				TileEntity te2 = world.getTileEntity(x - 1, y, z);
+				if(te instanceof TileEntityDummy) {
+					TileEntityDummy dummy = (TileEntityDummy)te2;
+					dummy.targetX = x;
+					dummy.targetY = y;
+					dummy.targetZ = z;
+				}
+				DummyBlockDrill.safeBreak = false;
+				//
+				
+			} else
+				world.func_147480_a(x, y, z, true);
+		}
+		if (i == 1) {
+			world.setBlockMetadataWithNotify(x, y, z, 3, 2);
+			if(MultiblockHandler.checkSpace(world, x, y, z, MultiblockHandler.drillDimension)) {
+				MultiblockHandler.fillUp(world, x, y, z, MultiblockHandler.drillDimension, ModBlocks.dummy_block_drill);
+				
+				//
+				DummyBlockDrill.safeBreak = true;
+				world.setBlock(x, y, z + 1, ModBlocks.dummy_port_drill);
+				TileEntity te = world.getTileEntity(x, y, z + 1);
+				if(te instanceof TileEntityDummy) {
+					TileEntityDummy dummy = (TileEntityDummy)te;
+					dummy.targetX = x;
+					dummy.targetY = y;
+					dummy.targetZ = z;
+				}
+				world.setBlock(x, y, z - 1, ModBlocks.dummy_port_drill);
+				TileEntity te2 = world.getTileEntity(x, y, z - 1);
+				if(te instanceof TileEntityDummy) {
+					TileEntityDummy dummy = (TileEntityDummy)te2;
+					dummy.targetX = x;
+					dummy.targetY = y;
+					dummy.targetZ = z;
+				}
+				DummyBlockDrill.safeBreak = false;
+				//
+				
+			} else
+				world.func_147480_a(x, y, z, true);
+		}
+		if (i == 2) {
+			world.setBlockMetadataWithNotify(x, y, z, 4, 2);
+			if(MultiblockHandler.checkSpace(world, x, y, z, MultiblockHandler.drillDimension)) {
+				MultiblockHandler.fillUp(world, x, y, z, MultiblockHandler.drillDimension, ModBlocks.dummy_block_drill);
+				
+				//
+				DummyBlockDrill.safeBreak = true;
+				world.setBlock(x + 1, y, z, ModBlocks.dummy_port_drill);
+				TileEntity te = world.getTileEntity(x + 1, y, z);
+				if(te instanceof TileEntityDummy) {
+					TileEntityDummy dummy = (TileEntityDummy)te;
+					dummy.targetX = x;
+					dummy.targetY = y;
+					dummy.targetZ = z;
+				}
+				world.setBlock(x - 1, y, z, ModBlocks.dummy_port_drill);
+				TileEntity te2 = world.getTileEntity(x - 1, y, z);
+				if(te instanceof TileEntityDummy) {
+					TileEntityDummy dummy = (TileEntityDummy)te2;
+					dummy.targetX = x;
+					dummy.targetY = y;
+					dummy.targetZ = z;
+				}
+				DummyBlockDrill.safeBreak = false;
+				//
+				
+			} else
+				world.func_147480_a(x, y, z, true);
+		}
+		if (i == 3) {
+			world.setBlockMetadataWithNotify(x, y, z, 2, 2);
+			if(MultiblockHandler.checkSpace(world, x, y, z, MultiblockHandler.drillDimension)) {
+				MultiblockHandler.fillUp(world, x, y, z, MultiblockHandler.drillDimension, ModBlocks.dummy_block_drill);
+				
+				//
+				DummyBlockDrill.safeBreak = true;
+				world.setBlock(x, y, z + 1, ModBlocks.dummy_port_drill);
+				TileEntity te = world.getTileEntity(x, y, z + 1);
+				if(te instanceof TileEntityDummy) {
+					TileEntityDummy dummy = (TileEntityDummy)te;
+					dummy.targetX = x;
+					dummy.targetY = y;
+					dummy.targetZ = z;
+				}
+				world.setBlock(x, y, z - 1, ModBlocks.dummy_port_drill);
+				TileEntity te2 = world.getTileEntity(x, y, z - 1);
+				if(te instanceof TileEntityDummy) {
+					TileEntityDummy dummy = (TileEntityDummy)te2;
+					dummy.targetX = x;
+					dummy.targetY = y;
+					dummy.targetZ = z;
+				}
+				DummyBlockDrill.safeBreak = false;
+				//
+				
+			} else
+				world.func_147480_a(x, y, z, true);
+		}
+	}
+	
+	@Override
+    public boolean canPlaceBlockAt(World world, int x, int y, int z)
+    {
+		return true;
+    }
+}
--- a/com/hbm/blocks/machine/PylonRedWire.java
+++ b/com/hbm/blocks/machine/PylonRedWire.java
@ -17,5 +17,20 @@ public class PylonRedWire extends BlockContainer {
 	public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
 		return new TileEntityPylonRedWire();
 	}
+	
+	@Override
+	public int getRenderType(){
+		return -1;
+	}
+	
+	@Override
+	public boolean isOpaqueCube() {
+		return false;
+	}
+	
+	@Override
+	public boolean renderAsNormalBlock() {
+		return false;
+	}

 }
--- a/com/hbm/entity/projectile/EntitySparkBeam.java
+++ b/com/hbm/entity/projectile/EntitySparkBeam.java
@ -0,0 +1,536 @@
+package com.hbm.entity.projectile;
+
+import java.util.List;
+
+import com.hbm.entity.grenade.EntityGrenadeZOMG;
+import com.hbm.explosion.ExplosionChaos;
+import com.hbm.explosion.ExplosionLarge;
+import com.hbm.explosion.ExplosionThermo;
+import com.hbm.lib.ModDamageSource;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.IProjectile;
+import net.minecraft.entity.monster.EntityEnderman;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.play.server.S2BPacketChangeGameState;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public class EntitySparkBeam extends Entity implements IProjectile
+{
+    private int field_145791_d = -1;
+    private int field_145792_e = -1;
+    private int field_145789_f = -1;
+    public double gravity = 0.0D;
+    private Block field_145790_g;
+    private int inData;
+    private boolean inGround;
+    /** 1 if the player can pick up the arrow */
+    public int canBePickedUp;
+    /** Seems to be some sort of timer for animating an arrow. */
+    public int arrowShake;
+    /** The owner of this arrow. */
+    public Entity shootingEntity;
+    private int ticksInGround;
+    private int ticksInAir;
+    private double damage = 2.0D;
+    /** The amount of knockback an arrow applies when it hits a mob. */
+    private int knockbackStrength;
+    private static final String __OBFID = "CL_00001715";
+    
+
+    public EntitySparkBeam(World p_i1753_1_)
+    {
+        super(p_i1753_1_);
+        this.renderDistanceWeight = 10.0D;
+        this.setSize(0.5F, 0.5F);
+    }
+
+    public EntitySparkBeam(World p_i1754_1_, double p_i1754_2_, double p_i1754_4_, double p_i1754_6_)
+    {
+        super(p_i1754_1_);
+        this.renderDistanceWeight = 10.0D;
+        this.setSize(0.5F, 0.5F);
+        this.setPosition(p_i1754_2_, p_i1754_4_, p_i1754_6_);
+        this.yOffset = 0.0F;
+    }
+
+    public EntitySparkBeam(World p_i1755_1_, EntityLivingBase p_i1755_2_, EntityLivingBase p_i1755_3_, float p_i1755_4_, float p_i1755_5_)
+    {
+        super(p_i1755_1_);
+        this.renderDistanceWeight = 10.0D;
+        this.shootingEntity = p_i1755_2_;
+
+        if (p_i1755_2_ instanceof EntityPlayer)
+        {
+            this.canBePickedUp = 1;
+        }
+
+        this.posY = p_i1755_2_.posY + p_i1755_2_.getEyeHeight() - 0.10000000149011612D;
+        double d0 = p_i1755_3_.posX - p_i1755_2_.posX;
+        double d1 = p_i1755_3_.boundingBox.minY + p_i1755_3_.height / 3.0F - this.posY;
+        double d2 = p_i1755_3_.posZ - p_i1755_2_.posZ;
+        double d3 = MathHelper.sqrt_double(d0 * d0 + d2 * d2);
+
+        if (d3 >= 1.0E-7D)
+        {
+            float f2 = (float)(Math.atan2(d2, d0) * 180.0D / Math.PI) - 90.0F;
+            float f3 = (float)(-(Math.atan2(d1, d3) * 180.0D / Math.PI));
+            double d4 = d0 / d3;
+            double d5 = d2 / d3;
+            this.setLocationAndAngles(p_i1755_2_.posX + d4, this.posY, p_i1755_2_.posZ + d5, f2, f3);
+            this.yOffset = 0.0F;
+            float f4 = (float)d3 * 0.2F;
+            this.setThrowableHeading(d0, d1 + f4, d2, p_i1755_4_, p_i1755_5_);
+        }
+    }
+	
+	public EntitySparkBeam(World p_i1756_1_, EntityLivingBase p_i1756_2_, float p_i1756_3_, int dmgMin, int dmgMax, EntityGrenadeZOMG grenade) {
+		super(p_i1756_1_);
+		this.renderDistanceWeight = 10.0D;
+		this.shootingEntity = p_i1756_2_;
+
+		this.setSize(0.5F, 0.5F);
+		this.setLocationAndAngles(grenade.posX, grenade.posY + grenade.getEyeHeight(), grenade.posZ,
+				grenade.rotationYaw, grenade.rotationPitch);
+		this.posX -= MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F;
+		this.posY -= 0.10000000149011612D;
+		this.posZ -= MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F;
+		this.setPosition(this.posX, this.posY, this.posZ);
+		this.yOffset = 0.0F;
+		this.motionX = -MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI)
+				* MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI);
+		this.motionZ = MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI)
+				* MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI);
+		this.motionY = (-MathHelper.sin(this.rotationPitch / 180.0F * (float) Math.PI));
+		this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, p_i1756_3_ * 1.5F, 1.0F);
+	}
+
+    public EntitySparkBeam(World p_i1756_1_, EntityLivingBase p_i1756_2_, float p_i1756_3_)
+    {
+        super(p_i1756_1_);
+        this.renderDistanceWeight = 10.0D;
+        this.shootingEntity = p_i1756_2_;
+
+        this.setSize(0.5F, 0.5F);
+        this.setLocationAndAngles(p_i1756_2_.posX, p_i1756_2_.posY + p_i1756_2_.getEyeHeight(), p_i1756_2_.posZ, p_i1756_2_.rotationYaw, p_i1756_2_.rotationPitch);
+        this.posX -= MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F;
+        this.posY -= 0.10000000149011612D;
+        this.posZ -= MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F;
+        this.setPosition(this.posX, this.posY, this.posZ);
+        this.yOffset = 0.0F;
+        this.motionX = -MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI);
+        this.motionZ = MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI);
+        this.motionY = (-MathHelper.sin(this.rotationPitch / 180.0F * (float)Math.PI));
+        this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, p_i1756_3_ * 1.5F, 1.0F);
+    }
+
+    public EntitySparkBeam(World world, int x, int y, int z, double mx, double my, double mz, double grav) {
+        super(world);
+    	this.posX = x + 0.5F;
+    	this.posY = y + 0.5F;
+    	this.posZ = z + 0.5F;
+    	
+    	this.motionX = mx;
+    	this.motionY = my;
+    	this.motionZ = mz;
+    	
+    	this.gravity = grav;
+    }
+
+    @Override
+	protected void entityInit()
+    {
+        this.dataWatcher.addObject(16, Byte.valueOf((byte)0));
+    }
+
+    /**
+     * Similar to setArrowHeading, it's point the throwable entity to a x, y, z direction.
+     */
+    @Override
+	public void setThrowableHeading(double p_70186_1_, double p_70186_3_, double p_70186_5_, float p_70186_7_, float p_70186_8_)
+    {
+        float f2 = MathHelper.sqrt_double(p_70186_1_ * p_70186_1_ + p_70186_3_ * p_70186_3_ + p_70186_5_ * p_70186_5_);
+        p_70186_1_ /= f2;
+        p_70186_3_ /= f2;
+        p_70186_5_ /= f2;
+        p_70186_1_ += this.rand.nextGaussian() * (this.rand.nextBoolean() ? -1 : 1) * 0.002499999832361937D * p_70186_8_;
+        p_70186_3_ += this.rand.nextGaussian() * (this.rand.nextBoolean() ? -1 : 1) * 0.002499999832361937D * p_70186_8_;
+        p_70186_5_ += this.rand.nextGaussian() * (this.rand.nextBoolean() ? -1 : 1) * 0.002499999832361937D * p_70186_8_;
+        p_70186_1_ *= p_70186_7_;
+        p_70186_3_ *= p_70186_7_;
+        p_70186_5_ *= p_70186_7_;
+        this.motionX = p_70186_1_;
+        this.motionY = p_70186_3_;
+        this.motionZ = p_70186_5_;
+        float f3 = MathHelper.sqrt_double(p_70186_1_ * p_70186_1_ + p_70186_5_ * p_70186_5_);
+        this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(p_70186_1_, p_70186_5_) * 180.0D / Math.PI);
+        this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(p_70186_3_, f3) * 180.0D / Math.PI);
+        this.ticksInGround = 0;
+    }
+
+    /**
+     * Sets the position and rotation. Only difference from the other one is no bounding on the rotation. Args: posX,
+     * posY, posZ, yaw, pitch
+     */
+    @Override
+	@SideOnly(Side.CLIENT)
+    public void setPositionAndRotation2(double p_70056_1_, double p_70056_3_, double p_70056_5_, float p_70056_7_, float p_70056_8_, int p_70056_9_)
+    {
+        this.setPosition(p_70056_1_, p_70056_3_, p_70056_5_);
+        this.setRotation(p_70056_7_, p_70056_8_);
+    }
+
+    /**
+     * Sets the velocity to the args. Args: x, y, z
+     */
+    @Override
+	@SideOnly(Side.CLIENT)
+    public void setVelocity(double p_70016_1_, double p_70016_3_, double p_70016_5_)
+    {
+        this.motionX = p_70016_1_;
+        this.motionY = p_70016_3_;
+        this.motionZ = p_70016_5_;
+
+        if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F)
+        {
+            float f = MathHelper.sqrt_double(p_70016_1_ * p_70016_1_ + p_70016_5_ * p_70016_5_);
+            this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(p_70016_1_, p_70016_5_) * 180.0D / Math.PI);
+            this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(p_70016_3_, f) * 180.0D / Math.PI);
+            this.prevRotationPitch = this.rotationPitch;
+            this.prevRotationYaw = this.rotationYaw;
+            this.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, this.rotationPitch);
+            this.ticksInGround = 0;
+        }
+    }
+
+    /**
+     * Called to update the entity's position/logic.
+     */
+    //@Override
+    @Override
+	public void onUpdate()
+    {
+        super.onUpdate();
+        
+        if(this.ticksExisted > 100)
+        	this.setDead();
+
+        if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F)
+        {
+            float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
+            this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI);
+            //this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f) * 180.0D / Math.PI);
+        }
+
+        Block block = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f);
+
+        if (block.getMaterial() != Material.air)
+        {
+            block.setBlockBoundsBasedOnState(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); 
+            AxisAlignedBB axisalignedbb = block.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f);
+        	if(!worldObj.isRemote) {
+        		ExplosionLarge.explode(worldObj, posX, posY, posZ, 50, true, true, true);
+        	}
+    		this.setDead();
+        }
+
+        if (this.arrowShake > 0)
+        {
+            --this.arrowShake;
+        }
+        else
+        {
+            ++this.ticksInAir;
+            Vec3 vec31 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ);
+            Vec3 vec3 = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
+            MovingObjectPosition movingobjectposition = this.worldObj.func_147447_a(vec31, vec3, false, true, false);
+            vec31 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ);
+            vec3 = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
+
+            if (movingobjectposition != null)
+            {
+                vec3 = Vec3.createVectorHelper(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, movingobjectposition.hitVec.zCoord);
+            }
+
+            Entity entity = null;
+            List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D));
+            double d0 = 0.0D;
+            int i;
+            float f1;
+
+            for (i = 0; i < list.size(); ++i)
+            {
+                Entity entity1 = (Entity)list.get(i);
+
+                if (entity1.canBeCollidedWith() && (entity1 != this.shootingEntity || this.ticksInAir >= 5))
+                {
+                    f1 = 0.3F;
+                    AxisAlignedBB axisalignedbb1 = entity1.boundingBox.expand(f1, f1, f1);
+                    MovingObjectPosition movingobjectposition1 = axisalignedbb1.calculateIntercept(vec31, vec3);
+
+                    if (movingobjectposition1 != null)
+                    {
+                        double d1 = vec31.distanceTo(movingobjectposition1.hitVec);
+
+                        if (d1 < d0 || d0 == 0.0D)
+                        {
+                            entity = entity1;
+                            d0 = d1;
+                        }
+                    }
+                }
+            }
+
+            if (entity != null)
+            {
+                movingobjectposition = new MovingObjectPosition(entity);
+            }
+
+            if (movingobjectposition != null && movingobjectposition.entityHit != null && movingobjectposition.entityHit instanceof EntityPlayer)
+            {
+                EntityPlayer entityplayer = (EntityPlayer)movingobjectposition.entityHit;
+
+                if (entityplayer.capabilities.disableDamage || this.shootingEntity instanceof EntityPlayer && !((EntityPlayer)this.shootingEntity).canAttackPlayer(entityplayer))
+                {
+                    movingobjectposition = null;
+                }
+            }
+
+            float f2;
+            float f4;
+
+            if (movingobjectposition != null)
+            {
+                if (movingobjectposition.entityHit != null)
+                {
+                    f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ);
+                    int k = MathHelper.ceiling_double_int(f2 * this.damage);
+
+                    if (this.getIsCritical())
+                    {
+                        k += this.rand.nextInt(k / 2 + 2);
+                    }
+
+                    DamageSource damagesource = null;
+
+                    if (this.shootingEntity == null)
+                    {
+                        damagesource = DamageSource.generic;
+                    }
+                    else
+                    {
+                        damagesource = DamageSource.generic;
+                    }
+
+                    if (this.isBurning() && !(movingobjectposition.entityHit instanceof EntityEnderman))
+                    {
+                        movingobjectposition.entityHit.setFire(5);
+                    }
+
+                    if (movingobjectposition.entityHit.attackEntityFrom(damagesource, k))
+                    {
+                        if (movingobjectposition.entityHit instanceof EntityLivingBase)
+                        {
+                            EntityLivingBase entitylivingbase = (EntityLivingBase)movingobjectposition.entityHit;
+
+                            if (this.knockbackStrength > 0)
+                            {
+                                f4 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
+
+                                if (f4 > 0.0F)
+                                {
+                                    movingobjectposition.entityHit.addVelocity(this.motionX * this.knockbackStrength * 0.6000000238418579D / f4, 0.1D, this.motionZ * this.knockbackStrength * 0.6000000238418579D / f4);
+                                }
+                            }
+
+                            if (this.shootingEntity != null && this.shootingEntity instanceof EntityLivingBase)
+                            {
+                                EnchantmentHelper.func_151384_a(entitylivingbase, this.shootingEntity);
+                                EnchantmentHelper.func_151385_b((EntityLivingBase)this.shootingEntity, entitylivingbase);
+                            }
+
+                            if (this.shootingEntity != null && movingobjectposition.entityHit != this.shootingEntity && movingobjectposition.entityHit instanceof EntityPlayer && this.shootingEntity instanceof EntityPlayerMP)
+                            {
+                                ((EntityPlayerMP)this.shootingEntity).playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(6, 0.0F));
+                            }
+                        }
+
+                        if (!(movingobjectposition.entityHit instanceof EntityEnderman))
+                        {
+                            if (!this.worldObj.isRemote && movingobjectposition.entityHit instanceof EntityLivingBase)
+                            {
+                            	movingobjectposition.entityHit.attackEntityFrom(damagesource, 25 + rand.nextInt(20));
+                            	if(!worldObj.isRemote) {
+                            		ExplosionLarge.explode(worldObj, posX, posY, posZ, 50, true, true, true);
+                            	}
+                        		this.setDead();
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    this.field_145791_d = movingobjectposition.blockX;
+                    this.field_145792_e = movingobjectposition.blockY;
+                    this.field_145789_f = movingobjectposition.blockZ;
+                    this.field_145790_g = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f);
+                    this.inData = this.worldObj.getBlockMetadata(this.field_145791_d, this.field_145792_e, this.field_145789_f);
+                }
+            }
+
+            this.posX += this.motionX;
+            this.posY += this.motionY;
+            this.posZ += this.motionZ;
+            f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
+            this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI);
+
+            float f3 = 0.99F;
+            f1 = 0.05F;
+
+            if (this.isInWater())
+            {
+            	this.setDead();
+            }
+
+            if (this.isWet())
+            {
+                this.extinguish();
+            }
+            
+            this.setPosition(this.posX, this.posY, this.posZ);
+            this.func_145775_I();
+        }
+    }
+
+    /**
+     * (abstract) Protected helper method to write subclass entity data to NBT.
+     */
+    @Override
+	public void writeEntityToNBT(NBTTagCompound p_70014_1_)
+    {
+        p_70014_1_.setShort("xTile", (short)this.field_145791_d);
+        p_70014_1_.setShort("yTile", (short)this.field_145792_e);
+        p_70014_1_.setShort("zTile", (short)this.field_145789_f);
+        p_70014_1_.setShort("life", (short)this.ticksInGround);
+        p_70014_1_.setByte("inTile", (byte)Block.getIdFromBlock(this.field_145790_g));
+        p_70014_1_.setByte("inData", (byte)this.inData);
+        p_70014_1_.setByte("shake", (byte)this.arrowShake);
+        p_70014_1_.setByte("inGround", (byte)(this.inGround ? 1 : 0));
+        p_70014_1_.setByte("pickup", (byte)this.canBePickedUp);
+        p_70014_1_.setDouble("damage", this.damage);
+    }
+
+    /**
+     * (abstract) Protected helper method to read subclass entity data from NBT.
+     */
+    @Override
+	public void readEntityFromNBT(NBTTagCompound p_70037_1_)
+    {
+        this.field_145791_d = p_70037_1_.getShort("xTile");
+        this.field_145792_e = p_70037_1_.getShort("yTile");
+        this.field_145789_f = p_70037_1_.getShort("zTile");
+        this.ticksInGround = p_70037_1_.getShort("life");
+        this.field_145790_g = Block.getBlockById(p_70037_1_.getByte("inTile") & 255);
+        this.inData = p_70037_1_.getByte("inData") & 255;
+        this.arrowShake = p_70037_1_.getByte("shake") & 255;
+        this.inGround = p_70037_1_.getByte("inGround") == 1;
+
+        if (p_70037_1_.hasKey("damage", 99))
+        {
+            this.damage = p_70037_1_.getDouble("damage");
+        }
+
+        if (p_70037_1_.hasKey("pickup", 99))
+        {
+            this.canBePickedUp = p_70037_1_.getByte("pickup");
+        }
+        else if (p_70037_1_.hasKey("player", 99))
+        {
+            this.canBePickedUp = p_70037_1_.getBoolean("player") ? 1 : 0;
+        }
+    }
+
+    /**
+     * returns if this entity triggers Block.onEntityWalking on the blocks they walk on. used for spiders and wolves to
+     * prevent them from trampling crops
+     */
+    @Override
+	protected boolean canTriggerWalking()
+    {
+        return false;
+    }
+
+    @Override
+	@SideOnly(Side.CLIENT)
+    public float getShadowSize()
+    {
+        return 0.0F;
+    }
+
+    public void setDamage(double p_70239_1_)
+    {
+        this.damage = p_70239_1_;
+    }
+
+    public double getDamage()
+    {
+        return this.damage;
+    }
+
+    /**
+     * Sets the amount of knockback the arrow applies when it hits a mob.
+     */
+    public void setKnockbackStrength(int p_70240_1_)
+    {
+        this.knockbackStrength = p_70240_1_;
+    }
+
+    /**
+     * If returns false, the item will not inflict any damage against entities.
+     */
+    @Override
+	public boolean canAttackWithItem()
+    {
+        return false;
+    }
+
+    /**
+     * Whether the arrow has a stream of critical hit particles flying behind it.
+     */
+    public void setIsCritical(boolean p_70243_1_)
+    {
+        byte b0 = this.dataWatcher.getWatchableObjectByte(16);
+
+        if (p_70243_1_)
+        {
+            this.dataWatcher.updateObject(16, Byte.valueOf((byte)(b0 | 1)));
+        }
+        else
+        {
+            this.dataWatcher.updateObject(16, Byte.valueOf((byte)(b0 & -2)));
+        }
+    }
+
+    /**
+     * Whether the arrow has a stream of critical hit particles flying behind it.
+     */
+    public boolean getIsCritical()
+    {
+        byte b0 = this.dataWatcher.getWatchableObjectByte(16);
+        return (b0 & 1) != 0;
+    }
+}
--- a/com/hbm/handler/FuelHandler.java
+++ b/com/hbm/handler/FuelHandler.java
@ -11,9 +11,21 @@ public class FuelHandler implements IFuelHandler {

 	@Override
 	public int getBurnTime(ItemStack fuel) {
-		
+
+		if(fuel.getItem().equals(ModItems.canister_oil))
+			return 3200;
+		if(fuel.getItem().equals(ModItems.canister_smear))
+			return 6400;
+		if(fuel.getItem().equals(ModItems.canister_reoil))
+			return 9600;
+		if(fuel.getItem().equals(ModItems.canister_petroil))
+			return 9200;
+		if(fuel.getItem().equals(ModItems.canister_canola))
+			return 4800;
 		if(fuel.getItem().equals(ModItems.canister_fuel))
 			return 3200;
+		if(fuel.getItem().equals(ModItems.canister_kerosene))
+			return 2400;
 		if(fuel.getItem().equals(ModItems.powder_coal))
 			return 1600;
 		if(fuel.getItem().equals(ModItems.scrap))
@ -22,6 +34,10 @@ public class FuelHandler implements IFuelHandler {
 			return 400;
 		if(fuel.getItem().equals(ModItems.powder_fire))
 			return 6400;
+		if(fuel.getItem().equals(Item.getItemFromBlock(ModBlocks.red_barrel)))
+			return 32000;
+		if(fuel.getItem().equals(Item.getItemFromBlock(ModBlocks.block_scrap)))
+			return 8000;
 		
 		return 0;
 	}
--- a/com/hbm/handler/GUIHandler.java
+++ b/com/hbm/handler/GUIHandler.java
@ -21,6 +21,7 @@ import com.hbm.inventory.container.ContainerMachineCyclotron;
 import com.hbm.inventory.container.ContainerMachineDeuterium;
 import com.hbm.inventory.container.ContainerMachineDiesel;
 import com.hbm.inventory.container.ContainerMachineGasFlare;
+import com.hbm.inventory.container.ContainerMachineMiningDrill;
 import com.hbm.inventory.container.ContainerMachineOilWell;
 import com.hbm.inventory.container.ContainerMachineRTG;
 import com.hbm.inventory.container.ContainerMachineRefinery;
@ -63,6 +64,7 @@ import com.hbm.inventory.gui.GUIMachineDiesel;
 import com.hbm.inventory.gui.GUIMachineElectricFurnace;
 import com.hbm.inventory.gui.GUIMachineGasFlare;
 import com.hbm.inventory.gui.GUIMachineGenerator;
+import com.hbm.inventory.gui.GUIMachineMiningDrill;
 import com.hbm.inventory.gui.GUIMachineOilWell;
 import com.hbm.inventory.gui.GUIMachinePuF6Tank;
 import com.hbm.inventory.gui.GUIMachineRTG;
@ -96,6 +98,7 @@ import com.hbm.tileentity.TileEntityDiFurnace;
 import com.hbm.tileentity.TileEntityFWatzCore;
 import com.hbm.tileentity.TileEntityFusionMultiblock;
 import com.hbm.tileentity.TileEntityMachineIGenerator;
+import com.hbm.tileentity.TileEntityMachineMiningDrill;
 import com.hbm.tileentity.TileEntityMachineOilWell;
 import com.hbm.tileentity.TileEntityLaunchPad;
 import com.hbm.tileentity.TileEntityMachineBattery;
@ -488,6 +491,14 @@ public class GUIHandler implements IGuiHandler {
 					return new ContainerMachineGasFlare(player.inventory, (TileEntityMachineGasFlare) entity);
 				}
 			}
+
+			case ModBlocks.guiID_machine_drill:
+			{
+				if(entity instanceof TileEntityMachineMiningDrill)
+				{
+					return new ContainerMachineMiningDrill(player.inventory, (TileEntityMachineMiningDrill) entity);
+				}
+			}
 		}
 		return null;
 	}
@ -844,6 +855,14 @@ public class GUIHandler implements IGuiHandler {
 						return new GUIMachineGasFlare(player.inventory, (TileEntityMachineGasFlare) entity);
 					}
 				}
+				
+				case ModBlocks.guiID_machine_drill:
+				{
+					if(entity instanceof TileEntityMachineMiningDrill)
+					{
+						return new GUIMachineMiningDrill(player.inventory, (TileEntityMachineMiningDrill) entity);
+					}
+				}
 			}
 		}
 		return null;
--- a/com/hbm/handler/MultiblockHandler.java
+++ b/com/hbm/handler/MultiblockHandler.java
@ -48,6 +48,7 @@ public class MultiblockHandler {
 	public static final int[] cyclDimension  = new int[] { 1, 1, 5, 0, 1, 1 };
 	public static final int[] wellDimension  = new int[] { 1, 1, 5, 0, 1, 1 };
 	public static final int[] flareDimension  = new int[] { 1, 1, 9, 0, 1, 1 };
+	public static final int[] drillDimension  = new int[] { 1, 1, 3, 0, 1, 1 };
 	
 	//Approved!
 	public static boolean checkSpace(World world, int x, int y, int z, int[] i) {
--- a/com/hbm/inventory/MachineRecipes.java
+++ b/com/hbm/inventory/MachineRecipes.java
@ -41,8 +41,8 @@ public class MachineRecipes {
 			}
 		}

-		if (item == ModItems.ingot_tungsten && item2 == Items.coal
-				|| item == Items.coal && item2 == ModItems.ingot_tungsten) {
+		if (mODE(item, new String[] {"ingotTungsten", "dustTungsten"}) && mODE(item2, "gemCoal")
+				|| mODE(item, "gemCoal") && mODE(item2, new String[] {"ingotTungsten", "dustTungsten"})) {
 			return new ItemStack(ModItems.neutron_reflector, 2);
 		}

@ -65,11 +65,6 @@ public class MachineRecipes {
 			return new ItemStack(ModItems.ingot_red_copper, 2);
 		}

-		if (item == ModItems.canister_empty && item2 == Items.coal
-				|| item == Items.coal && item2 == ModItems.canister_empty) {
-			return new ItemStack(ModItems.canister_fuel, 1);
-		}
-
 		if (item == ModItems.canister_fuel && item2 == Items.slime_ball
 				|| item == Items.slime_ball && item2 == ModItems.canister_fuel) {
 			return new ItemStack(ModItems.canister_napalm, 1);
@ -152,10 +147,6 @@ public class MachineRecipes {
 		ItemStack[] schrabidium = new ItemStack[] { new ItemStack(ModItems.ingot_schrabidium, 1),
 				new ItemStack(ModItems.sulfur, 1), new ItemStack(ModItems.sulfur, 1),
 				new ItemStack(ModItems.cell_empty, 1) };
-		ItemStack[] lithium2 = new ItemStack[] { new ItemStack(ModItems.lithium, 1), new ItemStack(ModItems.lithium, 1),
-				new ItemStack(ModItems.lithium, 1), new ItemStack(ModItems.lithium, 1) };
-		ItemStack[] lithium3 = new ItemStack[] { new ItemStack(ModItems.lithium, 4), new ItemStack(ModItems.lithium, 4),
-				new ItemStack(ModItems.lithium, 4), new ItemStack(ModItems.lithium, 4) };

 		ItemStack[] uran1 = new ItemStack[] { new ItemStack(ModItems.nugget_u235, 1),
 				new ItemStack(ModItems.nugget_u238, 3), new ItemStack(ModItems.nugget_pu239, 2),
@ -260,14 +251,6 @@ public class MachineRecipes {
 			return schrabidium3;
 		}

-		if (item == item.getItemFromBlock(Blocks.quartz_block) || item == item.getItemFromBlock(Blocks.quartz_stairs)) {
-			return lithium3;
-		}
-
-		if (item == Items.quartz) {
-			return lithium2;
-		}
-
 		return null;
 	}

@ -630,8 +613,6 @@ public class MachineRecipes {
 				new ItemStack(ModItems.ingot_red_copper, 2));
 		recipes.put(new ItemStack[] { new ItemStack(ModItems.ingot_red_copper), new ItemStack(ModItems.ingot_steel) },
 				new ItemStack(ModItems.ingot_advanced_alloy, 2));
-		recipes.put(new ItemStack[] { new ItemStack(ModItems.canister_empty), new ItemStack(Items.coal) },
-				new ItemStack(ModItems.canister_fuel, 1));
 		recipes.put(new ItemStack[] { new ItemStack(ModItems.canister_fuel), new ItemStack(Items.slime_ball) },
 				new ItemStack(ModItems.canister_napalm, 1));
 		recipes.put(
@ -705,9 +686,6 @@ public class MachineRecipes {
 		// recipes.put(new
 		// ItemStack(ModItems.rod_quad_schrabidium_fuel_depleted),
 		// getCentrifugeOutput(ModItems.rod_quad_schrabidium_fuel_depleted));
-		recipes.put(new ItemStack(Item.getItemFromBlock(Blocks.quartz_block)),
-				getCentrifugeOutput(Item.getItemFromBlock(Blocks.quartz_block)));
-		recipes.put(new ItemStack(Items.quartz), getCentrifugeOutput(Items.quartz));
 		return recipes;
 	}

@ -1443,8 +1421,21 @@ public class MachineRecipes {
 	public ArrayList<ItemStack> getBatteries() {
 		ArrayList<ItemStack> fuels = new ArrayList<ItemStack>();
 		fuels.add(new ItemStack(ModItems.battery_generic));
+		fuels.add(new ItemStack(ModItems.battery_red_cell));
+		fuels.add(new ItemStack(ModItems.battery_red_cell_6));
+		fuels.add(new ItemStack(ModItems.battery_red_cell_24));
 		fuels.add(new ItemStack(ModItems.battery_advanced));
+		fuels.add(new ItemStack(ModItems.battery_advanced_cell));
+		fuels.add(new ItemStack(ModItems.battery_advanced_cell_4));
+		fuels.add(new ItemStack(ModItems.battery_advanced_cell_12));
+		fuels.add(new ItemStack(ModItems.battery_lithium));
+		fuels.add(new ItemStack(ModItems.battery_lithium_cell));
+		fuels.add(new ItemStack(ModItems.battery_lithium_cell_3));
+		fuels.add(new ItemStack(ModItems.battery_lithium_cell_6));
 		fuels.add(new ItemStack(ModItems.battery_schrabidium));
+		fuels.add(new ItemStack(ModItems.battery_schrabidium_cell));
+		fuels.add(new ItemStack(ModItems.battery_schrabidium_cell_2));
+		fuels.add(new ItemStack(ModItems.battery_schrabidium_cell_4));
 		fuels.add(new ItemStack(ModItems.fusion_core));
 		fuels.add(new ItemStack(ModItems.energy_core));
 		return fuels;
@ -1462,4 +1453,40 @@ public class MachineRecipes {
 		fuels.add(new ItemStack(ModItems.blades_schrabidium));
 		return fuels;
 	}
+	
+	public static boolean mODE(Item item, String[] names) {
+		return mODE(new ItemStack(item), names);
+	}
+	
+	public static boolean mODE(ItemStack item, String[] names) {
+		boolean flag = false;
+		if(names.length > 0) {
+			for(int i = 0; i < names.length; i++) {
+				if(mODE(item, names[i]))
+					flag = true;
+			}
+		}
+		
+		return flag;
+	}
+	
+	public static boolean mODE(Item item, String name) {
+		return mODE(new ItemStack(item), name);
+	}
+	
+	//Matches Ore Dict Entry
+	public static boolean mODE(ItemStack stack, String name) {
+		
+		int[] ids = OreDictionary.getOreIDs(new ItemStack(stack.getItem(), 1, stack.getItemDamage()));
+		
+		for(int i = 0; i < ids.length; i++) {
+			
+			String s = OreDictionary.getOreName(ids[i]);
+			
+			if(s.length() > 0 && s.equals(name))
+				return true;
+		}
+		
+		return false;
+	}
 }
--- a/com/hbm/inventory/container/ContainerMachineDeuterium.java
+++ b/com/hbm/inventory/container/ContainerMachineDeuterium.java
@ -92,7 +92,7 @@ private TileEntityMachineDeuterium nukeBoy;
 		{
 			ICrafting par1 = (ICrafting)this.crafters.get(i);
 			
-			if(this.power != this.nukeBoy.process)
+			if(this.progress != this.nukeBoy.process)
 			{
 				par1.sendProgressBarUpdate(this, 0, this.nukeBoy.process);
 			}
--- a/com/hbm/inventory/container/ContainerMachineMiningDrill.java
+++ b/com/hbm/inventory/container/ContainerMachineMiningDrill.java
@ -0,0 +1,122 @@
+package com.hbm.inventory.container;
+
+import com.hbm.inventory.SlotMachineOutput;
+import com.hbm.tileentity.TileEntityMachineDeuterium;
+import com.hbm.tileentity.TileEntityMachineMiningDrill;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+public class ContainerMachineMiningDrill extends Container {
+
+private TileEntityMachineMiningDrill nukeBoy;
+
+	private int power;
+	private int water;
+	private int sulfur;
+	private int progress;
+	
+	public ContainerMachineMiningDrill(InventoryPlayer invPlayer, TileEntityMachineMiningDrill tedf) {
+		
+		nukeBoy = tedf;
+
+		//Battery
+		this.addSlotToContainer(new Slot(tedf, 0, 44, 53));
+		//Outputs
+		this.addSlotToContainer(new Slot(tedf, 1, 80, 17));
+		this.addSlotToContainer(new Slot(tedf, 2, 98, 17));
+		this.addSlotToContainer(new Slot(tedf, 3, 116, 17));
+		this.addSlotToContainer(new Slot(tedf, 4, 80, 35));
+		this.addSlotToContainer(new Slot(tedf, 5, 98, 35));
+		this.addSlotToContainer(new Slot(tedf, 6, 116, 35));
+		this.addSlotToContainer(new Slot(tedf, 7, 80, 53));
+		this.addSlotToContainer(new Slot(tedf, 8, 98, 53));
+		this.addSlotToContainer(new Slot(tedf, 9, 116, 53));
+		//Upgrades
+		this.addSlotToContainer(new Slot(tedf, 10, 152, 17));
+		this.addSlotToContainer(new Slot(tedf, 11, 152, 35));
+		this.addSlotToContainer(new Slot(tedf, 12, 152, 53));
+		
+		for(int i = 0; i < 3; i++)
+		{
+			for(int j = 0; j < 9; j++)
+			{
+				this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
+			}
+		}
+		
+		for(int i = 0; i < 9; i++)
+		{
+			this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142));
+		}
+	}
+	
+	@Override
+    public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2)
+    {
+		ItemStack var3 = null;
+		Slot var4 = (Slot) this.inventorySlots.get(par2);
+		
+		if (var4 != null && var4.getHasStack())
+		{
+			ItemStack var5 = var4.getStack();
+			var3 = var5.copy();
+			
+            if (par2 <= 12) {
+				if (!this.mergeItemStack(var5, 13, this.inventorySlots.size(), true))
+				{
+					return null;
+				}
+			}
+			else if (!this.mergeItemStack(var5, 0, 13, false))
+			{
+					return null;
+			}
+			
+			if (var5.stackSize == 0)
+			{
+				var4.putStack((ItemStack) null);
+			}
+			else
+			{
+				var4.onSlotChanged();
+			}
+		}
+		
+		return var3;
+    }
+
+	@Override
+	public boolean canInteractWith(EntityPlayer player) {
+		return nukeBoy.isUseableByPlayer(player);
+	}
+	
+	@Override
+	public void detectAndSendChanges() {
+		super.detectAndSendChanges();
+		
+		for(int i = 0; i < this.crafters.size(); i++)
+		{
+			ICrafting par1 = (ICrafting)this.crafters.get(i);
+			
+			if(this.power != this.nukeBoy.power)
+			{
+				par1.sendProgressBarUpdate(this, 0, this.nukeBoy.power);
+			}
+		}
+		
+		this.power = this.nukeBoy.power;
+	}
+	
+	@Override
+	public void updateProgressBar(int i, int j) {
+		if(i == 0)
+		{
+			nukeBoy.power = j;
+		}
+	}
+}
--- a/com/hbm/inventory/gui/GUIMachineMiningDrill.java
+++ b/com/hbm/inventory/gui/GUIMachineMiningDrill.java
@ -0,0 +1,49 @@
+package com.hbm.inventory.gui;
+
+import org.lwjgl.opengl.GL11;
+
+import com.hbm.inventory.container.ContainerMachineDiesel;
+import com.hbm.inventory.container.ContainerMachineMiningDrill;
+import com.hbm.lib.RefStrings;
+import com.hbm.tileentity.TileEntityMachineDiesel;
+import com.hbm.tileentity.TileEntityMachineMiningDrill;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+
+public class GUIMachineMiningDrill extends GuiContainer {
+	
+	private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/gui_drill.png");
+	private TileEntityMachineMiningDrill diFurnace;
+
+	public GUIMachineMiningDrill(InventoryPlayer invPlayer, TileEntityMachineMiningDrill tedf) {
+		super(new ContainerMachineMiningDrill(invPlayer, tedf));
+		diFurnace = tedf;
+		
+		this.xSize = 176;
+		this.ySize = 166;
+	}
+	
+	@Override
+	protected void drawGuiContainerForegroundLayer(int i, int j) {
+		String name = this.diFurnace.hasCustomInventoryName() ? this.diFurnace.getInventoryName() : I18n.format(this.diFurnace.getInventoryName());
+		
+		this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752);
+		this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
+	}
+
+	@Override
+	protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
+		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+		Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
+		drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
+		
+		if(diFurnace.power > 0) {
+			int i = diFurnace.getPowerScaled(52);
+			drawTexturedModalRect(guiLeft + 8, guiTop + 69 - i, 176, 52 - i, 16, i);
+		}
+	}
+}
--- a/com/hbm/items/ModItems.java
+++ b/com/hbm/items/ModItems.java
@ -2,97 +2,12 @@ package com.hbm.items;

 import com.hbm.blocks.ModBlocks;
 import com.hbm.handler.BucketHandler;
-import com.hbm.items.bomb.ItemBoy;
-import com.hbm.items.bomb.ItemFleija;
-import com.hbm.items.bomb.ItemGadget;
-import com.hbm.items.bomb.ItemMan;
-import com.hbm.items.bomb.ItemManMike;
-import com.hbm.items.bomb.ItemMike;
-import com.hbm.items.bomb.ItemTsar;
-import com.hbm.items.food.ItemAppleEuphemium;
-import com.hbm.items.food.ItemAppleSchrabidium;
-import com.hbm.items.food.ItemCottonCandy;
-import com.hbm.items.food.ItemEnergy;
-import com.hbm.items.food.ItemLemon;
-import com.hbm.items.food.ItemNugget;
-import com.hbm.items.food.ItemPill;
-import com.hbm.items.food.ItemSchnitzelVegan;
-import com.hbm.items.food.ItemTemFlakes;
-import com.hbm.items.food.ItemWaffle;
-import com.hbm.items.gear.ArmorAsbestos;
-import com.hbm.items.gear.ArmorAustralium;
-import com.hbm.items.gear.ArmorEuphemium;
-import com.hbm.items.gear.ArmorHazmat;
-import com.hbm.items.gear.ArmorModel;
-import com.hbm.items.gear.ArmorSchrabidium;
-import com.hbm.items.gear.ArmorT45;
-import com.hbm.items.gear.ArmorTest;
-import com.hbm.items.gear.AxeSchrabidium;
-import com.hbm.items.gear.BigSword;
-import com.hbm.items.gear.HoeSchrabidium;
-import com.hbm.items.gear.MaskOfInfamy;
-import com.hbm.items.gear.ModArmor;
-import com.hbm.items.gear.ModAxe;
-import com.hbm.items.gear.ModHoe;
-import com.hbm.items.gear.ModPickaxe;
-import com.hbm.items.gear.ModSpade;
-import com.hbm.items.gear.ModSword;
-import com.hbm.items.gear.PickaxeSchrabidium;
-import com.hbm.items.gear.RedstoneSword;
-import com.hbm.items.gear.SpadeSchrabidium;
-import com.hbm.items.gear.SwordSchrabidium;
-import com.hbm.items.gear.WeaponSpecial;
-import com.hbm.items.special.ItemAntiCheat;
-import com.hbm.items.special.ItemBattery;
-import com.hbm.items.special.ItemBlades;
-import com.hbm.items.special.ItemCapacitor;
-import com.hbm.items.special.ItemCell;
-import com.hbm.items.special.ItemChopper;
-import com.hbm.items.special.ItemCustomLore;
-import com.hbm.items.special.ItemDrop;
-import com.hbm.items.special.ItemFuelRod;
-import com.hbm.items.special.ItemModRecord;
-import com.hbm.items.special.ItemPolaroid;
-import com.hbm.items.special.ItemRadioactive;
-import com.hbm.items.special.ItemStarterKit;
-import com.hbm.items.special.ItemSyringe;
-import com.hbm.items.special.ItemTankWaste;
-import com.hbm.items.special.ItemTeleLink;
-import com.hbm.items.special.WatzFuel;
-import com.hbm.items.tool.ItemCrateCaller;
-import com.hbm.items.tool.ItemDesingator;
-import com.hbm.items.tool.ItemDesingatorRange;
-import com.hbm.items.tool.ItemDetonator;
-import com.hbm.items.tool.ItemMatch;
-import com.hbm.items.tool.ItemModBucket;
-import com.hbm.items.tool.ItemMultitoolPassive;
-import com.hbm.items.tool.ItemMultitoolTool;
-import com.hbm.items.tool.ItemOilDetector;
-import com.hbm.items.tool.ItemRamManipulator;
-import com.hbm.items.tool.ItemWand;
-import com.hbm.items.tool.ItemWandD;
-import com.hbm.items.tool.ItemWandS;
-import com.hbm.items.tool.ItemWiring;
-import com.hbm.items.weapon.GunBaleFlare;
-import com.hbm.items.weapon.GunCryolator;
-import com.hbm.items.weapon.GunEMPRay;
-import com.hbm.items.weapon.GunEuthanasia;
-import com.hbm.items.weapon.GunFatman;
-import com.hbm.items.weapon.GunImmolator;
-import com.hbm.items.weapon.GunJack;
-import com.hbm.items.weapon.GunMIRV;
-import com.hbm.items.weapon.GunMP;
-import com.hbm.items.weapon.GunNightmare;
-import com.hbm.items.weapon.GunOSIPR;
-import com.hbm.items.weapon.GunRevolver;
-import com.hbm.items.weapon.GunRpg;
-import com.hbm.items.weapon.GunSMG;
-import com.hbm.items.weapon.GunShotgun;
-import com.hbm.items.weapon.GunSuicide;
-import com.hbm.items.weapon.GunXVL1456;
-import com.hbm.items.weapon.GunZOMG;
-import com.hbm.items.weapon.ItemClip;
-import com.hbm.items.weapon.ItemGrenade;
+import com.hbm.items.bomb.*;
+import com.hbm.items.food.*;
+import com.hbm.items.gear.*;
+import com.hbm.items.special.*;
+import com.hbm.items.tool.*;
+import com.hbm.items.weapon.*;
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;

@ -173,6 +88,9 @@ public class ModItems {
 	public static Item nugget_unobtainium;
 	public static Item nugget_daffergon;
 	public static Item nugget_verticium;
+	
+	public static Item ingot_desh;
+	public static Item nugget_desh;

 	public static Item nugget_uranium;
 	public static Item nugget_u235;
@ -209,6 +127,7 @@ public class ModItems {
 	public static Item bolt_dura_steel;
 	public static Item pipes_steel;
 	public static Item drill_titanium;
+	public static Item plate_dalekanium;
 	
 	public static Item ingot_dura_steel;
 	public static Item ingot_polymer;
@ -266,9 +185,12 @@ public class ModItems {

 	public static Item powder_dura_steel;
 	public static Item powder_polymer;
+	public static Item powder_lithium_tiny;
+	public static Item powder_cobalt_tiny;

 	public static Item powder_lanthanium;
 	public static Item powder_actinium;
+	public static Item powder_desh;
 	
 	public static Item coil_copper;
 	public static Item coil_copper_torus;
@ -429,6 +351,8 @@ public class ModItems {
 	public static Item canister_oil;
 	public static Item canister_fuel;
 	public static Item canister_kerosene;
+	public static Item canister_reoil;
+	public static Item canister_petroil;
 	public static Item canister_napalm;
 	public static Item canister_NITAN;

@ -751,6 +675,20 @@ public class ModItems {
 	public static Item factory_core_titanium;
 	public static Item factory_core_advanced;

+	public static Item upgrade_template;
+	public static Item upgrade_speed_1;
+	public static Item upgrade_speed_2;
+	public static Item upgrade_speed_3;
+	public static Item upgrade_effect_1;
+	public static Item upgrade_effect_2;
+	public static Item upgrade_effect_3;
+	public static Item upgrade_power_1;
+	public static Item upgrade_power_2;
+	public static Item upgrade_power_3;
+	public static Item upgrade_fortune_1;
+	public static Item upgrade_fortune_2;
+	public static Item upgrade_fortune_3;
+
 	public static Item ingot_euphemium;
 	public static Item nugget_euphemium;
 	public static Item rod_quad_euphemium;
@ -1087,9 +1025,12 @@ public class ModItems {
 		bolt_dura_steel = new Item().setUnlocalizedName("bolt_dura_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":bolt_dura_steel");
 		pipes_steel = new Item().setUnlocalizedName("pipes_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":pipes_steel");
 		drill_titanium = new Item().setUnlocalizedName("drill_titanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":drill_titanium");
+		plate_dalekanium = new Item().setUnlocalizedName("plate_dalekanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":plate_dalekanium");

 		ingot_dura_steel = new ItemCustomLore().setUnlocalizedName("ingot_dura_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_dura_steel");
 		ingot_polymer = new ItemCustomLore().setUnlocalizedName("ingot_polymer").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_polymer");
+		ingot_desh = new ItemCustomLore().setUnlocalizedName("ingot_desh").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_desh");
+		nugget_desh = new ItemCustomLore().setUnlocalizedName("nugget_desh").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_desh");

 		ingot_lanthanium = new ItemCustomLore().setUnlocalizedName("ingot_lanthanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_lanthanium");
 		ingot_actinium = new ItemCustomLore().setUnlocalizedName("ingot_actinium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_actinium");
@ -1178,6 +1119,9 @@ public class ModItems {
 		powder_polymer = new ItemCustomLore().setUnlocalizedName("powder_polymer").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_polymer");
 		powder_lanthanium = new ItemCustomLore().setUnlocalizedName("powder_lanthanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lanthanium");
 		powder_actinium = new ItemCustomLore().setUnlocalizedName("powder_actinium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_actinium");
+		powder_desh = new Item().setUnlocalizedName("powder_desh").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_desh");
+		powder_lithium_tiny = new Item().setUnlocalizedName("powder_lithium_tiny").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lithium_tiny");
+		powder_cobalt_tiny = new Item().setUnlocalizedName("powder_cobalt_tiny").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_cobalt_tiny");

 		coil_copper = new Item().setUnlocalizedName("coil_copper").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":coil_copper");
 		coil_copper_torus = new Item().setUnlocalizedName("coil_copper_torus").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":coil_copper_torus");
@ -1326,6 +1270,8 @@ public class ModItems {
 		canister_oil = new ItemCustomLore().setUnlocalizedName("canister_oil").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_oil");
 		canister_fuel = new ItemCustomLore().setUnlocalizedName("canister_fuel").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_fuel");
 		canister_kerosene = new ItemCustomLore().setUnlocalizedName("canister_kerosene").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_kerosene");
+		canister_reoil = new ItemCustomLore().setUnlocalizedName("canister_reoil").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_reoil");
+		canister_petroil = new ItemCustomLore().setUnlocalizedName("canister_petroil").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_petroil");
 		canister_napalm = new ItemCustomLore().setUnlocalizedName("canister_napalm").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_napalm");
 		canister_NITAN = new ItemCustomLore().setUnlocalizedName("canister_NITAN").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_superfuel");
 		gas_empty = new Item().setUnlocalizedName("gas_empty").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":gas_empty");
@ -1542,13 +1488,13 @@ public class ModItems {
 		gun_jack_ammo = new Item().setUnlocalizedName("gun_jack_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_jack_ammo");
 		gun_jack = new GunJack().setUnlocalizedName("gun_jack").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_jack");
 		gun_spark_ammo = new Item().setUnlocalizedName("gun_spark_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_spark_ammo");
-		gun_spark = new GunJack().setUnlocalizedName("gun_spark").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_spark");
+		gun_spark = new GunSpark().setUnlocalizedName("gun_spark").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_spark");
 		gun_hp_ammo = new Item().setUnlocalizedName("gun_hp_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_hp_ammo");
-		gun_hp = new GunJack().setUnlocalizedName("gun_hp").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_hp");
+		gun_hp = new GunHP().setUnlocalizedName("gun_hp").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_hp");
 		gun_euthanasia_ammo = new Item().setUnlocalizedName("gun_euthanasia_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_euthanasia_ammo");
 		gun_euthanasia = new GunEuthanasia().setUnlocalizedName("gun_euthanasia").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_euthanasia");
 		gun_defabricator_ammo = new Item().setUnlocalizedName("gun_defabricator_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_defabricator_ammo");
-		gun_defabricator = new GunJack().setUnlocalizedName("gun_defabricator").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_defabricator");
+		gun_defabricator = new GunDefabricator().setUnlocalizedName("gun_defabricator").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_defabricator");
 		gun_super_shotgun = new ItemCustomLore().setUnlocalizedName("gun_super_shotgun").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_super_shotgun");
 		gun_moist_nugget = new ItemNugget(3, false).setUnlocalizedName("gun_moist_nugget").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_moist_nugget");
 		
@ -1644,6 +1590,20 @@ public class ModItems {
 		factory_core_titanium = new ItemBattery(70400).setUnlocalizedName("factory_core_titanium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":factory_core_titanium");
 		factory_core_advanced = new ItemBattery(41600).setUnlocalizedName("factory_core_advanced").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":factory_core_advanced");

+		upgrade_template = new ItemCustomLore().setUnlocalizedName("upgrade_template").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":upgrade_template");
+		upgrade_speed_1 = new ItemCustomLore().setUnlocalizedName("upgrade_speed_1").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":upgrade_speed_1");
+		upgrade_speed_2 = new ItemCustomLore().setUnlocalizedName("upgrade_speed_2").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":upgrade_speed_2");
+		upgrade_speed_3 = new ItemCustomLore().setUnlocalizedName("upgrade_speed_3").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":upgrade_speed_3");
+		upgrade_effect_1 = new ItemCustomLore().setUnlocalizedName("upgrade_effect_1").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":upgrade_effect_1");
+		upgrade_effect_2 = new ItemCustomLore().setUnlocalizedName("upgrade_effect_2").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":upgrade_effect_2");
+		upgrade_effect_3 = new ItemCustomLore().setUnlocalizedName("upgrade_effect_3").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":upgrade_effect_3");
+		upgrade_power_1 = new ItemCustomLore().setUnlocalizedName("upgrade_power_1").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":upgrade_power_1");
+		upgrade_power_2 = new ItemCustomLore().setUnlocalizedName("upgrade_power_2").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":upgrade_power_2");
+		upgrade_power_3 = new ItemCustomLore().setUnlocalizedName("upgrade_power_3").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":upgrade_power_3");
+		upgrade_fortune_1 = new ItemCustomLore().setUnlocalizedName("upgrade_fortune_1").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":upgrade_fortune_1");
+		upgrade_fortune_2 = new ItemCustomLore().setUnlocalizedName("upgrade_fortune_2").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":upgrade_fortune_2");
+		upgrade_fortune_3 = new ItemCustomLore().setUnlocalizedName("upgrade_fortune_3").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":upgrade_fortune_3");
+
 		wand = new ItemWand().setUnlocalizedName("wand_k").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setFull3D().setTextureName(RefStrings.MODID + ":wand");
 		wand_s = new ItemWandS().setUnlocalizedName("wand_s").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setFull3D().setTextureName(RefStrings.MODID + ":wand_s");
 		wand_d = new ItemWandD().setUnlocalizedName("wand_d").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setFull3D().setTextureName(RefStrings.MODID + ":wand_d");
@ -1707,7 +1667,7 @@ public class ModItems {
 		
 		goggles = new ArmorModel(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("goggles").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":goggles");
 		gas_mask = new ArmorModel(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("gas_mask").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":gas_mask");
-		oxy_mask = new ArmorModel(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("oxy_mask").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":oxy_mask");
+		//oxy_mask = new ArmorModel(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("oxy_mask").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":oxy_mask");
 		
 		t45_helmet = new ArmorT45(MainRegistry.enumArmorMaterialT45, 2, 0).setUnlocalizedName("t45_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_helmet");
 		t45_plate = new ArmorT45(MainRegistry.enumArmorMaterialT45, 2, 1).setUnlocalizedName("t45_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_plate");
@ -1979,6 +1939,7 @@ public class ModItems {
 		GameRegistry.registerItem(ingot_verticium, ingot_verticium.getUnlocalizedName());
 		GameRegistry.registerItem(ingot_lanthanium, ingot_lanthanium.getUnlocalizedName());
 		GameRegistry.registerItem(ingot_actinium, ingot_actinium.getUnlocalizedName());
+		GameRegistry.registerItem(ingot_desh, ingot_desh.getUnlocalizedName());

 		//Dusts & Other
 		GameRegistry.registerItem(lithium, lithium.getUnlocalizedName());
@ -2029,7 +1990,10 @@ public class ModItems {
 		GameRegistry.registerItem(powder_cerium, powder_cerium.getUnlocalizedName());
 		GameRegistry.registerItem(powder_lanthanium, powder_lanthanium.getUnlocalizedName());
 		GameRegistry.registerItem(powder_actinium, powder_actinium.getUnlocalizedName());
+		GameRegistry.registerItem(powder_desh, powder_desh.getUnlocalizedName());
 		GameRegistry.registerItem(dust, dust.getUnlocalizedName());
+		GameRegistry.registerItem(powder_lithium_tiny, powder_lithium_tiny.getUnlocalizedName());
+		GameRegistry.registerItem(powder_cobalt_tiny, powder_cobalt_tiny.getUnlocalizedName());
 		
 		//Powders
 		GameRegistry.registerItem(powder_fire, powder_fire.getUnlocalizedName());
@ -2062,6 +2026,7 @@ public class ModItems {
 		GameRegistry.registerItem(nugget_unobtainium, nugget_unobtainium.getUnlocalizedName());
 		GameRegistry.registerItem(nugget_daffergon, nugget_daffergon.getUnlocalizedName());
 		GameRegistry.registerItem(nugget_verticium, nugget_verticium.getUnlocalizedName());
+		GameRegistry.registerItem(nugget_desh, nugget_desh.getUnlocalizedName());

 		//Plates
 		GameRegistry.registerItem(plate_iron, plate_iron.getUnlocalizedName());
@ -2077,6 +2042,7 @@ public class ModItems {
 		GameRegistry.registerItem(plate_combine_steel, plate_combine_steel.getUnlocalizedName());
 		GameRegistry.registerItem(plate_mixed, plate_mixed.getUnlocalizedName());
 		GameRegistry.registerItem(plate_paa, plate_paa.getUnlocalizedName());
+		GameRegistry.registerItem(plate_dalekanium, plate_dalekanium.getUnlocalizedName());
 		
 		//Boards
 		GameRegistry.registerItem(board_copper, board_copper.getUnlocalizedName());
@ -2259,6 +2225,8 @@ public class ModItems {
 		GameRegistry.registerItem(canister_canola, canister_canola.getUnlocalizedName());
 		GameRegistry.registerItem(canister_fuel, canister_fuel.getUnlocalizedName());
 		GameRegistry.registerItem(canister_kerosene, canister_kerosene.getUnlocalizedName());
+		GameRegistry.registerItem(canister_reoil, canister_reoil.getUnlocalizedName());
+		GameRegistry.registerItem(canister_petroil, canister_petroil.getUnlocalizedName());
 		GameRegistry.registerItem(canister_napalm, canister_napalm.getUnlocalizedName());
 		GameRegistry.registerItem(canister_NITAN, canister_NITAN.getUnlocalizedName());
 		
@ -2288,6 +2256,23 @@ public class ModItems {
 		GameRegistry.registerItem(energy_core, energy_core.getUnlocalizedName());
 		GameRegistry.registerItem(factory_core_titanium, factory_core_titanium.getUnlocalizedName());
 		GameRegistry.registerItem(factory_core_advanced, factory_core_advanced.getUnlocalizedName());
+		
+		//Machine Upgrades
+		GameRegistry.registerItem(upgrade_template, upgrade_template.getUnlocalizedName());
+		GameRegistry.registerItem(upgrade_speed_1, upgrade_speed_1.getUnlocalizedName());
+		GameRegistry.registerItem(upgrade_speed_2, upgrade_speed_2.getUnlocalizedName());
+		GameRegistry.registerItem(upgrade_speed_3, upgrade_speed_3.getUnlocalizedName());
+		GameRegistry.registerItem(upgrade_effect_1, upgrade_effect_1.getUnlocalizedName());
+		GameRegistry.registerItem(upgrade_effect_2, upgrade_effect_2.getUnlocalizedName());
+		GameRegistry.registerItem(upgrade_effect_3, upgrade_effect_3.getUnlocalizedName());
+		GameRegistry.registerItem(upgrade_power_1, upgrade_power_1.getUnlocalizedName());
+		GameRegistry.registerItem(upgrade_power_2, upgrade_power_2.getUnlocalizedName());
+		GameRegistry.registerItem(upgrade_power_3, upgrade_power_3.getUnlocalizedName());
+		GameRegistry.registerItem(upgrade_fortune_1, upgrade_fortune_1.getUnlocalizedName());
+		GameRegistry.registerItem(upgrade_fortune_2, upgrade_fortune_2.getUnlocalizedName());
+		GameRegistry.registerItem(upgrade_fortune_3, upgrade_fortune_3.getUnlocalizedName());
+		
+		//Machine Items
 		GameRegistry.registerItem(fuse, fuse.getUnlocalizedName());
 		GameRegistry.registerItem(redcoil_capacitor, redcoil_capacitor.getUnlocalizedName());
 		GameRegistry.registerItem(titanium_filter, titanium_filter.getUnlocalizedName());
@ -2513,7 +2498,7 @@ public class ModItems {
 		GameRegistry.registerItem(gun_jack_ammo, gun_jack_ammo.getUnlocalizedName());
 		GameRegistry.registerItem(gun_spark_ammo, gun_spark_ammo.getUnlocalizedName());
 		GameRegistry.registerItem(gun_hp_ammo, gun_hp_ammo.getUnlocalizedName());
-		GameRegistry.registerItem(gun_defabricator, gun_defabricator.getUnlocalizedName());
+		GameRegistry.registerItem(gun_defabricator_ammo, gun_defabricator_ammo.getUnlocalizedName());
 		GameRegistry.registerItem(gun_euthanasia_ammo, gun_euthanasia_ammo.getUnlocalizedName());
 		
 		//-C-l-i-p-s- Magazines
@ -2711,7 +2696,7 @@ public class ModItems {
 		//Conventional Armor
 		GameRegistry.registerItem(goggles, goggles.getUnlocalizedName());
 		GameRegistry.registerItem(gas_mask, gas_mask.getUnlocalizedName());
-		GameRegistry.registerItem(oxy_mask, oxy_mask.getUnlocalizedName());
+		//GameRegistry.registerItem(oxy_mask, oxy_mask.getUnlocalizedName());
 		
 		GameRegistry.registerItem(steel_helmet, steel_helmet.getUnlocalizedName());
 		GameRegistry.registerItem(steel_plate, steel_plate.getUnlocalizedName());
--- a/com/hbm/items/special/ItemBattery.java
+++ b/com/hbm/items/special/ItemBattery.java
@ -83,13 +83,13 @@ public class ItemBattery extends Item {
    	}
    }
    
-    public long getCharge(ItemStack stack) {
+    public static long getCharge(ItemStack stack) {
    	if(stack.getItem() instanceof ItemBattery) {
    		if(stack.hasTagCompound()) {
    			return stack.stackTagCompound.getLong("charge");
    		} else {
    			stack.stackTagCompound = new NBTTagCompound();
-    			stack.stackTagCompound.setLong("charge", this.maxCharge);
+    			stack.stackTagCompound.setLong("charge", ((ItemBattery)stack.getItem()).maxCharge);
    			return stack.stackTagCompound.getLong("charge");
    		}
    	}
@ -101,6 +101,10 @@ public class ItemBattery extends Item {
    	return maxCharge;
    }
    
+    public static long getMaxChargeStatic(ItemStack stack) {
+    	return ((ItemBattery)stack.getItem()).maxCharge;
+    }
+    
    public static ItemStack getEmptyBattery(Item item) {
    	
    	if(item instanceof ItemBattery) {
--- a/com/hbm/items/special/ItemCustomLore.java
+++ b/com/hbm/items/special/ItemCustomLore.java
@ -417,6 +417,90 @@ public class ItemCustomLore extends ItemRadioactive {
 			list.add("Required for cyclotron operation.");
 			list.add("Do NOT operate cyclotron without it!");
 		}
+		
+		if(this == ModItems.upgrade_speed_1)
+		{
+			list.add("Mining drill speed upgrade");
+			list.add("Effect: Delay -15 (from 50)");
+			list.add("Drawback: Power consumption +300 (from 100)");
+		}
+		
+		if(this == ModItems.upgrade_speed_2)
+		{
+			list.add("Mining drill speed upgrade");
+			list.add("Effect: Delay -30 (from 50)");
+			list.add("Drawback: Power consumption +600 (from 100)");
+		}
+		
+		if(this == ModItems.upgrade_speed_3)
+		{
+			list.add("Mining drill speed upgrade");
+			list.add("Effect: Delay -45 (from 50)");
+			list.add("Drawback: Power consumption +900 (from 100)");
+		}
+		
+		if(this == ModItems.upgrade_effect_1)
+		{
+			list.add("Mining drill effectiveness upgrade");
+			list.add("Effect: Radius +1 (from 1)");
+			list.add("Drawback: Power consumption +80 (from 100)");
+		}
+		
+		if(this == ModItems.upgrade_effect_2)
+		{
+			list.add("Mining drill effectiveness upgrade");
+			list.add("Effect: Radius +2 (from 1)");
+			list.add("Drawback: Power consumption +160 (from 100)");
+		}
+		
+		if(this == ModItems.upgrade_effect_3)
+		{
+			list.add("Mining drill effectiveness upgrade");
+			list.add("Effect: Radius +3 (from 1)");
+			list.add("Drawback: Power consumption +240 (from 100)");
+		}
+		
+		if(this == ModItems.upgrade_power_1)
+		{
+			list.add("Mining drill power saving upgrade");
+			list.add("Effect: Power consumption -30 (from 100)");
+			list.add("Drawback: Delay +5 (from 50)");
+		}
+		
+		if(this == ModItems.upgrade_power_2)
+		{
+			list.add("Mining drill power saving upgrade");
+			list.add("Effect: Power consumption -60 (from 100)");
+			list.add("Drawback: Delay +10 (from 50)");
+		}
+		
+		if(this == ModItems.upgrade_power_3)
+		{
+			list.add("Mining drill power saving upgrade");
+			list.add("Effect: Power consumption -90 (from 100)");
+			list.add("Drawback: Delay +15 (from 50)");
+		}
+		
+		if(this == ModItems.upgrade_fortune_1)
+		{
+			list.add("Mining drill fortune upgrade");
+			list.add("Effect: Fortune +1 (from 0");
+			list.add("Drawback: Delay +15 (from 50)");
+		}
+		
+		if(this == ModItems.upgrade_fortune_2)
+		{
+			list.add("Mining drill fortune upgrade");
+			list.add("Effect: Fortune +2 (from 0");
+			list.add("Drawback: Delay +30 (from 50)");
+		}
+		
+		if(this == ModItems.upgrade_fortune_3)
+		{
+			list.add("Mining drill fortune upgrade");
+			list.add("Effect: Fortune +3 (from 0");
+			list.add("Drawback: Delay +45 (from 50)");
+		}
 	}

    @Override
--- a/com/hbm/items/special/ItemStarterKit.java
+++ b/com/hbm/items/special/ItemStarterKit.java
@ -237,6 +237,7 @@ public class ItemStarterKit extends Item {
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_strong, 16));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_frag, 16));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_fire, 16));
+			player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_shrapnel, 16));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_cluster, 16));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_flare, 16));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_electric, 16));
@ -252,6 +253,7 @@ public class ItemStarterKit extends Item {
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_nuke, 16));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_nuclear, 16));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_zomg, 16));
+			player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_black_hole, 16));
 		}
 		
 		if(this == ModItems.fleija_kit)
--- a/com/hbm/items/tool/ItemWandD.java
+++ b/com/hbm/items/tool/ItemWandD.java
@ -4,6 +4,7 @@ import java.util.List;

 import com.hbm.blocks.ModBlocks;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityPylonRedWire;

 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
@ -34,6 +35,12 @@ public class ItemWandD extends Item {
 				MainRegistry.z++;
 			if (b == ModBlocks.block_copper)
 				MainRegistry.z--;
+			if (b == ModBlocks.red_pylon) {
+				TileEntityPylonRedWire te = (TileEntityPylonRedWire) world.getTileEntity(x, y, z);
+				for(int i = 0; i < te.connected.size(); i++)
+					if(world.isRemote)
+						player.addChatMessage(new ChatComponentText(te.connected.get(i).xCoord + " " + te.connected.get(i).yCoord + " " + te.connected.get(i).zCoord));
+			}
 		}
 		
 		return true;
--- a/com/hbm/items/tool/ItemWiring.java
+++ b/com/hbm/items/tool/ItemWiring.java
@ -1,16 +1,88 @@
 package com.hbm.items.tool;

+import java.util.List;
+
+import com.hbm.blocks.ModBlocks;
+import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.TEPylonSenderPacket;
+import com.hbm.tileentity.TileEntityMachineTeleporter;
+import com.hbm.tileentity.TileEntityPylonRedWire;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ChatComponentText;
 import net.minecraft.world.World;

 public class ItemWiring extends Item {
-	
+
 	@Override
-    public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, int p_77648_4_, int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_)
-    {
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int p_77648_7_,
+			float p_77648_8_, float p_77648_9_, float p_77648_10_) {
+		if (!player.isSneaking()) {
+			TileEntity te = world.getTileEntity(x, y, z);
+
+			if (te != null && te instanceof TileEntityPylonRedWire) {
+
+				if (stack.stackTagCompound == null) {
+					stack.stackTagCompound = new NBTTagCompound();
+
+					stack.stackTagCompound.setInteger("x", x);
+					stack.stackTagCompound.setInteger("y", y);
+					stack.stackTagCompound.setInteger("z", z);
+
+					if (world.isRemote)
+						player.addChatMessage(new ChatComponentText(
+								"Wire start"));
+				} else {
+					int x1 = stack.stackTagCompound.getInteger("x");
+					int y1 = stack.stackTagCompound.getInteger("y");
+					int z1 = stack.stackTagCompound.getInteger("z");
+
+					if (world.getTileEntity(x1, y1, z1) != null
+							&& world.getTileEntity(x1, y1, z1) instanceof TileEntityPylonRedWire && this.isLengthValid(x, y, z, x1, y1, z1, 25)) {
+
+						((TileEntityPylonRedWire) te).connected.add((TileEntityPylonRedWire) world.getTileEntity(x1, y1, z1));
+						((TileEntityPylonRedWire) world.getTileEntity(x1, y1, z1)).connected.add(((TileEntityPylonRedWire) te));
+
+						if (world.isRemote)
+							player.addChatMessage(
+									new ChatComponentText("Wire end"));
+
+						stack.stackTagCompound = null;
+					} else {
+						if (world.isRemote)
+							player.addChatMessage(new ChatComponentText(
+									"Wire error"));
+						stack.stackTagCompound = null;
+					}
+				}
+
+				player.swingItem();
+				return true;
+			}
+		}
+
 		return false;
-    }
+	}
+
+	@Override
+	public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
+		if (itemstack.stackTagCompound != null) {
+			list.add("Wire start x: " + itemstack.stackTagCompound.getInteger("x"));
+			list.add("Wire start y: " + itemstack.stackTagCompound.getInteger("y"));
+			list.add("Wire start z: " + itemstack.stackTagCompound.getInteger("z"));
+		} else {
+			list.add("Richt-click poles to connect");
+		}
+	}
+	
+	public boolean isLengthValid(int x1, int y1, int z1, int x2, int y2, int z2, int length) {
+		double l = Math.sqrt(Math.pow(x2 - x1, 2) + Math.pow(y2 - y1, 2) + Math.pow(z2 - z1, 2));
+		
+		return l <= length;
+	}

 }
--- a/com/hbm/items/weapon/GunDefabricator.java
+++ b/com/hbm/items/weapon/GunDefabricator.java
@ -0,0 +1,94 @@
+package com.hbm.items.weapon;
+
+import java.util.List;
+import java.util.Random;
+
+import com.google.common.collect.Multimap;
+import com.hbm.entity.projectile.EntityBullet;
+import com.hbm.items.ModItems;
+
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumAction;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraftforge.event.entity.player.ArrowNockEvent;
+
+public class GunDefabricator extends Item {
+
+	Random rand = new Random();
+
+    public GunDefabricator()
+    {
+        this.maxStackSize = 1;
+    }
+
+	@Override
+	public EnumAction getItemUseAction(ItemStack par1ItemStack) {
+		return EnumAction.bow;
+	}
+
+	public int getMaxItemUseDuration(ItemStack p_77626_1_) {
+		return 72000;
+	}
+
+	@Override
+	public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) {
+		ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_);
+		{
+			p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
+		}
+
+		return p_77659_1_;
+	}
+
+	public void onUsingTick(ItemStack stack, EntityPlayer player, int count)
+    {
+		World world = player.worldObj;
+
+		boolean flag = player.capabilities.isCreativeMode
+				|| EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0;
+		if ((player.capabilities.isCreativeMode || player.inventory.hasItem(ModItems.gun_defabricator_ammo))
+				&& count % 2 == 0) {
+			EntityBullet entitybullet = new EntityBullet(world, player, 3.0F, 40, 120, false, "tauDay");
+			entitybullet.setDamage(40 + rand.nextInt(120 - 40));
+
+			//world.playSoundAtEntity(player, "random.explode", 1.0F, 1.5F + (rand.nextFloat() / 4));
+			world.playSoundAtEntity(player, "hbm:weapon.defabShoot", 1.0F, 0.9F + (rand.nextFloat() * 0.2F));
+			if(count == this.getMaxItemUseDuration(stack))
+				world.playSoundAtEntity(player, "hbm:weapon.defabSpinup", 1.0F, 1.0F);
+
+			if(count % 20 == 0 && !flag)
+				player.inventory.consumeInventoryItem(ModItems.gun_defabricator_ammo);
+
+			if (!world.isRemote) {
+				world.spawnEntityInWorld(entitybullet);
+			}
+		}
+	}
+
+	@Override
+	public int getItemEnchantability() {
+		return 0;
+	}
+
+	@Override
+	public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
+
+		list.add("BAD WOLF");
+		list.add("");
+		list.add("Ammo: Defabricator Energy Cell");
+		list.add("Damage: 40 - 120");
+	}
+
+	public Multimap getItemAttributeModifiers() {
+		Multimap multimap = super.getItemAttributeModifiers();
+		multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(),
+				new AttributeModifier(field_111210_e, "Weapon modifier", (double) 6.5, 0));
+		return multimap;
+	}
+}
--- a/com/hbm/items/weapon/GunHP.java
+++ b/com/hbm/items/weapon/GunHP.java
@ -0,0 +1,122 @@
+package com.hbm.items.weapon;
+
+import java.util.List;
+import java.util.Random;
+
+import com.google.common.collect.Multimap;
+import com.hbm.entity.projectile.EntityBullet;
+import com.hbm.entity.projectile.EntityFire;
+import com.hbm.entity.projectile.EntityPlasmaBeam;
+import com.hbm.items.ModItems;
+import com.hbm.lib.Library;
+
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.EnumAction;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+import net.minecraftforge.event.entity.player.ArrowNockEvent;
+
+public class GunHP extends Item {
+
+	Random rand = new Random();
+
+	public GunHP() {
+		this.maxStackSize = 1;
+	}
+
+	@Override
+	public EnumAction getItemUseAction(ItemStack par1ItemStack) {
+		return EnumAction.bow;
+	}
+
+	public int getMaxItemUseDuration(ItemStack p_77626_1_) {
+		return 72000;
+	}
+
+	@Override
+	public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) {
+		ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_);
+		{
+			p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
+		}
+
+		return p_77659_1_;
+	}
+
+	public void onUsingTick(ItemStack stack, EntityPlayer player, int count) {
+		World world = player.worldObj;
+		
+		boolean flag = player.capabilities.isCreativeMode
+				|| EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0;
+		if ((player.capabilities.isCreativeMode || player.inventory.hasItem(ModItems.gun_hp_ammo))) {
+
+			EntityPlasmaBeam plasma = new EntityPlasmaBeam(world, player, 1F);
+			EntityPlasmaBeam plasma1 = new EntityPlasmaBeam(world, player, 1F);
+			EntityPlasmaBeam plasma2 = new EntityPlasmaBeam(world, player, 1F);
+			EntityPlasmaBeam plasma3 = new EntityPlasmaBeam(world, player, 1F);
+			EntityPlasmaBeam plasma4 = new EntityPlasmaBeam(world, player, 1F);
+			plasma1.motionX *= (0.75 + (rand.nextDouble() * 0.5));
+			plasma1.motionY *= (0.75 + (rand.nextDouble() * 0.5));
+			plasma1.motionZ *= (0.75 + (rand.nextDouble() * 0.5));
+			plasma2.motionX *= (0.75 + (rand.nextDouble() * 0.5));
+			plasma2.motionY *= (0.75 + (rand.nextDouble() * 0.5));
+			plasma2.motionZ *= (0.75 + (rand.nextDouble() * 0.5));
+			plasma3.motionX *= (0.75 + (rand.nextDouble() * 0.5));
+			plasma3.motionY *= (0.75 + (rand.nextDouble() * 0.5));
+			plasma3.motionZ *= (0.75 + (rand.nextDouble() * 0.5));
+			plasma4.motionX *= (0.75 + (rand.nextDouble() * 0.5));
+			plasma4.motionY *= (0.75 + (rand.nextDouble() * 0.5));
+			plasma4.motionZ *= (0.75 + (rand.nextDouble() * 0.5));
+
+			if (flag) {
+				plasma.canBePickedUp = 2;
+			} else {
+				if (count % 20 == 0)
+					player.inventory.consumeInventoryItem(ModItems.gun_hp_ammo);
+			}
+
+			if (count == this.getMaxItemUseDuration(stack))
+				world.playSoundAtEntity(player, "hbm:weapon.immolatorIgnite", 1.0F, 1F);
+			if (count % 10 == 0)
+				world.playSoundAtEntity(player, "hbm:weapon.immolatorShoot", 1.0F, 1F);
+
+			if (!world.isRemote) {
+				world.spawnEntityInWorld(plasma);
+				world.spawnEntityInWorld(plasma1);
+				world.spawnEntityInWorld(plasma2);
+				world.spawnEntityInWorld(plasma3);
+				world.spawnEntityInWorld(plasma4);
+			}
+		}
+	}
+
+	@Override
+	public int getItemEnchantability() {
+		return 0;
+	}
+
+	@Override
+	public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
+
+		list.add("Rrrrt - rrrrt - rrrrt, weeee!");
+		list.add("");
+		list.add("Ammo: Ink Cartridge");
+		list.add("Damage: 25 - 45");
+	}
+
+	public Multimap getItemAttributeModifiers() {
+		Multimap multimap = super.getItemAttributeModifiers();
+		multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(),
+				new AttributeModifier(field_111210_e, "Weapon modifier", (double) 4, 0));
+		return multimap;
+	}
+}
--- a/com/hbm/items/weapon/GunSpark.java
+++ b/com/hbm/items/weapon/GunSpark.java
@ -0,0 +1,142 @@
+package com.hbm.items.weapon;
+
+import java.util.List;
+import java.util.Random;
+
+import com.google.common.collect.Multimap;
+import com.hbm.entity.projectile.EntityBullet;
+import com.hbm.entity.projectile.EntityPlasmaBeam;
+import com.hbm.entity.projectile.EntitySparkBeam;
+import com.hbm.items.ModItems;
+
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumAction;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.player.ArrowLooseEvent;
+import net.minecraftforge.event.entity.player.ArrowNockEvent;
+
+public class GunSpark extends Item {
+	Random rand = new Random();
+	
+	public int dmgMin = 12;
+	public int dmgMax = 24;
+
+	public GunSpark() {
+		
+		this.maxStackSize = 1;
+	}
+
+	/**
+	 * called when the player releases the use item button. Args: itemstack,
+	 * world, entityplayer, itemInUseCount
+	 */
+	@Override
+	public void onPlayerStoppedUsing(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_) {
+		int j = this.getMaxItemUseDuration(p_77615_1_) - p_77615_4_;
+
+		ArrowLooseEvent event = new ArrowLooseEvent(p_77615_3_, p_77615_1_, j);
+		MinecraftForge.EVENT_BUS.post(event);
+		j = event.charge;
+
+		boolean flag = p_77615_3_.capabilities.isCreativeMode
+				|| EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, p_77615_1_) > 0;
+
+		if (flag || p_77615_3_.inventory.hasItem(ModItems.gun_spark_ammo)) {
+			float f = j / 20.0F;
+			f = (f * f + f * 2.0F) / 3.0F;
+
+			if (j < 10.0D) {
+				return;
+			}
+
+			if (j > 10.0F) {
+				f = 10.0F;
+			}
+
+			p_77615_1_.damageItem(1, p_77615_3_);
+
+			p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.sparkShoot", 1.0F, 1.0F);
+
+			if (flag) { } else {
+				p_77615_3_.inventory.consumeInventoryItem(ModItems.gun_spark_ammo);
+			}
+
+			EntitySparkBeam beam = new EntitySparkBeam(p_77615_2_, p_77615_3_, 3F);
+			beam.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin));
+				
+			if(!p_77615_2_.isRemote)
+				p_77615_2_.spawnEntityInWorld(beam);
+		}
+	}
+
+	@Override
+	public ItemStack onEaten(ItemStack p_77654_1_, World p_77654_2_, EntityPlayer p_77654_3_) {
+		return p_77654_1_;
+	}
+
+	/**
+	 * How long it takes to use or consume an item
+	 */
+	@Override
+	public int getMaxItemUseDuration(ItemStack p_77626_1_) {
+		return 72000;
+	}
+
+	/**
+	 * returns the action that specifies what animation to play when the items
+	 * is being used
+	 */
+	@Override
+	public EnumAction getItemUseAction(ItemStack p_77661_1_) {
+		return EnumAction.bow;
+	}
+
+	/**
+	 * Called whenever this item is equipped and the right mouse button is
+	 * pressed. Args: itemStack, world, entityPlayer
+	 */
+	@Override
+	public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) {
+		ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_);
+		MinecraftForge.EVENT_BUS.post(event);
+
+		if (p_77659_3_.capabilities.isCreativeMode || p_77659_3_.inventory.hasItem(ModItems.gun_jack_ammo)) {
+			p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
+		}
+
+		return p_77659_1_;
+	}
+
+	/**
+	 * Return the enchantability factor of the item, most of the time is based
+	 * on material.
+	 */
+	@Override
+	public int getItemEnchantability() {
+		return 1;
+	}
+
+	@Override
+	public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
+
+		list.add("'magic does not compute'");
+		list.add("'aeiou'");
+		list.add("");
+		list.add("Ammo: Electromagnetic Cartridge");
+		list.add("Projectiles explode on impact.");
+	}
+
+	public Multimap getItemAttributeModifiers() {
+		Multimap multimap = super.getItemAttributeModifiers();
+		multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(),
+				new AttributeModifier(field_111210_e, "Weapon modifier", (double) 4.5, 0));
+		return multimap;
+	}
+}
--- a/com/hbm/lib/HbmChestContents.java
+++ b/com/hbm/lib/HbmChestContents.java
@ -20,8 +20,8 @@ public class HbmChestContents {
 			new WeightedRandomChestContent(ModItems.ingot_titanium, 0, 7, 10, 4),
 			new WeightedRandomChestContent(ModItems.gun_revolver, 0, 1, 1, 1),
 			new WeightedRandomChestContent(ModItems.gun_revolver_ammo, 0, 2, 6, 2),
-			new WeightedRandomChestContent(ModItems.battery_generic, 50, 1, 1, 4),
-			new WeightedRandomChestContent(ModItems.battery_advanced, 200, 1, 1, 1),
+			new WeightedRandomChestContent(ModItems.battery_generic, 0, 1, 1, 4),
+			new WeightedRandomChestContent(ModItems.battery_advanced, 0, 1, 1, 1),
 			new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.block_titanium), 0, 0, 3, 1) };

 	private static WeightedRandomChestContent[] antenna = new WeightedRandomChestContent[] {
@ -32,8 +32,8 @@ public class HbmChestContents {
 			new WeightedRandomChestContent(ModItems.circuit_aluminium, 0, 1, 5, 3),
 			new WeightedRandomChestContent(ModItems.circuit_copper, 0, 1, 3, 2),
 			new WeightedRandomChestContent(ModItems.circuit_red_copper, 0, 1, 2, 1),
-			new WeightedRandomChestContent(ModItems.battery_generic, 50, 1, 1, 5),
-			new WeightedRandomChestContent(ModItems.battery_advanced, 200, 1, 1, 3),
+			new WeightedRandomChestContent(ModItems.battery_generic, 0, 1, 1, 5),
+			new WeightedRandomChestContent(ModItems.battery_advanced, 0, 1, 1, 3),
 			new WeightedRandomChestContent(ModItems.powder_iodine, 0, 1, 1, 1),
 			new WeightedRandomChestContent(ModItems.powder_bromine, 0, 1, 1, 1),
 			new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.block_titanium), 0, 1, 2, 2),
@ -61,8 +61,8 @@ public class HbmChestContents {
 			new WeightedRandomChestContent(ModItems.gun_xvl1456_ammo, 0, 16, 64, 2),
 			new WeightedRandomChestContent(ModItems.grenade_nuclear, 0, 1, 1, 2),
 			new WeightedRandomChestContent(ModItems.stealth_boy, 0, 1, 1, 2),
-			new WeightedRandomChestContent(ModItems.battery_advanced, 200, 1, 1, 3),
-			new WeightedRandomChestContent(ModItems.battery_schrabidium, 10000, 1, 1, 1),
+			new WeightedRandomChestContent(ModItems.battery_advanced, 0, 1, 1, 3),
+			new WeightedRandomChestContent(ModItems.battery_schrabidium, 0, 1, 1, 1),
 			new WeightedRandomChestContent(ModItems.syringe_awesome, 0, 1, 1, 1),
 			new WeightedRandomChestContent(ModItems.crate_caller, 0, 1, 1, 1),
 			new WeightedRandomChestContent(ModItems.fusion_core, 0, 1, 1, 4),
--- a/com/hbm/lib/Library.java
+++ b/com/hbm/lib/Library.java
@ -160,10 +160,6 @@ public class Library {
 		book5.add("Supply Drop Requester\nRight click to call in a supply drop, has five uses in survival mode.");
 		book5.add("Magazines\nRight click to retrieve ammo for a specific gun.");
 		book5.add("Syringes\nRight click to inject the syringe's content, hit somebody else to give them the effects.");
-		book5.add("");
-		book5.add("");
-		book5.add("");
-		book5.add("Coincidences are less likely than most people believe, don't you think? Look at things twice. Try imagining what the creators and inventors were thinking. All things happen for a reason, tough sometimes they are not as clear. \n\nPPPPPPP");
 	}
 	
 	public static boolean checkArmor(EntityPlayer player, Item helmet, Item plate, Item legs, Item boots) {
@ -283,7 +279,8 @@ public class Library {
 				world.getBlock(x, y, z) == ModBlocks.dummy_port_igenerator ||
 				world.getBlock(x, y, z) == ModBlocks.dummy_port_cyclotron ||
 				world.getBlock(x, y, z) == ModBlocks.dummy_port_well ||
-				world.getBlock(x, y, z) == ModBlocks.dummy_port_flare)
+				world.getBlock(x, y, z) == ModBlocks.dummy_port_flare ||
+				world.getBlock(x, y, z) == ModBlocks.dummy_port_drill)
 		{
 			return true;
 		}
@ -796,6 +793,22 @@ public class Library {
 		{
 			tileentity = worldObj.getTileEntity(x, y, z - 1);
 		}
+		if(block == ModBlocks.dummy_port_drill && worldObj.getBlock(x + 1, y, z) == ModBlocks.machine_drill)
+		{
+			tileentity = worldObj.getTileEntity(x + 1, y, z);
+		}
+		if(block == ModBlocks.dummy_port_drill && worldObj.getBlock(x - 1, y, z) == ModBlocks.machine_drill)
+		{
+			tileentity = worldObj.getTileEntity(x - 1, y, z);
+		}
+		if(block == ModBlocks.dummy_port_drill && worldObj.getBlock(x, y, z + 1) == ModBlocks.machine_drill)
+		{
+			tileentity = worldObj.getTileEntity(x, y, z + 1);
+		}
+		if(block == ModBlocks.dummy_port_drill && worldObj.getBlock(x, y, z - 1) == ModBlocks.machine_drill)
+		{
+			tileentity = worldObj.getTileEntity(x, y, z - 1);
+		}
 		
 		if(tileentity instanceof IConductor)
 		{
@ -858,13 +871,19 @@ public class Library {
 							if(((TileEntityPylonRedWire)tileentity).uoteab.get(i).ticked != newTact)
 							{
 								((TileEntityPylonRedWire)tileentity).uoteab.get(i).ticked = newTact;
-								//that.ffgeua(x, y + 1, z, that.getTact());
-								//that.ffgeua(x, y - 1, z, that.getTact());
-								//that.ffgeua(x - 1, y, z, that.getTact());
-								//that.ffgeua(x + 1, y, z, that.getTact());
-								//that.ffgeua(x, y, z - 1, that.getTact());
-								//that.ffgeua(x, y, z + 1, that.getTact());
-								//TODO: connections
+								for(int j = 0; j < ((TileEntityPylonRedWire)tileentity).connected.size(); j++) {
+									TileEntityPylonRedWire pylon = ((TileEntityPylonRedWire)tileentity).connected.get(j);
+									if(pylon != null) {
+										that.ffgeua(pylon.xCoord + 1, pylon.yCoord, pylon.zCoord, that.getTact());
+										that.ffgeua(pylon.xCoord - 1, pylon.yCoord, pylon.zCoord, that.getTact());
+										that.ffgeua(pylon.xCoord, pylon.yCoord + 1, pylon.zCoord, that.getTact());
+										that.ffgeua(pylon.xCoord, pylon.yCoord - 1, pylon.zCoord, that.getTact());
+										that.ffgeua(pylon.xCoord, pylon.yCoord, pylon.zCoord + 1, that.getTact());
+										that.ffgeua(pylon.xCoord, pylon.yCoord, pylon.zCoord - 1, that.getTact());
+										
+										that.ffgeua(pylon.xCoord, pylon.yCoord, pylon.zCoord, that.getTact());
+									}
+								}
 							}
 						}
 					}
--- a/com/hbm/lib/RefStrings.java
+++ b/com/hbm/lib/RefStrings.java
@ -3,7 +3,7 @@ package com.hbm.lib;
 public class RefStrings {
 	public static final String MODID = "hbm";
 	public static final String NAME = "Hbm's Nuclear Tech Mod";
-	public static final String VERSION = "1.0.25 BETA (Tennessine-Luna-X02)";
+	public static final String VERSION = "1.0.25";
 	//HBM's Beta Naming Convention:
 	//V T (X-Y-Z)
 	//V -> next release version
--- a/com/hbm/main/ClientProxy.java
+++ b/com/hbm/main/ClientProxy.java
@ -83,6 +83,7 @@ import com.hbm.entity.projectile.EntityRocket;
 import com.hbm.entity.projectile.EntityRubble;
 import com.hbm.entity.projectile.EntitySchrab;
 import com.hbm.entity.projectile.EntityShrapnel;
+import com.hbm.entity.projectile.EntitySparkBeam;
 import com.hbm.items.ModItems;
 import com.hbm.render.entity.BSmokeRenderer;
 import com.hbm.render.entity.DSmokeRenderer;
@ -94,6 +95,7 @@ import com.hbm.render.entity.RenderBaleflare;
 import com.hbm.render.entity.RenderBeam;
 import com.hbm.render.entity.RenderBeam2;
 import com.hbm.render.entity.RenderBeam3;
+import com.hbm.render.entity.RenderBeam4;
 import com.hbm.render.entity.RenderBigNuke;
 import com.hbm.render.entity.RenderBlackHole;
 import com.hbm.render.entity.RenderChopperMine;
@ -174,6 +176,7 @@ import com.hbm.render.tileentity.RenderGasDuct;
 import com.hbm.render.tileentity.RenderGasFlare;
 import com.hbm.render.tileentity.RenderIGenerator;
 import com.hbm.render.tileentity.RenderLaunchPadTier1;
+import com.hbm.render.tileentity.RenderMiningDrill;
 import com.hbm.render.tileentity.RenderNukeBoy;
 import com.hbm.render.tileentity.RenderNukeCustom;
 import com.hbm.render.tileentity.RenderNukeFleija;
@ -186,9 +189,11 @@ import com.hbm.render.tileentity.RenderOilDuct;
 import com.hbm.render.tileentity.RenderPoleSatelliteReceiver;
 import com.hbm.render.tileentity.RenderPoleTop;
 import com.hbm.render.tileentity.RenderPuF6Tank;
+import com.hbm.render.tileentity.RenderPylon;
 import com.hbm.render.tileentity.RenderRedBarrel;
 import com.hbm.render.tileentity.RenderRotationTester;
 import com.hbm.render.tileentity.RenderSteelPoles;
+import com.hbm.render.tileentity.RenderStructureMaker;
 import com.hbm.render.tileentity.RenderTapeRecorder;
 import com.hbm.render.tileentity.RenderTestBombAdvanced;
 import com.hbm.render.tileentity.RenderTestContainer;
@ -211,6 +216,7 @@ import com.hbm.tileentity.TileEntityDecoSteelPoles;
 import com.hbm.tileentity.TileEntityDecoTapeRecorder;
 import com.hbm.tileentity.TileEntityGasDuct;
 import com.hbm.tileentity.TileEntityMachineIGenerator;
+import com.hbm.tileentity.TileEntityMachineMiningDrill;
 import com.hbm.tileentity.TileEntityMachineOilWell;
 import com.hbm.tileentity.TileEntityLaunchPad;
 import com.hbm.tileentity.TileEntityMachineCentrifuge;
@ -228,8 +234,10 @@ import com.hbm.tileentity.TileEntityNukePrototype;
 import com.hbm.tileentity.TileEntityNukeTsar;
 import com.hbm.tileentity.TileEntityObjTester;
 import com.hbm.tileentity.TileEntityOilDuct;
+import com.hbm.tileentity.TileEntityPylonRedWire;
 import com.hbm.tileentity.TileEntityRedBarrel;
 import com.hbm.tileentity.TileEntityRotationTester;
+import com.hbm.tileentity.TileEntityStructureMarker;
 import com.hbm.tileentity.TileEntityTestBombAdvanced;
 import com.hbm.tileentity.TileEntityTestContainer;
 import com.hbm.tileentity.TileEntityTestRender;
@ -270,6 +278,7 @@ public class ClientProxy extends ServerProxy
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineCyclotron.class, new RenderCyclotron());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineOilWell.class, new RenderDerrick());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineGasFlare.class, new RenderGasFlare());
+		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineMiningDrill.class, new RenderMiningDrill());

 		//RenderingRegistry.registerEntityRenderingHandler(EntityRocket.class, new RenderRocket());
 		RenderingRegistry.registerEntityRenderingHandler(EntityRocket.class, new RenderSnowball(ModItems.man_core));
@ -381,6 +390,7 @@ public class ClientProxy extends ServerProxy
 		RenderingRegistry.registerEntityRenderingHandler(EntityPlasmaBeam.class, new RenderBeam());
 		RenderingRegistry.registerEntityRenderingHandler(EntityLaserBeam.class, new RenderBeam2());
 		RenderingRegistry.registerEntityRenderingHandler(EntityMinerBeam.class, new RenderBeam3());
+		RenderingRegistry.registerEntityRenderingHandler(EntitySparkBeam.class, new RenderBeam4());
 		RenderingRegistry.registerEntityRenderingHandler(EntityLN2.class, new RenderLN2(ModItems.energy_ball));

 		RenderingRegistry.registerEntityRenderingHandler(EntityMinecartTest.class, new RenderMinecartTest());
@ -396,6 +406,9 @@ public class ClientProxy extends ServerProxy
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityOilDuct.class, new RenderOilDuct());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityGasDuct.class, new RenderGasDuct());

+		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPylonRedWire.class, new RenderPylon());
+		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityStructureMarker.class, new RenderStructureMaker());
+
 	    RenderingRegistry.registerEntityRenderingHandler(EntityMissileGeneric.class, new RenderMissileGeneric());
 	    RenderingRegistry.registerEntityRenderingHandler(EntityMissileAntiBallistic.class, new RenderMissileGeneric());
 	    RenderingRegistry.registerEntityRenderingHandler(EntityMissileIncendiary.class, new RenderMissileGeneric());
--- a/com/hbm/main/CraftingManager.java
+++ b/com/hbm/main/CraftingManager.java
@ -46,7 +46,9 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ItemStack(ModItems.wire_advanced_alloy, 6), new Object[] { "CCC", 'S', Items.string, 'C', ModItems.ingot_advanced_alloy });
 		GameRegistry.addRecipe(new ItemStack(ModItems.wire_magnetized_tungsten, 6), new Object[] { "CCC", 'S', Items.string, 'C', ModItems.ingot_magnetized_tungsten });
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.hazmat_cloth, 4), new Object[] { "LN", "LN", 'L', Items.leather, 'N', "nuggetLead" }));
-		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.hazmat_cloth, 8), new Object[] { "SCS", "CPC", "SCS", 'S', Items.string, 'P', Items.leather, 'C', "dustLead" }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.hazmat_cloth, 4), new Object[] { "SCS", "CPC", "SCS", 'S', Items.string, 'P', Items.leather, 'C', "dustLead" }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.asbestos_cloth, 4), new Object[] { "SCS", "CPC", "SCS", 'S', Items.string, 'P', Blocks.wool, 'C', "dustNetherQuartz" }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.asbestos_cloth, 16), new Object[] { "SCS", "CPC", "SCS", 'S', Items.string, 'P', ModItems.powder_bromine, 'C', Blocks.wool }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.filter_coal, 1), new Object[] { "SCS", "CPC", "SCS", 'S', Items.string, 'P', Items.paper, 'C', "dustCoal" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.plate_mixed, 3), new Object[] { "ANA", "NCN", "ANA", 'A', ModItems.plate_advanced_alloy, 'N', "plateDenseLead", 'C', ModItems.plate_combine_steel }));
 		GameRegistry.addRecipe(new ItemStack(ModItems.bolt_dura_steel, 4), new Object[] { "D", "D", 'D', ModItems.ingot_dura_steel});
@ -56,6 +58,8 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.magnet_dee, 1), new Object[] { "SMM", "M M", "MMT", 'S', "ingotSteel", 'M', ModBlocks.fusion_conductor, 'T', ModItems.coil_advanced_torus }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.magnet_circular, 2), new Object[] { "PSP", "MMM", "PSP", 'S', "ingotSteel", 'M', ModBlocks.fusion_conductor, 'P', "plateAdvanced" }));
 		GameRegistry.addRecipe(new ItemStack(ModItems.cyclotron_tower, 1), new Object[] { "CDC", "CDC", "CDC", 'C', ModItems.magnet_circular, 'D', ModItems.magnet_dee });
+		
+		GameRegistry.addRecipe(new ItemStack(ModBlocks.marker_structure, 1), new Object[] { "L", "G", "R", 'L', ModItems.powder_lapis, 'G', Items.glowstone_dust, 'R', Blocks.redstone_torch });

 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_aluminium, 1), new Object[] { "RAR", "ASA", "RAR", 'S', "plateSteel", 'R', "dustRedstone", 'A', ModItems.wire_aluminium }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_copper, 1), new Object[] { "RAR", "ASA", "RAR", 'S', ModItems.circuit_aluminium, 'R', "dustNetherQuartz", 'A', ModItems.wire_copper }));
@ -188,6 +192,10 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ItemStack(ModItems.nugget_daffergon, 9), new Object[] { "#", '#', ModItems.ingot_daffergon });
 		GameRegistry.addRecipe(new ItemStack(ModItems.ingot_verticium, 1), new Object[] { "###", "###", "###", '#', ModItems.nugget_verticium });
 		GameRegistry.addRecipe(new ItemStack(ModItems.nugget_verticium, 9), new Object[] { "#", '#', ModItems.ingot_verticium });
+		GameRegistry.addRecipe(new ItemStack(ModItems.powder_lithium, 1), new Object[] { "###", "###", "###", '#', ModItems.powder_lithium_tiny });
+		GameRegistry.addRecipe(new ItemStack(ModItems.powder_lithium_tiny, 9), new Object[] { "#", '#', ModItems.powder_lithium });
+		GameRegistry.addRecipe(new ItemStack(ModItems.powder_cobalt, 1), new Object[] { "###", "###", "###", '#', ModItems.powder_cobalt_tiny });
+		GameRegistry.addRecipe(new ItemStack(ModItems.powder_cobalt_tiny, 9), new Object[] { "#", '#', ModItems.powder_cobalt });

 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.rod_empty, 16), new Object[] { "SSS", "L L", "SSS", 'S', "plateSteel", 'L', "plateLead" }));
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_uranium, 1), new Object[] { ModItems.rod_empty, ModItems.nugget_uranium, ModItems.nugget_uranium, ModItems.nugget_uranium, ModItems.nugget_uranium, ModItems.nugget_uranium, ModItems.nugget_uranium });
@ -457,6 +465,7 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_industrial_generator), 1), new Object[] { "PPP", "FGG", "WSS", 'P', ModItems.board_copper, 'F', ModItems.generator_front, 'G', ModItems.generator_steel, 'W', ModBlocks.red_wire_coated, 'S', ModItems.pedestal_steel });
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.red_wire_coated), 16), new Object[] { "WRW", "RIR", "WRW", 'W', "ingotTungsten", 'I', "ingotRedstoneAlloy", 'R', ModItems.wire_red_copper }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.red_cable), 16), new Object[] { "WRW", "RIR", "WRW", 'W', "plateSteel", 'I', "ingotRedstoneAlloy", 'R', ModItems.wire_red_copper }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.red_pylon), 4), new Object[] { "CWC", "PWP", " T ", 'C', ModItems.coil_copper_torus, 'W', "plankWood", 'P', "plateSteel", 'T', ModBlocks.red_wire_coated }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.oil_duct_solid), 16), new Object[] { "SPS", "P P", "SPS", 'S', "ingotSteel", 'P', "plateIron" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.oil_duct), 16), new Object[] { "SIS", "   ", "SIS", 'S', "plateSteel", 'I', "plateIron" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.gas_duct_solid), 16), new Object[] { "SPS", "P P", "SPS", 'S', "ingotSteel", 'P', "plateCopper" }));
@ -547,7 +556,8 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_hatch), 1), new Object[] { "SSS", "SFS", "SSS", 'S', ModBlocks.fwatz_scaffold, 'F', Blocks.furnace }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_computer), 1), new Object[] { "DTD", "TMT", "DTD", 'D', "dustDiamond", 'T', "dustMagnetizedTungsten", 'M', ModBlocks.block_meteor }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_core), 1), new Object[] { "CMC", "MAM", "CMC", 'C', ModItems.circuit_schrabidium, 'M', ModBlocks.fwatz_computer, 'A', ModBlocks.fwatz_conductor }));
-		
+
+		GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.asphalt), 8), new Object[] { "BGB", "GSG", "BGB", 'B', ModItems.canister_smear, 'G', Blocks.gravel, 'S', Blocks.sand });
 		GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_light), 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.fence, 'B', Blocks.brick_block });
 		GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_concrete), 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.stone });
 		GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_obsidian), 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.obsidian });
@ -632,6 +642,12 @@ public class CraftingManager {
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.gun_jack_ammo, 1), new Object[] { ModItems.gun_uboinik_ammo, ModItems.gun_uboinik_ammo, ModItems.gun_uboinik_ammo, ModItems.gun_uboinik_ammo });
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_euthanasia, 1), new Object[] { "TDT", "AAS", " T ", 'A', "ingotAustralium", 'T', ModItems.toothpicks, 'S', ModItems.gun_mp40, 'D', ModItems.ducttape }));
 		GameRegistry.addShapedRecipe(new ItemStack(ModItems.gun_euthanasia_ammo, 12), new Object[] { "P", "S", "N", 'P', ModItems.powder_poison, 'N', ModItems.niter, 'S', ModItems.syringe_metal_empty });
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_spark, 1), new Object[] { "TTD", "AAS", "  T", 'A', "ingotDaffergon", 'T', ModItems.toothpicks, 'S', ModItems.gun_rpg, 'D', ModItems.ducttape }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_spark_ammo, 4), new Object[] { "PCP", "DDD", "PCP", 'P', "plateLead", 'C', ModItems.coil_gold, 'D', ModItems.powder_power }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_hp, 1), new Object[] { "TDT", "ASA", " T ", 'A', "ingotReiium", 'T', ModItems.toothpicks, 'S', ModItems.gun_xvl1456, 'D', ModItems.ducttape }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_hp_ammo, 8), new Object[] { " R ", "BSK", " Y ", 'S', "plateSteel", 'K', new ItemStack(Items.dye, 1, 0), 'R', new ItemStack(Items.dye, 1, 1), 'B', new ItemStack(Items.dye, 1, 4), 'Y', new ItemStack(Items.dye, 1, 11) }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_defabricator, 1), new Object[] { " SS", "DDD", "TCB", 'S', "plateSteel", 'D', ModItems.plate_dalekanium, 'T', "plateTitanium", 'C', ModItems.circuit_gold, 'B', ModItems.battery_lithium }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_defabricator_ammo, 16), new Object[] { "PCP", "DDD", "PCP", 'P', "plateSteel", 'C', ModItems.coil_copper, 'D', "dustLithium" }));

 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.grenade_generic, 4), new Object[] { "RS ", "ITI", " I ", 'I', "plateIron", 'R', ModItems.wire_red_copper, 'S', "plateSteel", 'T', Item.getItemFromBlock(Blocks.tnt) }));
 		GameRegistry.addRecipe(new ItemStack(ModItems.grenade_strong, 2), new Object[] { " G ", "SGS", " S ", 'G', ModItems.grenade_generic, 'S', Items.gunpowder });
@ -840,6 +856,8 @@ public class CraftingManager {

 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.chainsaw, 1), new Object[] { "TTG", "SSM", 'T', "plateIron", 'S', "plateSteel", 'M', ModItems.motor, 'G', ModItems.circuit_gold }));

+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.wiring_red_copper, 1), new Object[] { "PPP", "PIP", "PPP", 'P', "plateSteel", 'I', "ingotSteel" }));
+
 		ItemStack multitool = new ItemStack(ModItems.multitool_dig, 1);
 		multitool.addEnchantment(Enchantment.looting, 3);
 		multitool.addEnchantment(Enchantment.fortune, 3);
@ -851,6 +869,10 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', ModItems.hazmat_cloth });
 		GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', ModItems.hazmat_cloth });
 		GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_boots, 1), new Object[] { "E E", "E E", 'E', ModItems.hazmat_cloth });
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.asbestos_helmet, 1), new Object[] { "EEE", "EIE", 'E', ModItems.asbestos_cloth, 'I', "plateGold" }));
+		GameRegistry.addRecipe(new ItemStack(ModItems.asbestos_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', ModItems.asbestos_cloth });
+		GameRegistry.addRecipe(new ItemStack(ModItems.asbestos_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', ModItems.asbestos_cloth });
+		GameRegistry.addRecipe(new ItemStack(ModItems.asbestos_boots, 1), new Object[] { "E E", "E E", 'E', ModItems.asbestos_cloth });
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.hazmat_paa_helmet, 1), new Object[] { "EEE", "IEI", "FPF", 'E', ModItems.plate_paa, 'I', "paneGlass", 'P', "plateSteel", 'F', ModItems.filter_coal }));
 		GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_paa_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', ModItems.plate_paa });
 		GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_paa_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', ModItems.plate_paa });
@ -901,10 +923,12 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.dye, 1, 4), new Object[] { "#", '#', "dustLapis" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.diamond, 1), new Object[] { "#", '#', "dustDiamond" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.emerald, 1), new Object[] { "#", '#', "dustEmerald" }));
-		if(MainRegistry.enableNITAN)
+		if(MainRegistry.enableNITAN) {
 			GameRegistry.addShapelessRecipe(new ItemStack(ModItems.canister_NITAN, 1), new Object[] { ModItems.canister_empty, ModItems.canister_napalm, ModItems.powder_neptunium, ModItems.powder_iodine, ModItems.powder_thorium, ModItems.powder_astatine, ModItems.powder_neodymium, ModItems.powder_caesium });
-		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.canister_NITAN, 1), new Object[] { ModItems.canister_empty, ModItems.canister_napalm, ModItems.powder_strontium, ModItems.powder_cobalt, ModItems.powder_bromine, ModItems.powder_tennessine, ModItems.powder_niobium, ModItems.powder_cerium });
-
+			GameRegistry.addShapelessRecipe(new ItemStack(ModItems.canister_NITAN, 1), new Object[] { ModItems.canister_empty, ModItems.canister_napalm, ModItems.powder_strontium, ModItems.powder_cobalt, ModItems.powder_bromine, ModItems.powder_tennessine, ModItems.powder_niobium, ModItems.powder_cerium });
+		}
+		GameRegistry.addRecipe(new ItemStack(ModItems.canister_petroil, 9), new Object[] { "RRR", "RLR", "RRR", 'R', ModItems.canister_reoil, 'L', ModItems.canister_canola });
+		
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.record_lc, 1), new Object[] { " S ", "SDS", " S ", 'S', "ingotSteel", 'D', "dustLapis" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.record_ss, 1), new Object[] { " S ", "SDS", " S ", 'S', "ingotSteel", 'D', "dustAdvanced" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.record_vc, 1), new Object[] { " S ", "SDS", " S ", 'S', "ingotSteel", 'D', "dustCMBSteel" }));
@ -941,7 +965,7 @@ public class CraftingManager {
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.crystal_horn, 1), new Object[] { ModItems.powder_neptunium, ModItems.powder_iodine, ModItems.powder_thorium, ModItems.powder_astatine, ModItems.powder_neodymium, ModItems.powder_caesium, ModBlocks.block_meteor, ModBlocks.gravel_obsidian, Items.water_bucket });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.crystal_charred, 1), new Object[] { ModItems.powder_strontium, ModItems.powder_cobalt, ModItems.powder_bromine, ModItems.powder_niobium, ModItems.powder_tennessine, ModItems.powder_cerium, ModBlocks.block_meteor, ModBlocks.block_aluminium, Items.water_bucket });
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.crystal_virus, 1), new Object[] { "STS", "THT", "STS", 'S', ModItems.cell_sas3, 'T', "dustTungsten", 'H', ModItems.crystal_horn }));
-		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.crystal_pulsar, 1), new Object[] { "STS", "THT", "STS", 'S', ModItems.cell_uf6, 'T', "dustAluminum", 'H', ModItems.crystal_charred }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.crystal_pulsar, 32), new Object[] { "STS", "THT", "STS", 'S', ModItems.cell_uf6, 'T', "dustAluminum", 'H', ModItems.crystal_charred }));
 	}
 	
 	public static void AddSmeltingRec()
@ -997,6 +1021,7 @@ public class CraftingManager {

 		GameRegistry.addSmelting(ModItems.combine_scrap, new ItemStack(ModItems.ingot_combine_steel), 1.0F);
 		GameRegistry.addSmelting(ModItems.tank_waste, new ItemStack(ModItems.tank_waste), 0.0F);
+		GameRegistry.addSmelting(ModItems.canister_smear, new ItemStack(ModItems.canister_reoil), 1.0F);
 		
 		GameRegistry.addSmelting(Items.bone, new ItemStack(Items.slime_ball, 3), 0.0F);
 		GameRegistry.addSmelting(new ItemStack(Items.dye, 1, 15), new ItemStack(Items.slime_ball, 1), 0.0F);
--- a/com/hbm/main/MainRegistry.java
+++ b/com/hbm/main/MainRegistry.java
@ -109,6 +109,7 @@ import com.hbm.entity.projectile.EntityRocket;
 import com.hbm.entity.projectile.EntityRubble;
 import com.hbm.entity.projectile.EntitySchrab;
 import com.hbm.entity.projectile.EntityShrapnel;
+import com.hbm.entity.projectile.EntitySparkBeam;
 import com.hbm.handler.FuelHandler;
 import com.hbm.handler.GUIHandler;
 import com.hbm.inventory.MachineRecipes;
@ -117,6 +118,7 @@ import com.hbm.items.ModItems;
 import com.hbm.lib.HbmWorld;
 import com.hbm.lib.Library;
 import com.hbm.lib.RefStrings;
+import com.hbm.packet.PacketDispatcher;
 import com.hbm.tileentity.TileEntityBombMulti;
 import com.hbm.tileentity.TileEntityCable;
 import com.hbm.tileentity.TileEntityConverterHeRf;
@ -137,6 +139,7 @@ import com.hbm.tileentity.TileEntityGasDuct;
 import com.hbm.tileentity.TileEntityGasDuctSolid;
 import com.hbm.tileentity.TileEntityHatch;
 import com.hbm.tileentity.TileEntityMachineIGenerator;
+import com.hbm.tileentity.TileEntityMachineMiningDrill;
 import com.hbm.tileentity.TileEntityMachineOilWell;
 import com.hbm.tileentity.TileEntityLaunchPad;
 import com.hbm.tileentity.TileEntityMachineBattery;
@ -174,6 +177,7 @@ import com.hbm.tileentity.TileEntityReactorMultiblock;
 import com.hbm.tileentity.TileEntityRedBarrel;
 import com.hbm.tileentity.TileEntityRotationTester;
 import com.hbm.tileentity.TileEntityRtgFurnace;
+import com.hbm.tileentity.TileEntityStructureMarker;
 import com.hbm.tileentity.TileEntityTestBombAdvanced;
 import com.hbm.tileentity.TileEntityTestContainer;
 import com.hbm.tileentity.TileEntityTestNuke;
@ -200,6 +204,9 @@ public class MainRegistry
 	@SidedProxy(clientSide = RefStrings.CLIENTSIDE, serverSide = RefStrings.SERVERSIDE)
 	public static ServerProxy proxy;
 	
+	//We'll get to that eventually
+	//public static PacketHandler packetHandler;
+	
 	@Metadata
 	public static ModMetadata meta;
 	
@ -246,7 +253,7 @@ public class MainRegistry
 	public static CreativeTabs tabNuke = new NukeTab(CreativeTabs.getNextID(), "tabNuke");
 	
 	//Achievements
-	public static Achievement achievementGetTitanium;
+	/*public static Achievement achievementGetTitanium;
 	public static Achievement achievementGetCopper;
 	public static Achievement achievementCraftAlloyFurnace;
 	public static Achievement achievementCraftElectricFurnace;
@ -284,7 +291,7 @@ public class MainRegistry
 	public static Achievement achievementGetAustalium;
 	public static Achievement achievementGetVerticium;
 	public static Achievement achievementGetUnobtainium;
-	public static Achievement achievementGetDaffergon;
+	public static Achievement achievementGetDaffergon;*/
 	
 	public static boolean enableDebugMode = true;
 	public static boolean enableMycelium = false;
@ -446,6 +453,8 @@ public class MainRegistry
 		GameRegistry.registerTileEntity(TileEntityGasDuctSolid.class, "tileentity_gas_duct_solid");
 		GameRegistry.registerTileEntity(TileEntityMachineRTG.class, "tileentity_machine_rtg");
 		GameRegistry.registerTileEntity(TileEntityPylonRedWire.class, "tileentity_pylon_redwire");
+		GameRegistry.registerTileEntity(TileEntityStructureMarker.class, "tileentity_structure_marker");
+		GameRegistry.registerTileEntity(TileEntityMachineMiningDrill.class, "tileentity_mining_drill");

 	    EntityRegistry.registerModEntity(EntityRocket.class, "entity_rocket", 0, this, 250, 1, true);
 	    EntityRegistry.registerModEntity(EntityNukeExplosion.class, "entity_nuke_explosion", 1, this, 250, 1, true);
@ -524,6 +533,7 @@ public class MainRegistry
 	    EntityRegistry.registerModEntity(EntityGasFX.class, "entity_spill_fx", 74, this, 1000, 1, true);
 	    EntityRegistry.registerModEntity(EntityGasFlameFX.class, "entity_gasflame_fx", 75, this, 1000, 1, true);
 	    EntityRegistry.registerModEntity(EntityMinecartTest.class, "entity_minecart_test", 76, this, 1000, 1, true);
+	    EntityRegistry.registerModEntity(EntitySparkBeam.class, "entity_spark_beam", 77, this, 1000, 1, true);
 	    
 	    EntityRegistry.registerGlobalEntityID(EntityNuclearCreeper.class, "entity_mob_nuclear_creeper", EntityRegistry.findGlobalUniqueEntityId(), 0x204131, 0x75CE00);
 	    EntityRegistry.registerGlobalEntityID(EntityHunterChopper.class, "entity_mob_hunter_chopper", EntityRegistry.findGlobalUniqueEntityId(), 0x000020, 0x2D2D72);
@ -533,7 +543,7 @@ public class MainRegistry
 	@EventHandler
 	public static void load(FMLInitializationEvent event)
 	{
-		achievementGetTitanium = new Achievement("achievement.getTitanium", "getTitanium", 0, -6, ModItems.ingot_titanium, (Achievement)null).initIndependentStat() .registerStat();
+		/*achievementGetTitanium = new Achievement("achievement.getTitanium", "getTitanium", 0, -6, ModItems.ingot_titanium, (Achievement)null).initIndependentStat() .registerStat();
 		achievementCraftAlloyFurnace = new Achievement("achievement.craftAlloyFurnace", "craftAlloyFurnace", -2, -4, Item.getItemFromBlock(ModBlocks.machine_difurnace_off), (Achievement)null).initIndependentStat() .registerStat();
 		achievementCraftBreedingReactor = new Achievement("achievement.craftBreedingReactor", "craftBreedingReactor", 2, -4, Item.getItemFromBlock(ModBlocks.machine_reactor), (Achievement)null).initIndependentStat() .registerStat();
 		achievementCraftCentrifuge = new Achievement("achievement.craftCentrifuge", "craftCentrifuge", 2, -2, Item.getItemFromBlock(ModBlocks.machine_centrifuge), achievementCraftBreedingReactor).initIndependentStat() .registerStat();
@ -542,7 +552,7 @@ public class MainRegistry
 				achievementCraftAlloyFurnace,
 				achievementCraftBreedingReactor,
 				achievementCraftCentrifuge
-		}));
+		}));*/
 		
 		OreDictionary.registerOre("ingotUranium", ModItems.ingot_uranium);
 		OreDictionary.registerOre("ingotUranium235", ModItems.ingot_u235);
@ -764,6 +774,8 @@ public class MainRegistry
 		recipes.overridePreSetRecipe(new ItemStack(Blocks.tnt), new ItemStack(Items.gunpowder, 5));
 		recipes.overridePreSetRecipe(new ItemStack(Items.wheat_seeds), new ItemStack(ModItems.oil_canola, 1));
 		recipes.overridePreSetRecipe(new ItemStack(Items.pumpkin_seeds), new ItemStack(ModItems.oil_canola, 2));
+		recipes.overridePreSetRecipe(new ItemStack(ModItems.powder_quartz), new ItemStack(ModItems.powder_lithium_tiny, 1));
+		recipes.overridePreSetRecipe(new ItemStack(ModItems.powder_lapis), new ItemStack(ModItems.powder_cobalt_tiny, 1));
 		
 		recipes.PrintRecipes();
 	}
@ -775,6 +787,7 @@ public class MainRegistry
 		MinecraftForge.EVENT_BUS.register(new ModEventHandler());
 		MinecraftForge.TERRAIN_GEN_BUS.register(new ModEventHandler());
 		MinecraftForge.ORE_GEN_BUS.register(new ModEventHandler());
+		PacketDispatcher.registerPackets();

 		Configuration config = new Configuration(event.getSuggestedConfigurationFile());
 		config.load();
--- a/com/hbm/main/ModEventHandler.java
+++ b/com/hbm/main/ModEventHandler.java
@ -24,7 +24,7 @@ public class ModEventHandler
        showMessage = !showMessage;
 	}
 	
-	@SubscribeEvent
+	/*@SubscribeEvent
 	public void itemSmelted(PlayerEvent.ItemSmeltedEvent e) {
 		if(e.smelting.getItem().equals(ModItems.ingot_titanium)) {
 			e.player.addStat(MainRegistry.achievementGetTitanium, 1);
@ -52,5 +52,5 @@ public class ModEventHandler
 		if(e.pickedUp.getEntityItem().equals(ModItems.nothing)) {
 			//e.player.addStat(MainRegistry.achievementGetAmblygonite, 1);
 		}
-	}
+	}*/
 }
--- a/com/hbm/packet/PacketDispatcher.java
+++ b/com/hbm/packet/PacketDispatcher.java
@ -0,0 +1,28 @@
+package com.hbm.packet;
+
+import com.hbm.lib.RefStrings;
+
+import cpw.mods.fml.common.network.NetworkRegistry;
+import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
+import cpw.mods.fml.relauncher.Side;
+
+public class PacketDispatcher {
+
+	//Mark 1 Packet Sending Device
+	public static final SimpleNetworkWrapper wrapper = NetworkRegistry.INSTANCE.newSimpleChannel(RefStrings.MODID);
+
+	public static final void registerPackets()
+	{
+		//Packet sent for every connected electricity pole, for wire rendering
+		wrapper.registerMessage(TEPylonSenderPacket.Handler.class, TEPylonSenderPacket.class, 0, Side.CLIENT);
+		//Resets connection list in client-sided pole rendering
+		wrapper.registerMessage(TEPylonDestructorPacket.Handler.class, TEPylonDestructorPacket.class, 1, Side.CLIENT);
+		//Flywheel rotation for industrial generator rendering
+		wrapper.registerMessage(TEIGeneratorPacket.Handler.class, TEIGeneratorPacket.class, 2, Side.CLIENT);
+		//Machine type for marker rendering
+		wrapper.registerMessage(TEStructurePacket.Handler.class, TEStructurePacket.class, 3, Side.CLIENT);
+		//Mingin drill rotation for rendering
+		wrapper.registerMessage(TEDrillPacket.Handler.class, TEDrillPacket.class, 4, Side.CLIENT);
+	}
+	
+}
--- a/Show More
+++ b/Show More