i scream

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

@@ -24,6 +24,8 @@ achievement.horizonsStart.desc=Sende einen netten Typen zum Mond.
 achievement.horizonsStart=Apogäum
 achievement.impossible.desc=Du kannst diese Errungenschaft nicht bekommen.
 achievement.impossible=Vollkommen unmöglich
+achievement.meltdown.desc=Du bist so weit gekommen, und jetzt verpfuscht du es?
+achievement.meltdown=Rapide Ungeplante Demontage
 achievement.metalworks.desc=Bobmazon Level 1 (Hochofen)
 achievement.metalworks=Metallurgie
 achievement.nuclear.desc=Bobmazon Level 5 (Urankernbrennstoff)
@@ -86,7 +88,7 @@ chem.NITAN=NITAN-Supertreibstoff mischen
 chem.OIL_SAND=Teersand-Extraktion
 chem.PEROXIDE=Wasserstoffperoxidherstellung
 chem.POLYMER=Polymersynthese
-chem.PUF6=Plutoniumhexafluoritproduktion
+chem.PUF6=Plutoniumhexafluoridproduktion
 chem.SAS3=Schrabidiumtrisulfatherstellung
 chem.SATURN=Saturnitherstellung
 chem.SF_BIOFUEL=Biodieselverfestigung
@@ -107,7 +109,7 @@ chem.SF_SMEAR=Industrieölverfestigung
 chem.SOLID_FUEL=Festbrennstoffherstellung
 chem.STEAM=Wasser kochen
 chem.TEST=Test
-chem.UF6=Uranhexafluoritproduktion
+chem.UF6=Uranhexafluoridproduktion
 chem.XENON=Lindeverfahren (Xenon)
 chem.YELLOWCAKE=Yellowcakeproduktion
 
@@ -161,6 +163,7 @@ container.machineTurbine=Dampfturbine
 container.machineTurbofan=Turbofan
 container.machine_deuterium=Deuteriumextraktor
 container.machine_schrabidium_transmutator=Schrabidium-Transmutationsgerät
+container.microwave=Mikrowelle
 container.miningDrill=Automatischer Minenbohrer
 container.miningLaser=Bergbaulaser
 container.missileAssembly=Raketenmontagestation
@@ -251,6 +254,7 @@ death.attack.tauBlast=%1$s lud die XVL1456 zu lange auf und wurde in Stücke ger
 death.attack.teleporter=%1$s wurde ins Nichts teleportiert.
 
 entity.entity_cyber_crab.name=Cyber-Krabbe
+entity.entity_elder_one.name=Quackos der Älteste
 entity.entity_fucc_a_ducc.name=Ente
 entity.entity_mob_hunter_chopper.name=Jagdschrauber
 entity.entity_mob_mask_man.name=Maskenmann
@@ -668,10 +672,10 @@ item.cell_anti_schrabidium.name=Antischrabidiumzelle
 item.cell_antimatter.name=Antimaterienzelle
 item.cell_deuterium.name=Deuteriumzelle
 item.cell_empty.name=Leere Zelle
-item.cell_puf6.name=Plutoniumhexafluorit-Zelle
+item.cell_puf6.name=Plutoniumhexafluorid-Zelle
 item.cell_sas3.name=Schrabidiumtrisulfat-Zelle
 item.cell_tritium.name=Tritiumzelle
-item.cell_uf6.name=Uranhexafluorit-Zelle
+item.cell_uf6.name=Uranhexafluorid-Zelle
 item.centri_stick.name=Zentrifuge am Spieß
 item.centrifuge_element.name=Zentrifugenelement
 item.centrifuge_tower.name=Zentrifugenturm
@@ -1055,6 +1059,7 @@ item.gun_spark_ammo.name=Elektromagnetische Katusche
 item.gun_stinger.name=FIM-92 Stinger
 item.gun_stinger_ammo.name=Stinger-Rakete
 item.gun_super_shotgun.name=Super Shotgun
+item.gun_thompson.name=Thompson Maschinenpistole
 item.gun_uboinik.name=Ubojnik
 item.gun_uboinik_ammo.name=12x70 Schrotmunition (LEGACY)
 item.gun_uzi.name=IMI Uzi
@@ -1472,6 +1477,8 @@ item.piston_selenium.name=Sternmotorenkolben
 item.plan_c.name=Plan C
 item.plate_advanced_alloy.name=Fortgeschrittene Legierungsplatte
 item.plate_aluminium.name=Aluminiumplatte
+item.plate_armor_lunar.name=Lunare Panzerplatte
+item.plate_armor_titanium.name=Titanium-Panzerplatte
 item.plate_combine_steel.name=CMB-Stahlplatte
 item.plate_copper.name=Kupferplatte
 item.plate_dalekanium.name=Wütendes Metall
@@ -1553,6 +1560,7 @@ item.powder_schrabidium.name=Schrabidiumstaub
 item.powder_semtex_mix.name=Semtexmischung
 item.powder_spark_mix.name=Sparkmischung
 item.powder_steel.name=Stahlstaub
+item.powder_steel_tiny.name=Kleiner Haufen Stahlstaub
 item.powder_strontium.name=Strontiumstaub
 item.powder_tennessine.name=Tennessinstaub
 item.powder_thermite.name=Thermit
@@ -1587,6 +1595,7 @@ item.redstone_sword.name=Redstoneschwert
 item.reer_graar.name=The Reer Graar
 item.remote.name=Kaputte Fernbedienung
 item.ring_pull.name=Dosenring
+item.ring_starmetal.name=§9Sternenmetallring§r
 item.rocket_fuel.name=Festbrennstoff (Raketentreibstoff)
 item.rod_australium.name=Australiumbrennstab
 item.rod_balefire.name=Balefire-Brennstab
@@ -1756,6 +1765,7 @@ item.solinium_kit.name=Solinium Kit
 item.solinium_propellant.name=SOL-Verdichtungsladung
 item.sopsign.name=Sopschild-Streitaxt
 item.sphere_steel.name=Stahlhohlkugel
+item.spongebob_macaroni.name=Spongebob Macaroni
 item.stamp_357.name=.357 Magnum-Stempel
 item.stamp_44.name=.44 Magnum-Stempel
 item.stamp_50.name=Großkaliberstempel
@@ -2002,6 +2012,14 @@ tile.block_aluminium.name=Aluminiumblock
 tile.block_asbestos.name=Asbestblock
 tile.block_australium.name=Australiumblock
 tile.block_beryllium.name=Berylliumblock
+tile.block_cap_fritz.name=Fritz-Kola Kronkorkenblock
+tile.block_cap_korl.name=Korl Kronkorkenblock
+tile.block_cap_nuka.name=Nuka Kronkorkenblock
+tile.block_cap_quantum.name=Nuka Cola Quantum Kronkorkenblock
+tile.block_cap_rad.name=S~Cola RAD Kronkorkenblock
+tile.block_cap_sparkle.name=S~Cola Kronkorkenblock
+tile.block_cap_star.name=Sunset Sarsaparilla Kronkorkenblock
+tile.block_cap_sunset.name=Sunset Sarsaparilla Sternkronkorkenblock
 tile.block_cobalt.name=Kobaltblock
 tile.block_combine_steel.name=CMB-Stahlblock
 tile.block_copper.name=Kupferblock
@@ -2214,6 +2232,7 @@ tile.machine_industrial_generator.name=Industrieller Generator
 tile.machine_keyforge.name=Schlossertisch
 tile.machine_large_turbine.name=Industrielle Dampfturbine
 tile.machine_lithium_battery.name=Li-Ion-Energiespeicherblock
+tile.machine_microwave.name=Mikrowelle
 tile.machine_mining_laser.name=Bergbaulaser
 tile.machine_minirtg.name=Radioisotopenzelle
 tile.machine_missile_assembly.name=Raketenmontagestation
@@ -2221,7 +2240,7 @@ tile.machine_nuke_furnace_off.name=Atombetriebener Ofen
 tile.machine_nuke_furnace_on.name=Atombetriebener Ofen
 tile.machine_powerrtg.name=PT-Isotopenzelle
 tile.machine_press.name=Befeuerte Presse
-tile.machine_puf6_tank.name=Plutoniumhexafluorit-Tank
+tile.machine_puf6_tank.name=Plutoniumhexafluorid-Tank
 tile.machine_pumpjack.name=Pferdekopfpumpe
 tile.machine_radar.name=Radar
 tile.machine_radgen.name=Strahlenbetriebener Generator
@@ -2256,7 +2275,7 @@ tile.machine_transformer_dnt.name=DNT-20Hz-Transformator
 tile.machine_transformer_dnt_20.name=DNT-1Hz-Transformator
 tile.machine_turbine.name=Dampfturbine
 tile.machine_turbofan.name=Turbofan
-tile.machine_uf6_tank.name=Uranhexafluorit-Tank
+tile.machine_uf6_tank.name=Uranhexafluorid-Tank
 tile.machine_waste_drum.name=Abklingbecken-Trommel
 tile.machine_well.name=Ölbohrturm
 tile.marker_structure.name=Multiblock-Strukturvorlage
@@ -2463,6 +2482,9 @@ tool.ability.shredder=Auto-Brecher
 tool.ability.silktouch=Behutsamkeit
 tool.ability.smelter=Auto-Ofen
 
+weapon.ability.beheader=Köpfer
+weapon.ability.chainsaw=Skelettensäge
+# Should rhyme with the translation for "chainsaw"
 weapon.ability.radiation=Radioaktive Schneide
 weapon.ability.phosphorus=Phosphorspitze
 weapon.ability.stun=Betäubend

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

@@ -24,6 +24,8 @@ achievement.horizonsStart.desc=Send a lad to the moon.
 achievement.horizonsStart=Apogee
 achievement.impossible.desc=You can't get this achievement.
 achievement.impossible=Literally impossible
+achievement.meltdown.desc=You got this far, how could you mess this up?
+achievement.meltdown=Rapid Unscheduled Disassembly
 achievement.metalworks.desc=Bobmazon Level 1 (Blast Furnace)
 achievement.metalworks=Metalworks
 achievement.nuclear.desc=Bobmazon Level 5 (Uranium Fuel)
@@ -161,6 +163,7 @@ container.machineTurbine=Steam Turbine
 container.machineTurbofan=Turbofan
 container.machine_deuterium=Deuterium Extractor
 container.machine_schrabidium_transmutator=Schrabidium Transmutation Device
+container.microwave=Microwave
 container.miningDrill=Automatic Mining Drill
 container.miningLaser=Mining Laser
 container.missileAssembly=Missile Assembly Station
@@ -251,6 +254,7 @@ death.attack.tauBlast=%1$s charged the XVL1456 for too long and was blown into p
 death.attack.teleporter=%1$s was teleported into nothingness.
 
 entity.entity_cyber_crab.name=Cyber Crab
+entity.entity_elder_one.name=Quackos The Elder One
 entity.entity_fucc_a_ducc.name=Duck
 entity.entity_mob_hunter_chopper.name=Hunter Chopper
 entity.entity_mob_mask_man.name=Mask Man
@@ -668,10 +672,10 @@ item.cell_anti_schrabidium.name=Antischrabidium Cell
 item.cell_antimatter.name=Antimatter Cell
 item.cell_deuterium.name=Deuterium Cell
 item.cell_empty.name=Empty Cell
-item.cell_puf6.name=Plutonium Hexafluorite Cell
+item.cell_puf6.name=Plutonium Hexafluoride Cell
 item.cell_sas3.name=Schrabidium Trisulfide Cell
 item.cell_tritium.name=Tritium Cell
-item.cell_uf6.name=Uranium Hexafluorite Cell
+item.cell_uf6.name=Uranium Hexafluoride Cell
 item.centri_stick.name=Centrifuge on a Stick
 item.centrifuge_element.name=Centrifuge Element
 item.centrifuge_tower.name=Centrifuge Tower
@@ -1055,6 +1059,7 @@ item.gun_spark_ammo.name=Electromagnetic Cartridge
 item.gun_stinger.name=FIM-92 Stinger
 item.gun_stinger_ammo.name=Stinger Rocket
 item.gun_super_shotgun.name=Super Shotgun
+item.gun_thompson.name=Thompson Submachine Gun
 item.gun_uboinik.name=Uboinik
 item.gun_uboinik_ammo.name=12x70 Buckshot (LEGACY)
 item.gun_uzi.name=IMI Uzi
@@ -1472,6 +1477,8 @@ item.piston_selenium.name=Radial Engine Piston
 item.plan_c.name=Plan C
 item.plate_advanced_alloy.name=Advanced Alloy Plate
 item.plate_aluminium.name=Aluminium Plate
+item.plate_armor_lunar.name=Lunar Plating
+item.plate_armor_titanium.name=Titanium Armor Plate
 item.plate_combine_steel.name=CMB Steel Plate
 item.plate_copper.name=Copper Plate
 item.plate_dalekanium.name=Angry Metal
@@ -1553,6 +1560,7 @@ item.powder_schrabidium.name=Schrabidium Powder
 item.powder_semtex_mix.name=Semtex Blend
 item.powder_spark_mix.name=Spark Blend
 item.powder_steel.name=Steel Powder
+item.powder_steel_tiny.name=Tiny Pile of Steel Powder
 item.powder_strontium.name=Strontium Powder
 item.powder_tennessine.name=Tennessine Powder
 item.powder_thermite.name=Thermite
@@ -1587,6 +1595,7 @@ item.redstone_sword.name=Redstone Sword
 item.reer_graar.name=The Reer Graar
 item.remote.name=Broken Remote
 item.ring_pull.name=Ring Pull
+item.ring_starmetal.name=§9Starmetal Ring§r
 item.rocket_fuel.name=Solid Fuel (Rocket Propellant)
 item.rod_australium.name=Australium Rod
 item.rod_balefire.name=Balefire Rod
@@ -1756,6 +1765,7 @@ item.solinium_kit.name=Solinium Kit
 item.solinium_propellant.name=SOL Compression Charge
 item.sopsign.name=Sop Sign Battle Axe
 item.sphere_steel.name=Steel Sphere
+item.spongebob_macaroni.name=Spongebob Macaroni
 item.stamp_357.name=.357 Magnum Stamp
 item.stamp_44.name=.44 Magnum Stamp
 item.stamp_50.name=Large Caliber Stamp
@@ -2002,6 +2012,14 @@ tile.block_aluminium.name=Block of Aluminium
 tile.block_asbestos.name=Block of Asbestos
 tile.block_australium.name=Block of Australium
 tile.block_beryllium.name=Block of Beryllium
+tile.block_cap_fritz.name=Block of Fritz Cola Bottle Caps
+tile.block_cap_korl.name=Block of Korl Bottle Caps
+tile.block_cap_nuka.name=Block of Nuka Cola Bottle Caps
+tile.block_cap_quantum.name=Block of Nuka Cola Quantum Bottle Caps
+tile.block_cap_rad.name=Block of S~Cola RAD Bottle Caps
+tile.block_cap_sparkle.name=Block of S~Cola Bottle Caps
+tile.block_cap_star.name=Block of Sunset Sarsaparilla Star Caps
+tile.block_cap_sunset.name=Block of Sunset Sarsaparilla Bottle Caps
 tile.block_cobalt.name=Block of Cobalt
 tile.block_combine_steel.name=Block of CMB Steel
 tile.block_copper.name=Block of Copper
@@ -2214,6 +2232,7 @@ tile.machine_industrial_generator.name=Industrial Generator
 tile.machine_keyforge.name=Locksmith Table
 tile.machine_large_turbine.name=Industrial Steam Turbine
 tile.machine_lithium_battery.name=Li-Ion Energy Storage Block
+tile.machine_microwave.name=Microwave
 tile.machine_mining_laser.name=Mining Laser
 tile.machine_minirtg.name=Radio Isotope Cell
 tile.machine_missile_assembly.name=Missile Assembly Station
@@ -2463,6 +2482,9 @@ tool.ability.shredder=Auto-Shredder
 tool.ability.silktouch=Silk Touch
 tool.ability.smelter=Auto-Smelter
 
+weapon.ability.beheader=Decapitator
+weapon.ability.chainsaw=Painsaw
+# Should rhyme with the translation for "chainsaw"
 weapon.ability.radiation=Radioactive Blade
 weapon.ability.phosphorus=Phosphorus Tip
 weapon.ability.stun=Stunning

src/main/java/assets/hbm/models/fluidtank_label.obj

@@ -1,38 +0,0 @@
-# Blender v2.76 (sub 0) OBJ File: 'fluidtank_label.blend'
-# www.blender.org
-o Cube.001_Cube.000
-v -1.260000 1.750000 0.875000
-v -1.260000 1.750000 -1.000000
-v -1.260000 1.750000 1.000000
-v -1.164849 2.228354 -1.000000
-v -1.164849 2.228355 1.000000
-v -1.260000 1.750000 -0.875000
-v 1.260000 1.750000 0.875000
-v 1.164849 2.228354 -1.000000
-v 1.164849 2.228354 1.000000
-v 1.260000 1.750000 -1.000000
-v 1.260000 1.750000 1.000000
-v 1.260000 1.750000 -0.875000
-vt 0.000697 0.000139
-vt 0.937966 0.487721
-vt 0.071437 0.487780
-vt 0.935055 0.505640
-vt 0.997387 0.992019
-vt 0.062467 0.505674
-vt 0.000139 0.487453
-vt 0.999693 -0.000208
-vt 0.999861 0.487717
-vt 0.000139 0.505676
-vt 0.000144 0.992057
-vt 0.997383 0.505637
-vn -0.980800 0.195100 0.000000
-vn 0.980800 0.195100 0.000000
-s off
-f 5/1/1 6/2/1 1/3/1
-f 12/4/2 8/5/2 7/6/2
-f 1/3/1 3/7/1 5/1/1
-f 5/1/1 4/8/1 6/2/1
-f 2/9/1 6/2/1 4/8/1
-f 11/10/2 7/6/2 9/11/2
-f 12/4/2 10/12/2 8/5/2
-f 8/5/2 9/11/2 7/6/2

src/main/java/assets/hbm/sounds.json

@@ -136,6 +136,7 @@
     "weapon.fstbmbPing": {"category": "player", "sounds": [{"name": "weapon/fstbmbPing", "stream": false}]},
     "weapon.sauergun": {"category": "player", "sounds": ["weapon/sauergun1", "weapon/sauergun2", "weapon/sauergun3"]},
     "weapon.whack": {"category": "player", "sounds": [{"name": "weapon/whack", "stream": false}]},
+    "weapon.chainsaw": {"category": "player", "sounds": [{"name": "weapon/chainsaw", "stream": false}]},
 
     "weapon.reloadTurret": {"category": "player", "sounds": [{"name": "weapon/reloadTurret", "stream": false}]},
     "weapon.switchmode1": {"category": "player", "sounds": [{"name": "weapon/switchmode1", "stream": false}]},
@@ -159,6 +160,7 @@
 	"entity.cybercrab": {"category": "hostile", "sounds": ["entity/radio_random1", "entity/radio_random2", "entity/radio_random3", "entity/radio_random4", "entity/radio_random5", "entity/radio_random6", "entity/radio_random7", "entity/radio_random8", "entity/radio_random9", "entity/radio_random10", "entity/radio_random11", "entity/radio_random12", "entity/radio_random13", "entity/radio_random14", "entity/radio_random15"]},
     "entity.ducc": {"category": "neutral", "sounds": ["entity/ducc1", "entity/ducc2"]},
     "entity.slicer": {"category": "neutral", "sounds": ["entity/slicer1", "entity/slicer2", "entity/slicer3", "entity/slicer4"]},
+    "entity.megaquacc": {"category": "hostile", "sounds": [{"name": "entity/megaquacc", "stream": false}]},
     
     "step.metal": {"category": "player", "sounds": [{"name": "footsteps/metal", "stream": false}]},
     "step.iron_jump": {"category": "player", "sounds": [{"name": "footsteps/iron_jump", "stream": false}]},

src/main/java/com/hbm/blocks/ModBlocks.java

@@ -976,14 +976,14 @@ public class ModBlocks {
 		block_daffergon = new BlockGeneric(Material.iron).setBlockName("block_daffergon").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_daffergon");
 		block_verticium = new BlockGeneric(Material.iron).setBlockName("block_verticium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_verticium");
 
-		block_cap_nuka = new BlockPillar(Material.iron, RefStrings.MODID + ":block_cap_nuka_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_nuka").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_nuka");
+		block_cap_nuka = new BlockCap(Material.iron, RefStrings.MODID + ":block_cap_nuka_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_nuka").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_nuka");
-		block_cap_quantum = new BlockPillar(Material.iron, RefStrings.MODID + ":block_cap_quantum_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_quantum").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_quantum");
+		block_cap_quantum = new BlockCap(Material.iron, RefStrings.MODID + ":block_cap_quantum_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_quantum").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_quantum");
-		block_cap_rad = new BlockPillar(Material.iron, RefStrings.MODID + ":block_cap_rad_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_rad").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_rad");
+		block_cap_rad = new BlockCap(Material.iron, RefStrings.MODID + ":block_cap_rad_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_rad").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_rad");
-		block_cap_sparkle = new BlockPillar(Material.iron, RefStrings.MODID + ":block_cap_sparkle_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_sparkle").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_sparkle");
+		block_cap_sparkle = new BlockCap(Material.iron, RefStrings.MODID + ":block_cap_sparkle_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_sparkle").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_sparkle");
-		block_cap_korl = new BlockPillar(Material.iron, RefStrings.MODID + ":block_cap_korl_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_korl").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_korl");
+		block_cap_korl = new BlockCap(Material.iron, RefStrings.MODID + ":block_cap_korl_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_korl").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_korl");
-		block_cap_fritz = new BlockPillar(Material.iron, RefStrings.MODID + ":block_cap_fritz_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_fritz").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_fritz");
+		block_cap_fritz = new BlockCap(Material.iron, RefStrings.MODID + ":block_cap_fritz_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_fritz").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_fritz");
-		block_cap_sunset = new BlockPillar(Material.iron, RefStrings.MODID + ":block_cap_sunset_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_sunset").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_sunset");
+		block_cap_sunset = new BlockCap(Material.iron, RefStrings.MODID + ":block_cap_sunset_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_sunset").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_sunset");
-		block_cap_star = new BlockPillar(Material.iron, RefStrings.MODID + ":block_cap_star_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_star").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_star");
+		block_cap_star = new BlockCap(Material.iron, RefStrings.MODID + ":block_cap_star_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_star").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_star");
 		
 		deco_titanium = new BlockOre(Material.iron).setBlockName("deco_titanium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_titanium");
 		deco_red_copper = new BlockOre(Material.iron).setBlockName("deco_red_copper").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_red_copper");
@@ -1175,7 +1175,7 @@ public class ModBlocks {
 		machine_electric_furnace_on = new MachineElectricFurnace(true).setBlockName("machine_electric_furnace_on").setHardness(5.0F).setLightLevel(1.0F).setResistance(10.0F);
 		machine_arc_furnace_off = new MachineArcFurnace(false).setBlockName("machine_arc_furnace_off").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
 		machine_arc_furnace_on = new MachineArcFurnace(true).setBlockName("machine_arc_furnace_on").setHardness(5.0F).setLightLevel(1.0F).setResistance(10.0F);
-		machine_microwave = new MachineMicrowave(Material.iron).setBlockName("machine_microwave").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
+		machine_microwave = new MachineMicrowave(Material.iron).setBlockName("machine_microwave").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_microwave");
 
 		//machine_deuterium = new MachineDeuterium(Material.iron).setBlockName("machine_deuterium").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
 
@@ -1816,7 +1816,7 @@ public class ModBlocks {
 		GameRegistry.registerBlock(turret_flamer, turret_flamer.getUnlocalizedName());
 		GameRegistry.registerBlock(turret_tau, turret_tau.getUnlocalizedName());
 		GameRegistry.registerBlock(turret_spitfire, turret_spitfire.getUnlocalizedName());
-		GameRegistry.registerBlock(turret_cwis, turret_cwis.getUnlocalizedName());
+		GameRegistry.registerBlock(turret_cwis, ItemBlockLore.class, turret_cwis.getUnlocalizedName());
 		GameRegistry.registerBlock(turret_cheapo, turret_cheapo.getUnlocalizedName());
 		
 		//Mines

src/main/java/com/hbm/blocks/generic/BlockCap.java

@@ -0,0 +1,45 @@
+package com.hbm.blocks.generic;
+
+import java.util.Random;
+
+import com.hbm.blocks.ModBlocks;
+import com.hbm.blocks.machine.BlockPillar;
+import com.hbm.items.ModItems;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.item.Item;
+
+public class BlockCap extends BlockPillar {
+
+	public BlockCap(Material mat, String tex) {
+		super(mat, tex);
+	}
+
+	@Override
+	public Item getItemDropped(int i, Random rand, int j) {
+
+		if(this == ModBlocks.block_cap_nuka)
+			return ModItems.cap_nuka;
+		if(this == ModBlocks.block_cap_quantum)
+			return ModItems.cap_quantum;
+		if(this == ModBlocks.block_cap_sparkle)
+			return ModItems.cap_sparkle;
+		if(this == ModBlocks.block_cap_rad)
+			return ModItems.cap_rad;
+		if(this == ModBlocks.block_cap_korl)
+			return ModItems.cap_korl;
+		if(this == ModBlocks.block_cap_fritz)
+			return ModItems.cap_fritz;
+		if(this == ModBlocks.block_cap_sunset)
+			return ModItems.cap_sunset;
+		if(this == ModBlocks.block_cap_star)
+			return ModItems.cap_star;
+		
+		return null;
+    }
+    
+    @Override
+	public int quantityDropped(Random rand) {
+    	return 128;
+    }
+}

src/main/java/com/hbm/blocks/generic/BlockCrate.java

@@ -67,32 +67,14 @@ public class BlockCrate extends BlockFalling {
     	BlockCrate.addToListWithWeight(crateList, ModItems.clip_revolver, 7);
     	BlockCrate.addToListWithWeight(crateList, ModItems.clip_revolver_gold, 4);
     	BlockCrate.addToListWithWeight(crateList, ModItems.clip_revolver_lead, 6);
-    	//BlockCrate.addToListWithWeight(crateList, ModItems.clip_revolver_schrabidium, 1);
     	BlockCrate.addToListWithWeight(crateList, ModItems.clip_revolver_cursed, 5);
-    	//BlockCrate.addToListWithWeight(crateList, ModItems.clip_revolver_nightmare, 3);
-    	//BlockCrate.addToListWithWeight(crateList, ModItems.clip_revolver_nightmare2, 2);
     	BlockCrate.addToListWithWeight(crateList, ModItems.clip_rpg, 5);
     	BlockCrate.addToListWithWeight(crateList, ModItems.clip_fatman, 1);
-    	//BlockCrate.addToListWithWeight(crateList, ModItems.clip_mirv, 2);
-    	//BlockCrate.addToListWithWeight(crateList, ModItems.clip_bf, 1);
     	BlockCrate.addToListWithWeight(crateList, ModItems.clip_mp40, 7);
     	BlockCrate.addToListWithWeight(crateList, ModItems.clip_uzi, 7);
     	BlockCrate.addToListWithWeight(crateList, ModItems.clip_uboinik, 7);
     	BlockCrate.addToListWithWeight(crateList, ModItems.clip_lever_action, 5);
     	BlockCrate.addToListWithWeight(crateList, ModItems.clip_bolt_action, 5);
-    	//BlockCrate.addToListWithWeight(crateList, ModItems.clip_osipr, 7);
-    	//BlockCrate.addToListWithWeight(crateList, ModItems.clip_immolator, 4);
-    	//BlockCrate.addToListWithWeight(crateList, ModItems.clip_cryolator, 4);
-    	//BlockCrate.addToListWithWeight(crateList, ModItems.clip_mp, 3);
-    	//BlockCrate.addToListWithWeight(crateList, ModItems.clip_xvl1456, 5);
-    	//BlockCrate.addToListWithWeight(crateList, ModItems.clip_emp, 3);
-    	//BlockCrate.addToListWithWeight(crateList, ModItems.clip_defabricator, 3);
-    	//BlockCrate.addToListWithWeight(crateList, ModItems.clip_euthanasia, 2);
-    	//BlockCrate.addToListWithWeight(crateList, ModItems.clip_hp, 2);
-    	//BlockCrate.addToListWithWeight(crateList, ModItems.clip_jack, 2);
-    	//BlockCrate.addToListWithWeight(crateList, ModItems.clip_revolver_pip, 3);
-    	//BlockCrate.addToListWithWeight(crateList, ModItems.clip_spark, 2);
-    	//BlockCrate.addToListWithWeight(crateList, ModItems.clip_stinger, 5);
     	BlockCrate.addToListWithWeight(crateList, ModItems.grenade_generic, 8);
     	BlockCrate.addToListWithWeight(crateList, ModItems.grenade_strong, 6);
     	BlockCrate.addToListWithWeight(crateList, ModItems.grenade_mk2, 4);
@@ -104,44 +86,19 @@ public class BlockCrate extends BlockFalling {
     	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_revolver, 9);
     	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_revolver_gold, 7);
     	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_revolver_lead, 8);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_revolver_schrabidium, 1);
     	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_revolver_cursed, 7);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_revolver_nightmare, 5);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_revolver_nightmare2, 4);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_revolver_pip, 3);
     	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_calamity, 3);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_calamity_dual, 2);
     	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_rpg, 7);
     	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_karl, 4);
     	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_panzerschreck, 6);
     	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_hk69, 8);
     	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_stinger, 7);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_fatman, 5);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_proto, 3);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_mirv, 3);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_bf, 1);
     	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_mp40, 9);
     	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_uzi, 6);
     	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_uzi_silencer, 5);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_uzi_saturnite, 4);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_uzi_saturnite_silencer, 3);
     	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_uboinik, 8);
     	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_lever_action, 7);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_lever_action_dark, 6);
     	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_bolt_action, 7);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_bolt_action_green, 6);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_xvl1456, 4);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_osipr, 6);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_immolator, 5);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_cryolator, 5);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_mp, 2);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_emp, 3);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_jack, 3);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_spark, 3);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_hp, 3);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_euthanasia, 3);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_skystinger, 3);
-    	//BlockCrate.addToListWithWeight(weaponList, ModItems.gun_defabricator, 2);
     	
     	//Lead Crate
     	BlockCrate.addToListWithWeight(leadList, ModItems.ingot_uranium, 10);
@@ -174,40 +131,26 @@ public class BlockCrate extends BlockFalling {
     	BlockCrate.addToListWithWeight(leadList, ModItems.pellet_rtg_weak, 7);
     	BlockCrate.addToListWithWeight(leadList, ModItems.tritium_deuterium_cake, 5);
     	BlockCrate.addToListWithWeight(leadList, ModItems.powder_yellowcake, 10);
-    	//BlockCrate.addToListWithWeight(leadList, ModItems.nugget_schrabidium, 1);
     	
     	//Metal Crate
     	BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_press), 10);
     	BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_difurnace_off), 9);
-    	//BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_centrifuge), 5);
     	BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_reactor), 6);
     	BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_nuke_furnace_off), 7);
-    	//BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_rtg_furnace_off), 5);
     	BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_coal_off), 10);
     	BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_diesel), 8);
     	BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_selenium), 7);
-    	//BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_industrial_generator), 6);
-    	//BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_radgen), 5);
     	BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_rtg_grey), 4);
     	BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.red_pylon), 9);
     	BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_battery), 8);
     	BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_lithium_battery), 5);
     	BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off), 8);
     	BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_assembler), 10);
-    	//BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_chemplant), 7);
-    	//BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_reactor_small), 4);
     	BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_fluidtank), 7);
-    	//BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_shredder), 8);
-    	//BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_well), 6);
-    	//BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_pumpjack), 5);
-    	//BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_flare), 7);
-    	//BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_refinery), 5);
     	BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_drill), 4);
-    	//BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_turbofan), 4);
     	BlockCrate.addToListWithWeight(metalList, ModItems.centrifuge_element, 6);
     	BlockCrate.addToListWithWeight(metalList, ModItems.motor, 8);
     	BlockCrate.addToListWithWeight(metalList, ModItems.coil_tungsten, 7);
-    	//BlockCrate.addToListWithWeight(metalList, ModItems.rtg_unit, 4);
     	BlockCrate.addToListWithWeight(metalList, ModItems.photo_panel, 3);
     	BlockCrate.addToListWithWeight(metalList, ModItems.coil_copper, 10);
     	BlockCrate.addToListWithWeight(metalList, ModItems.tank_steel, 9);
@@ -219,7 +162,10 @@ public class BlockCrate extends BlockFalling {
     	BlockCrate.addToListWithWeight(redList, ModItems.mysteryshovel, 1);
     	BlockCrate.addToListWithWeight(redList, ModItems.gun_revolver_pip, 1);
     	BlockCrate.addToListWithWeight(redList, ModItems.gun_revolver_blackjack, 1);
-    	BlockCrate.addToListWithWeight(redList, ModItems.clip_revolver_pip, 1);
+    	BlockCrate.addToListWithWeight(redList, ModItems.gun_revolver_silver, 1);
+    	BlockCrate.addToListWithWeight(redList, ModItems.ammo_44_pip, 1);
+    	BlockCrate.addToListWithWeight(redList, ModItems.ammo_44_bj, 1);
+    	BlockCrate.addToListWithWeight(redList, ModItems.ammo_44_silver, 1);
     	BlockCrate.addToListWithWeight(redList, ModItems.gun_calamity_dual, 1);
     	BlockCrate.addToListWithWeight(redList, ModItems.gun_b92, 1);
     	BlockCrate.addToListWithWeight(redList, ModItems.weaponized_starblaster_cell, 1);
@@ -227,6 +173,7 @@ public class BlockCrate extends BlockFalling {
     	BlockCrate.addToListWithWeight(redList, ModItems.bottle_sparkle, 1);
     	BlockCrate.addToListWithWeight(redList, ModItems.bottle_rad, 1);
     	BlockCrate.addToListWithWeight(redList, ModItems.missile_taint, 1);
+    	BlockCrate.addToListWithWeight(redList, ModItems.ring_starmetal, 1);
     	BlockCrate.addToListWithWeight(redList, ModItems.flame_pony, 1);
     	BlockCrate.addToListWithWeight(redList, ModItems.burnt_bark, 1);
     	BlockCrate.addToListWithWeight(redList, ModItems.crystal_horn, 1);

src/main/java/com/hbm/blocks/generic/BlockOre.java

@@ -172,7 +172,7 @@ public class BlockOre extends Block {
 		{
 			return ModItems.ingot_asbestos;
 		}
-		if(this == ModBlocks.ore_asbestos)
+		if(this == ModBlocks.ore_asbestos || this == ModBlocks.ore_gneiss_asbestos)
 		{
 			return ModItems.ingot_asbestos;
 		}

src/main/java/com/hbm/blocks/machine/MachineFluidTank.java

@@ -10,12 +10,16 @@ import com.hbm.tileentity.machine.TileEntityDummy;
 import com.hbm.tileentity.machine.TileEntityMachineFluidTank;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
+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.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
@@ -254,5 +258,59 @@ public class MachineFluidTank extends BlockContainer implements IMultiblock {
 				world.func_147480_a(x, y, z, true);
 		}
 	}
+	
+    private final Random field_149933_a = new Random();
+	private static boolean keepInventory;
+	
+	@Override
+	public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, int p_149749_6_)
+    {		
+        if (!keepInventory)
+        {
+        	ISidedInventory tileentityfurnace = (ISidedInventory)p_149749_1_.getTileEntity(p_149749_2_, p_149749_3_, p_149749_4_);
 
+            if (tileentityfurnace != null)
+            {
+                for (int i1 = 0; i1 < tileentityfurnace.getSizeInventory(); ++i1)
+                {
+                    ItemStack itemstack = tileentityfurnace.getStackInSlot(i1);
+
+                    if (itemstack != null)
+                    {
+                        float f = this.field_149933_a.nextFloat() * 0.8F + 0.1F;
+                        float f1 = this.field_149933_a.nextFloat() * 0.8F + 0.1F;
+                        float f2 = this.field_149933_a.nextFloat() * 0.8F + 0.1F;
+
+                        while (itemstack.stackSize > 0)
+                        {
+                            int j1 = this.field_149933_a.nextInt(21) + 10;
+
+                            if (j1 > itemstack.stackSize)
+                            {
+                                j1 = itemstack.stackSize;
+                            }
+
+                            itemstack.stackSize -= j1;
+                            EntityItem entityitem = new EntityItem(p_149749_1_, p_149749_2_ + f, p_149749_3_ + f1, p_149749_4_ + f2, new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage()));
+
+                            if (itemstack.hasTagCompound())
+                            {
+                                entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy());
+                            }
+
+                            float f3 = 0.05F;
+                            entityitem.motionX = (float)this.field_149933_a.nextGaussian() * f3;
+                            entityitem.motionY = (float)this.field_149933_a.nextGaussian() * f3 + 0.2F;
+                            entityitem.motionZ = (float)this.field_149933_a.nextGaussian() * f3;
+                            p_149749_1_.spawnEntityInWorld(entityitem);
+                        }
+                    }
+                }
+
+                p_149749_1_.func_147453_f(p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_);
+            }
+        }
+
+        super.breakBlock(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_);
+    }
 }

src/main/java/com/hbm/blocks/machine/MachineITER.java

@@ -37,7 +37,7 @@ public class MachineITER extends BlockDummyable {
 			return new TileEntityITER();
 
 		if(meta >= 6)
-			return new TileEntityProxyCombo(false, true, true);
+			return new TileEntityProxyCombo(true, true, true);
 		
 		return null;
 	}

src/main/java/com/hbm/blocks/machine/MachineLargeTurbine.java

@@ -60,7 +60,6 @@ public class MachineLargeTurbine extends BlockDummyable {
 			FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_large_turbine, world, pos[0], pos[1], pos[2]);
 			return true;
 		} else {
-			player.addChatComponentMessage(new ChatComponentText("" + world.getBlockMetadata(x, y, z)));
 			return true;
 		}
 	}

src/main/java/com/hbm/blocks/machine/Radiobox.java

@@ -1,10 +1,14 @@
 package com.hbm.blocks.machine;
 
+import com.hbm.items.ModItems;
+import com.hbm.items.machine.ItemBattery;
 import com.hbm.tileentity.machine.TileEntityRadiobox;
 
+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.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -68,6 +72,16 @@ public class Radiobox extends BlockContainer {
 			return true;
 		} else if(!player.isSneaking())
 		{
+			TileEntityRadiobox box = (TileEntityRadiobox)world.getTileEntity(x, y, z);
+			
+			if(player.getHeldItem() != null && player.getHeldItem().getItem() == ModItems.battery_spark && !box.infinite) {
+				player.getHeldItem().stackSize--;
+				world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "hbm:item.upgradePlug", 1.5F, 1.0F);
+				box.infinite = true;
+				box.markDirty();
+				return true;
+			}
+			
 			int meta = world.getBlockMetadata(x, y, z);
 			if(meta <= 5) {
 				world.setBlockMetadataWithNotify(x, y, z, meta + 4, 2);
@@ -143,4 +157,14 @@ public class Radiobox extends BlockContainer {
 		return AxisAlignedBB.getBoundingBox(x + this.minX, y + this.minY, z + this.minZ, x + this.maxX, y + this.maxY, z + this.maxZ);
 	}
 
+    public void breakBlock(World world, int x, int y, int z, Block b, int m) {
+    	
+		TileEntityRadiobox box = (TileEntityRadiobox)world.getTileEntity(x, y, z);
+		
+		if(box.infinite) {
+			world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, ItemBattery.getEmptyBattery(ModItems.battery_spark)));
+		}
+		
+        super.breakBlock(world, x, y, z, b, m);
+    }
 }

src/main/java/com/hbm/blocks/test/TestEventTester.java

@@ -7,6 +7,7 @@ import java.util.Random;
 import java.util.Map.Entry;
 
 import com.hbm.blocks.ModBlocks;
+import com.hbm.entity.effect.EntityNukeCloudSmall;
 import com.hbm.explosion.ExplosionNT;
 import com.hbm.explosion.ExplosionNT.ExAttrib;
 import com.hbm.saveddata.RadiationSavedData;
@@ -224,6 +225,12 @@ public class TestEventTester extends Block {
 				System.out.println(data.getRadNumFromCoord(chunk.xPosition, chunk.zPosition));
         	}
         	
+        	if(!worldObj.isRemote) {
+        		
+        		worldObj.spawnEntityInWorld(EntityNukeCloudSmall.statFac(worldObj, x1, y1 + 5, z1, 100));
+        		worldObj.setBlockToAir(x1, y1, z1);
+        	}
+        	
         }
     }
     
@@ -383,13 +390,18 @@ public class TestEventTester extends Block {
 	    	worldObj.spawnEntityInWorld(tom);
     	}*/
     	
-    	if(!worldObj.isRemote) {
+    	/*if(!worldObj.isRemote) {
     		
     		worldObj.setBlockToAir(par2, par3, par4);
     		ExplosionNT ex = new ExplosionNT(worldObj, null, par2 + 0.5, par3 + 2, par4 + 0.5, 5);
     		ex.addAttrib(ExAttrib.ALLDROP);
     		ex.doExplosionA();
     		ex.doExplosionB(false);
+    	}*/
+    	
+    	if(!worldObj.isRemote) {
+    		
+    		worldObj.spawnEntityInWorld(EntityNukeCloudSmall.statFacBale(worldObj, par2, par3 + 5, par4, 100, 0));
     	}
         
         return true;

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

@@ -16,6 +16,8 @@ public class ToolConfig {
 	public static boolean abilityShredder = true;
 	public static boolean abilityCentrifuge = true;
 	public static boolean abilityCrystallizer = true;
+	public static boolean abilityMercury = true;
+	public static boolean abilityExplosion = true;
 	
 	public static void loadFromConfig(Configuration config) {
 
@@ -32,5 +34,7 @@ public class ToolConfig {
 		abilityShredder = config.get(CATEGORY_TOOLS, "11.08_abilityShredder", true).getBoolean(true);
 		abilityCentrifuge = config.get(CATEGORY_TOOLS, "11.09_abilityCentrifuge", true).getBoolean(true);
 		abilityCrystallizer = config.get(CATEGORY_TOOLS, "11.10_abilityCrystallizer", true).getBoolean(true);
+		abilityMercury = config.get(CATEGORY_TOOLS, "11.11_abilityMercury", true).getBoolean(true);
+		abilityExplosion = config.get(CATEGORY_TOOLS, "11.12_abilityExplosion", true).getBoolean(true);
 	}
 }

src/main/java/com/hbm/entity/effect/EntityNukeCloudSmall.java

@@ -1,57 +1,77 @@
 package com.hbm.entity.effect;
 
+import java.util.ArrayList;
+
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.effect.EntityLightningBolt;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 
 public class EntityNukeCloudSmall extends Entity {
 	
 	public int maxAge = 1000;
 	public int age;
+	
+	public static int cloudletLife = 50;
+	public ArrayList<Cloudlet> cloudlets = new ArrayList();
 
 	public EntityNukeCloudSmall(World p_i1582_1_) {
 		super(p_i1582_1_);
-		this.setSize(1, 80);
+		this.setSize(20, 40);
 		this.ignoreFrustumCheck = true;
 		this.isImmuneToFire = true;
 		this.age = 0;
+		this.noClip = true;
 	}
 
-    @Override
-	@SideOnly(Side.CLIENT)
-    public int getBrightnessForRender(float p_70070_1_)
-    {
-        return 15728880;
-    }
-
-    @Override
-	public float getBrightness(float p_70013_1_)
-    {
-        return 1.0F;
-    }
-
 	public EntityNukeCloudSmall(World p_i1582_1_, int maxAge, float scale) {
 		super(p_i1582_1_);
 		this.setSize(20, 40);
 		this.isImmuneToFire = true;
 		this.maxAge = maxAge;
+		this.noClip = true;
 		this.dataWatcher.updateObject(18, scale);
 	}
 
     @Override
 	public void onUpdate() {
-        //super.onUpdate();
+    	
         this.age++;
-        this.worldObj.spawnEntityInWorld(new EntityLightningBolt(this.worldObj, this.posX, this.posY + 400, this.posZ));
+        
+        this.worldObj.lastLightningBolt = 2;
         
         if(this.age >= this.maxAge)
         {
     		this.age = 0;
         	this.setDead();
         }
+        
+        int cloudCount = age * 3;
+        
+        Vec3 vec = Vec3.createVectorHelper(age * 2, 0, 0);
+        
+        int toRem = 0;
+        
+        for(int i = 0; i < this.cloudlets.size(); i++) {
+        	
+        	if(age > cloudlets.get(i).age + cloudletLife)
+        		toRem = i;
+        	else
+        		break;
+        }
+        
+        for(int i = 0; i < toRem; i++)
+        	this.cloudlets.remove(0);
+        
+        if(age < 200) {
+	        for(int i = 0; i < cloudCount; i++) {
+	        	vec.rotateAroundY((float)(Math.PI * 2 * worldObj.rand.nextDouble()));
+	        	
+	        	this.cloudlets.add(new Cloudlet(vec.xCoord, worldObj.getHeightValue((int) (vec.xCoord + posX), (int) (vec.zCoord + posZ)), vec.zCoord, age));
+	        }
+        }
 
         this.dataWatcher.updateObject(16, (short)maxAge);
         this.dataWatcher.updateObject(17, (short)age);
@@ -70,6 +90,7 @@ public class EntityNukeCloudSmall extends Entity {
 		maxAge = p_70037_1_.getShort("maxAge");
 		age = p_70037_1_.getShort("age");
 		this.dataWatcher.updateObject(18, p_70037_1_.getFloat("scale"));
+		this.dataWatcher.updateObject(19, p_70037_1_.getByte("type"));
 	}
 
 	@Override
@@ -77,6 +98,7 @@ public class EntityNukeCloudSmall extends Entity {
 		p_70014_1_.setShort("maxAge", (short)maxAge);
 		p_70014_1_.setShort("age", (short)age);
 		p_70014_1_.setFloat("scale", this.dataWatcher.getWatchableObjectFloat(18));
+		p_70014_1_.setByte("type", this.dataWatcher.getWatchableObjectByte(19));
 		
 	}
 	
@@ -108,5 +130,20 @@ public class EntityNukeCloudSmall extends Entity {
     {
         return distance < 25000;
     }
+    
+    public static class Cloudlet {
+    	
+    	public double posX;
+    	public double posY;
+    	public double posZ;
+    	public int age;
+    	
+    	public Cloudlet(double posX, double posY, double posZ, int age) {
+    		this.posX = posX;
+    		this.posY = posY;
+    		this.posZ = posZ;
+    		this.age = age;
+    	}
+    }
 
 }

src/main/java/com/hbm/entity/grenade/EntityGrenadeBouncyBase.java

@@ -129,7 +129,7 @@ public abstract class EntityGrenadeBouncyBase extends Entity implements IProject
         boolean bounce = false;
         Vec3 vec3 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ);
         Vec3 vec31 = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
-        MovingObjectPosition movingobjectposition = this.worldObj.rayTraceBlocks(vec3, vec31);
+        MovingObjectPosition movingobjectposition = this.worldObj.func_147447_a(vec3, vec31, false, true, false);
 
         if (movingobjectposition != null)
         {

src/main/java/com/hbm/entity/mob/EntityDuck.java

@@ -26,5 +26,4 @@ public class EntityDuck extends EntityChicken {
     {
         return new EntityDuck(this.worldObj);
     }
-
 }

src/main/java/com/hbm/entity/mob/EntityQuackos.java

@@ -0,0 +1,92 @@
+package com.hbm.entity.mob;
+
+import net.minecraft.entity.EntityAgeable;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.boss.IBossDisplayData;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+/**
+ *  BOW
+ */
+public class EntityQuackos extends EntityDuck implements IBossDisplayData {
+
+    /**
+     *  BOW
+     */
+	public EntityQuackos(World world) {
+		super(world);
+        this.setSize(0.3F * 25, 0.7F * 25);
+	}
+    
+    /**
+     *  BOW
+     */
+    protected String getLivingSound() {
+        return "hbm:entity.megaquacc";
+    }
+    
+    /**
+     *  BOW
+     */
+    protected String getHurtSound() {
+        return "hbm:entity.megaquacc";
+    }
+    
+    /**
+     *  BOW
+     */
+    protected String getDeathSound() {
+        return "hbm:entity.megaquacc";
+    }
+    
+    /**
+     *  BOW
+     */
+    public EntityQuackos createChild(EntityAgeable entity)
+    {
+        return new EntityQuackos(this.worldObj);
+    }
+    
+    /**
+     *  BOW
+     */
+    public boolean isEntityInvulnerable() {
+        return true;
+    }
+    
+    /**
+     *  BOW
+     */
+	public boolean interact(EntityPlayer player) {
+		
+		if(super.interact(player)) {
+			return true;
+			
+		} else if(!this.worldObj.isRemote && (this.riddenByEntity == null || this.riddenByEntity == player)) {
+			player.mountEntity(this);
+			return true;
+			
+		} else {
+			return false;
+		}
+    }
+    
+    /**
+     *  BOW
+     */
+    public void updateRiderPosition() {
+    	
+        super.updateRiderPosition();
+        float f = MathHelper.sin(this.renderYawOffset * (float)Math.PI / 180.0F);
+        float f1 = MathHelper.cos(this.renderYawOffset * (float)Math.PI / 180.0F);
+        float f2 = 0.1F;
+        float f3 = 0.0F;
+        this.riddenByEntity.setPosition(this.posX + (double)(f2 * f), this.posY + (double)(this.height - 0.125F) + this.riddenByEntity.getYOffset() + (double)f3, this.posZ - (double)(f2 * f1));
+
+        if (this.riddenByEntity instanceof EntityLivingBase) {
+            ((EntityLivingBase)this.riddenByEntity).renderYawOffset = this.renderYawOffset;
+        }
+    }
+}

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

@@ -1504,15 +1504,6 @@ public class GUIHandler implements IGuiHandler {
 					return null;
 				}
 				
-				case ModBlocks.guiID_radiobox:
-				{
-					if(entity instanceof TileEntityRadiobox)
-					{
-						return new GUIRadiobox(player.inventory, (TileEntityRadiobox) entity);
-					}
-					return null;
-				}
-				
 				case ModBlocks.guiID_telelinker:
 				{
 					if(entity instanceof TileEntityMachineTeleLinker)