billets and tritium lamps

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

@@ -140,6 +140,7 @@ chem.STEAM=Wasser kochen
 chem.TEST=Test
 chem.UF6=Uranhexafluoridproduktion
 chem.XENON=Lindeverfahren (Xenon)
+chem.XENON_OXY=Verbessertes Lindeverfahren (Xenon)
 chem.YELLOWCAKE=Yellowcakeproduktion
 
 container.amsBase=AMS-Basis [WIP]
@@ -631,6 +632,25 @@ item.battery_su_l.name=Große Einwegbatterie
 item.battery_trixite.name=Billige Spark-Batterie-Nachmache
 item.beta.name=Beta-Features
 item.big_sword.name=Großes Schwert
+item.billet_mox_fuel.name=MOX-Kernbrennstoffbillet
+item.billet_neptunium.name=Neptuniumbillet
+item.billet_polonium.name=Poloniumbillet
+item.billet_pu_mix.name=Reaktorfähiges Plutoniumbillet
+item.billet_pu238.name=Pu238-Billet
+item.billet_pu239.name=Pu239-Billet
+item.billet_pu240.name=Pu240-Billet
+item.billet_plutonium.name=Plutoniumbillet
+item.billet_plutonium_fuel.name=Plutoniumkernbrennstoffbillet
+item.billet_schrabidium.name=Schrabidiumbillet
+item.billet_schrabidium_fuel.name=Schrabidiumkernbrennstoffbillet
+item.billet_solinium.name=Soliniumbillet
+item.billet_th232.name=Th232-Billet
+item.billet_thorium_fuel.name=Thoriumkernbrennstoffbillet
+item.billet_u233.name=U233-Billet
+item.billet_u235.name=U235-Billet
+item.billet_u238.name=U238-Billet
+item.billet_uranium.name=Uranbillet
+item.billet_uranium_fuel.name=Urankernbrennstoffbillet
 item.biomass.name=Biomasse
 item.biomass_compressed.name=Verdichtete Biomasse
 item.bj_boots.name=Lunare Beschlagene Stiefel
@@ -1266,6 +1286,7 @@ item.ingot_plutonium.name=Plutoniumbarren
 item.ingot_plutonium_fuel.name=Plutoniumkernbrennstoffbarren
 item.ingot_polonium.name=Poloniumbarren
 item.ingot_polymer.name=Polymertafel
+item.ingot_pu_mix.name=Reaktorfähiger Plutoniumbarren
 item.ingot_pu238.name=Pu238-Barren
 item.ingot_pu239.name=Pu239-Barren
 item.ingot_pu240.name=Pu240-Barren
@@ -1570,6 +1591,7 @@ item.nugget_neptunium.name=Neptuniumnugget
 item.nugget_plutonium.name=Plutoniumnugget
 item.nugget_plutonium_fuel.name=Plutoniumkernbrennstoffnugget
 item.nugget_polonium.name=Poloniumnugget
+item.nugget_pu_mix.name=Reactorfähiges Plutoniumnugget
 item.nugget_pu238.name=Pu238-Nugget
 item.nugget_pu239.name=Pu239-Nugget
 item.nugget_pu240.name=Pu240-Nugget
@@ -2245,6 +2267,7 @@ tile.block_niter.name=Salpeterblock
 tile.block_plutonium.name=Plutoniumblock
 tile.block_plutonium_fuel.name=Plutoniumkernbrennstoffblock
 tile.block_polonium.name=Poloniumblock
+tile.block_pu_mix.name=Reaktorfähiger Plutoniumblock
 tile.block_pu238.name=Pu238-Block
 tile.block_pu239.name=Pu239-Block
 tile.block_pu240.name=Pu240-Block
@@ -2414,6 +2437,10 @@ tile.hadron_plating_yellow.name=Teilchenbeschleuniger-Außenwand (Gelb)
 tile.hadron_power.name=Teilchenbeschleuniger-Stromanschluss
 tile.hazmat.name=Strahlenschutzstoff-Block
 tile.iter.name=Kernfusionsreaktor
+tile.lamp_tritium_blue_off.name=Blaue Tritiumlampe
+tile.lamp_tritium_blue_on.name=Blaue Tritiumlampe
+tile.lamp_tritium_green_off.name=Grüne Tritiumlampe
+tile.lamp_tritium_green_on.name=Grüne Tritiumlampe
 tile.launch_pad.name=Raketenabschussrampe
 tile.launch_table.name=Große Startrampe
 tile.lox_barrel.name=LOX-Fass

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

@@ -140,6 +140,7 @@ chem.STEAM=Water Boiling
 chem.TEST=Test
 chem.UF6=Uranium Hexafluoride Production
 chem.XENON=Linde Xenon Cycle
+chem.XENON_OXY=Boosted Linde Xenon Cycle
 chem.YELLOWCAKE=Yellowcake Production
 
 container.amsBase=AMS Base [WIP]
@@ -631,6 +632,25 @@ item.battery_su_l.name=Large SU-Battery
 item.battery_trixite.name=Off-Brand Spark Battery
 item.beta.name=Beta Features
 item.big_sword.name=Great Sword
+item.billet_mox_fuel.name=MOX Fuel Billet
+item.billet_neptunium.name=Neptunium Billet
+item.billet_polonium.name=Polonium Billet
+item.billet_pu_mix.name=Reactor Grade Plutonium Billet
+item.billet_pu238.name=Pu238 Billet
+item.billet_pu239.name=Pu239 Billet
+item.billet_pu240.name=Pu240 Billet
+item.billet_plutonium.name=Plutonium Billet
+item.billet_plutonium_fuel.name=Plutonium Fuel Billet
+item.billet_schrabidium.name=Schrabidium Billet
+item.billet_schrabidium_fuel.name=Schrabidium Fuel Billet
+item.billet_solinium.name=Solinium Billet
+item.billet_th232.name=Th232 Billet
+item.billet_thorium_fuel.name=Thorium Fuel Billet
+item.billet_u233.name=U233 Billet
+item.billet_u235.name=U235 Billet
+item.billet_u238.name=U238 Billet
+item.billet_uranium.name=Uranium Billet
+item.billet_uranium_fuel.name=Uranium Fuel Billet
 item.biomass.name=Biomass
 item.biomass_compressed.name=Compressed Biomass
 item.bj_boots.name=Lunar Studded Boots
@@ -1266,6 +1286,7 @@ item.ingot_plutonium.name=Plutonium Ingot
 item.ingot_plutonium_fuel.name=Ingot of Plutonium Fuel
 item.ingot_polonium.name=Polonium Ingot
 item.ingot_polymer.name=Polymer Bar
+item.ingot_pu_mix.name=Reactor Grade Plutonium Ingot
 item.ingot_pu238.name=Pu238 Ingot
 item.ingot_pu239.name=Pu239 Ingot
 item.ingot_pu240.name=Pu240 Ingot
@@ -1570,6 +1591,7 @@ item.nugget_neptunium.name=Neptunium Nugget
 item.nugget_plutonium.name=Plutonium Nugget
 item.nugget_plutonium_fuel.name=Nugget of Plutonium Fuel
 item.nugget_polonium.name=Polonium Nugget
+item.nugget_pu_mix.name=Reactor Grade Plutonium Nugget
 item.nugget_pu238.name=Pu238 Nugget
 item.nugget_pu239.name=Pu239 Nugget
 item.nugget_pu240.name=Pu240 Nugget
@@ -2245,6 +2267,7 @@ tile.block_niter.name=Block of Niter
 tile.block_plutonium.name=Block of Plutonium
 tile.block_plutonium_fuel.name=Block of Plutonium Fuel
 tile.block_polonium.name=Block of Polonium
+tile.block_pu_mix.name=Block of Reactor Grade Plutonium
 tile.block_pu238.name=Block of Pu238
 tile.block_pu239.name=Block of Pu239
 tile.block_pu240.name=Block of Pu240
@@ -2414,6 +2437,10 @@ tile.hadron_plating_yellow.name=Particle Accelerator Plating (YelloDye)
 tile.hadron_power.name=Particle Accelerator Power Plugtankish wanted
 tile.hazmat.name=Hazmat Cloth Block
 tile.iter.name=Fusion Reactor
+tile.lamp_tritium_blue_off.name=Blue Tritium Lamp
+tile.lamp_tritium_blue_on.name=Blue Tritium Lamp
+tile.lamp_tritium_green_off.name=Green Tritium Lamp
+tile.lamp_tritium_green_on.name=Green Tritium Lamp
 tile.launch_pad.name=Missile Launch Pad
 tile.launch_table.name=Large Launch Pad
 tile.lox_barrel.name=LOX Barrel

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

@@ -18,7 +18,6 @@ import net.minecraft.block.Block;
 import net.minecraft.block.BlockFalling;
 import net.minecraft.block.material.*;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.init.Blocks;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 
@@ -120,6 +119,7 @@ public class ModBlocks {
 	public static Block block_pu238;
 	public static Block block_pu239;
 	public static Block block_pu240;
+	public static Block block_pu_mix;
 	public static Block block_plutonium_fuel;
 	public static Block block_titanium;
 	public static Block block_sulfur;
@@ -200,6 +200,11 @@ public class ModBlocks {
 	public static Block reinforced_lamp_off;
 	public static Block reinforced_lamp_on;
 
+	public static Block lamp_tritium_green_off;
+	public static Block lamp_tritium_green_on;
+	public static Block lamp_tritium_blue_off;
+	public static Block lamp_tritium_blue_on;
+
 	public static Block reinforced_stone;
 	public static Block concrete_smooth;
 	public static Block concrete;
@@ -983,6 +988,7 @@ public class ModBlocks {
 		block_pu238 = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_pu238").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_pu238");
 		block_pu239 = new BlockOre(Material.iron, 15F, 150F).setBlockName("block_pu239").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_pu239");
 		block_pu240 = new BlockOre(Material.iron, 10F, 100F).setBlockName("block_pu240").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_pu240");
+		block_pu_mix = new BlockOre(Material.iron, 10F, 100F).setBlockName("block_pu_mix").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_pu_mix");
 		block_plutonium_fuel = new BlockOre(Material.iron, 5F, 50F).setBlockName("block_plutonium_fuel").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_plutonium_fuel");
 		block_titanium = new BlockGeneric(Material.iron).setBlockName("block_titanium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_titanium");
 		block_sulfur = new BlockGeneric(Material.iron).setBlockName("block_sulfur").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_sulfur");
@@ -1063,6 +1069,11 @@ public class ModBlocks {
 		reinforced_lamp_off = new ReinforcedLamp(Material.rock, false).setBlockName("reinforced_lamp_off").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(300.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_lamp_off");
 		reinforced_lamp_on = new ReinforcedLamp(Material.rock, true).setBlockName("reinforced_lamp_on").setHardness(15.0F).setResistance(300.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_lamp_on");
 
+		lamp_tritium_green_off = new ReinforcedLamp(Material.redstoneLight, false).setBlockName("lamp_tritium_green_off").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(3.0F).setBlockTextureName(RefStrings.MODID + ":lamp_tritium_green_off");
+		lamp_tritium_green_on = new ReinforcedLamp(Material.redstoneLight, true).setBlockName("lamp_tritium_green_on").setStepSound(Block.soundTypeGlass).setHardness(3.0F).setBlockTextureName(RefStrings.MODID + ":lamp_tritium_green_on");
+		lamp_tritium_blue_off = new ReinforcedLamp(Material.redstoneLight, false).setBlockName("lamp_tritium_blue_off").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(3.0F).setBlockTextureName(RefStrings.MODID + ":lamp_tritium_blue_off");
+		lamp_tritium_blue_on = new ReinforcedLamp(Material.redstoneLight, true).setBlockName("lamp_tritium_blue_on").setStepSound(Block.soundTypeGlass).setHardness(3.0F).setBlockTextureName(RefStrings.MODID + ":lamp_tritium_blue_on");
+
 		reinforced_stone = new BlockGeneric(Material.rock).setBlockName("reinforced_stone").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(3000.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_stone");
 		concrete_smooth = new BlockGeneric(Material.rock).setBlockName("concrete_smooth").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(4000.0F).setBlockTextureName(RefStrings.MODID + ":concrete");
 		concrete = new BlockGeneric(Material.rock).setBlockName("concrete").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(4000.0F).setBlockTextureName(RefStrings.MODID + ":concrete_tile");
@@ -1708,6 +1719,7 @@ public class ModBlocks {
 		GameRegistry.registerBlock(block_pu238, block_pu238.getUnlocalizedName());
 		GameRegistry.registerBlock(block_pu239, block_pu239.getUnlocalizedName());
 		GameRegistry.registerBlock(block_pu240, block_pu240.getUnlocalizedName());
+		GameRegistry.registerBlock(block_pu_mix, block_pu_mix.getUnlocalizedName());
 		GameRegistry.registerBlock(block_plutonium_fuel, block_plutonium_fuel.getUnlocalizedName());
 		GameRegistry.registerBlock(block_thorium, block_thorium.getUnlocalizedName());
 		GameRegistry.registerBlock(block_thorium_fuel, block_thorium_fuel.getUnlocalizedName());
@@ -1782,6 +1794,12 @@ public class ModBlocks {
 		//Gravel
 		GameRegistry.registerBlock(gravel_obsidian, gravel_obsidian.getUnlocalizedName());
 		GameRegistry.registerBlock(gravel_diamond, ItemBlockLore.class, gravel_diamond.getUnlocalizedName());
+		
+		//Lamps
+		GameRegistry.registerBlock(lamp_tritium_green_off, lamp_tritium_green_off.getUnlocalizedName());
+		GameRegistry.registerBlock(lamp_tritium_green_on, lamp_tritium_green_on.getUnlocalizedName());
+		GameRegistry.registerBlock(lamp_tritium_blue_off, lamp_tritium_blue_off.getUnlocalizedName());
+		GameRegistry.registerBlock(lamp_tritium_blue_on, lamp_tritium_blue_on.getUnlocalizedName());
 
 		//Reinforced Blocks
 		GameRegistry.registerBlock(asphalt, asphalt.getUnlocalizedName());

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

@@ -13,78 +13,91 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 public class ReinforcedLamp extends Block {
-	
-    private final boolean field_150171_a;
-    private static final String __OBFID = "CL_00000297";
 
-    public ReinforcedLamp(Material mat, boolean p_i45421_1_)
-    {
-        super(mat);
-        this.field_150171_a = p_i45421_1_;
+	private final boolean isOn;
 
-        if (p_i45421_1_)
-        {
-            this.setLightLevel(1.0F);
-        }
-    }
+	public ReinforcedLamp(Material mat, boolean isOn) {
+		super(mat);
+		this.isOn = isOn;
 
-    @Override
-	public void onBlockAdded(World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_)
-    {
-        if (!p_149726_1_.isRemote)
-        {
-            if (this.field_150171_a && !p_149726_1_.isBlockIndirectlyGettingPowered(p_149726_2_, p_149726_3_, p_149726_4_))
-            {
-                p_149726_1_.scheduleBlockUpdate(p_149726_2_, p_149726_3_, p_149726_4_, this, 4);
-            }
-            else if (!this.field_150171_a && p_149726_1_.isBlockIndirectlyGettingPowered(p_149726_2_, p_149726_3_, p_149726_4_))
-            {
-                p_149726_1_.setBlock(p_149726_2_, p_149726_3_, p_149726_4_, ModBlocks.reinforced_lamp_on, 0, 2);
-            }
-        }
-    }
+		if(isOn) {
+			this.setLightLevel(1.0F);
+		}
+	}
 
-    @Override
-	public void onNeighborBlockChange(World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_)
-    {
-        if (!p_149695_1_.isRemote)
-        {
-            if (this.field_150171_a && !p_149695_1_.isBlockIndirectlyGettingPowered(p_149695_2_, p_149695_3_, p_149695_4_))
-            {
-                p_149695_1_.scheduleBlockUpdate(p_149695_2_, p_149695_3_, p_149695_4_, this, 4);
-            }
-            else if (!this.field_150171_a && p_149695_1_.isBlockIndirectlyGettingPowered(p_149695_2_, p_149695_3_, p_149695_4_))
-            {
-                p_149695_1_.setBlock(p_149695_2_, p_149695_3_, p_149695_4_, ModBlocks.reinforced_lamp_on, 0, 2);
-            }
-        }
-    }
+	@Override
+	public void onBlockAdded(World world, int x, int y, int z) {
+		
+		if(!world.isRemote) {
+			
+			if(this.isOn && !world.isBlockIndirectlyGettingPowered(x, y, z)) {
+				world.scheduleBlockUpdate(x, y, z, this, 4);
+				
+			} else if(!this.isOn && world.isBlockIndirectlyGettingPowered(x, y, z)) {
+				world.setBlock(x, y, z, getOn(), 0, 2);
+			}
+		}
+	}
 
-    @Override
-	public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_)
-    {
-        if (!p_149674_1_.isRemote && this.field_150171_a && !p_149674_1_.isBlockIndirectlyGettingPowered(p_149674_2_, p_149674_3_, p_149674_4_))
-        {
-            p_149674_1_.setBlock(p_149674_2_, p_149674_3_, p_149674_4_, ModBlocks.reinforced_lamp_off, 0, 2);
-        }
-    }
+	@Override
+	public void onNeighborBlockChange(World world, int x, int y, int z, Block b) {
+		
+		if(!world.isRemote) {
+			
+			if(this.isOn && !world.isBlockIndirectlyGettingPowered(x, y, z)) {
+				world.scheduleBlockUpdate(x, y, z, this, 4);
+				
+			} else if(!this.isOn && world.isBlockIndirectlyGettingPowered(x, y, z)) {
+				world.setBlock(x, y, z, getOn(), 0, 2);
+			}
+		}
+	}
 
-    @Override
-	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
-    {
-        return Item.getItemFromBlock(ModBlocks.reinforced_lamp_off);
-    }
+	@Override
+	public void updateTick(World world, int x, int y, int z, Random p_149674_5_) {
+		
+		if(!world.isRemote && this.isOn && !world.isBlockIndirectlyGettingPowered(x, y, z)) {
+			world.setBlock(x, y, z, getOff(), 0, 2);
+		}
+	}
 
-    @Override
+	@Override
+	public Item getItemDropped(int i, Random r, int j) {
+		return Item.getItemFromBlock(getOff());
+	}
+
+	@Override
 	@SideOnly(Side.CLIENT)
-    public Item getItem(World p_149694_1_, int p_149694_2_, int p_149694_3_, int p_149694_4_)
-    {
-        return Item.getItemFromBlock(ModBlocks.reinforced_lamp_off);
-    }
+	public Item getItem(World world, int x, int y, int z) {
+		return Item.getItemFromBlock(getOff());
+	}
 
-    @Override
-	protected ItemStack createStackedBlock(int p_149644_1_)
-    {
-        return new ItemStack(ModBlocks.reinforced_lamp_off);
-    }
+	@Override
+	protected ItemStack createStackedBlock(int e) {
+		return new ItemStack(getOff());
+	}
+	
+	private Block getOff() {
+
+		if(this == ModBlocks.reinforced_lamp_on)
+			return ModBlocks.reinforced_lamp_off;
+		if(this == ModBlocks.lamp_tritium_green_on)
+			return ModBlocks.lamp_tritium_green_off;
+		if(this == ModBlocks.lamp_tritium_blue_on)
+			return ModBlocks.lamp_tritium_blue_off;
+		
+		return this;
+	}
+	
+	private Block getOn() {
+
+		if(this == ModBlocks.reinforced_lamp_off)
+			return ModBlocks.reinforced_lamp_on;
+		if(this == ModBlocks.lamp_tritium_green_off)
+			return ModBlocks.lamp_tritium_green_on;
+		if(this == ModBlocks.lamp_tritium_blue_off)
+			return ModBlocks.lamp_tritium_blue_on;
+		
+		return this;
+	}
 }

src/main/java/com/hbm/crafting/MineralRecipes.java

@@ -33,6 +33,32 @@ public class MineralRecipes {
 		RecipesCommon.add1To9(ModBlocks.block_fallout, ModItems.fallout);
 		GameRegistry.addRecipe(new ItemStack(ModBlocks.fallout, 2), new Object[] { "##", '#', ModItems.fallout });
 		
+		RecipesCommon.add9To1(ModItems.ingot_pu_mix, ModBlocks.block_pu_mix);
+		RecipesCommon.add1To9(ModBlocks.block_pu_mix, ModItems.ingot_pu_mix);
+		RecipesCommon.add9To1(ModItems.nugget_pu_mix, ModItems.ingot_pu_mix);
+		RecipesCommon.add1To9(ModItems.ingot_pu_mix, ModItems.nugget_pu_mix);
+
+		RecipesCommon.addBillet(ModItems.billet_uranium, ModItems.nugget_uranium, "nuggetUranium");
+		RecipesCommon.addBillet(ModItems.billet_u233, ModItems.nugget_u233, "nuggetUranium233", "tinyU233");
+		RecipesCommon.addBillet(ModItems.billet_u235, ModItems.nugget_u235, "nuggetUranium235", "tinyU235");
+		RecipesCommon.addBillet(ModItems.billet_u238, ModItems.nugget_u238, "nuggetUranium238", "tinyU238");
+		RecipesCommon.addBillet(ModItems.billet_th232, ModItems.nugget_th232, "nuggetThorium232", "tinyTh232");
+		RecipesCommon.addBillet(ModItems.billet_plutonium, ModItems.nugget_plutonium, "nuggetPlutonium");
+		RecipesCommon.addBillet(ModItems.billet_pu238, ModItems.nugget_pu238, "nuggetPlutonium238", "tinyPu238");
+		RecipesCommon.addBillet(ModItems.billet_pu239, ModItems.nugget_pu239, "nuggetPlutonium239", "tinyPu239");
+		RecipesCommon.addBillet(ModItems.billet_pu240, ModItems.nugget_pu240, "nuggetPlutonium240", "tinyPu240");
+		RecipesCommon.addBillet(ModItems.billet_pu_mix, ModItems.nugget_pu_mix);
+		RecipesCommon.addBillet(ModItems.billet_neptunium, ModItems.nugget_neptunium, "nuggetNeptunium");
+		RecipesCommon.addBillet(ModItems.billet_polonium, ModItems.nugget_polonium, "nuggetPolonium");
+		RecipesCommon.addBillet(ModItems.billet_schrabidium, ModItems.nugget_schrabidium);
+		RecipesCommon.addBillet(ModItems.billet_solinium, ModItems.nugget_solinium);
+
+		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_thorium_fuel, 2), new Object[] { ModItems.billet_th232, ModItems.billet_th232, ModItems.billet_u233 });
+		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_uranium_fuel, 2), new Object[] { ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_u233 });
+		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_uranium_fuel, 2), new Object[] { ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_u235 });
+		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_plutonium_fuel, 2), new Object[] { ModItems.billet_u238, ModItems.billet_pu_mix, ModItems.billet_pu_mix });
+		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_mox_fuel, 2), new Object[] { ModItems.billet_u238, ModItems.billet_u235, ModItems.billet_pu_mix });
+		
 		GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_copper), 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_copper });
 		GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_fluorite), 1), new Object[] { "###", "###", "###", '#', ModItems.fluorite });
 		GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_niter), 1), new Object[] { "###", "###", "###", '#', ModItems.niter });
@@ -233,14 +259,14 @@ public class MineralRecipes {
 		GameRegistry.addRecipe(new ItemStack(ModItems.ingot_euphemium, 1), new Object[] { "###", "###", "###", '#', ModItems.nugget_euphemium });
 		GameRegistry.addRecipe(new ItemStack(ModItems.nugget_euphemium, 9), new Object[] { "#", '#', ModItems.ingot_euphemium });
 
-		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_uranium_fuel, 1), new Object[] { "nuggetUranium235", "nuggetUranium235", "nuggetUranium235", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238" }));
-		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_uranium_fuel, 1), new Object[] { "nuggetUranium233", "nuggetUranium233", "nuggetUranium233", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238" }));
-		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_thorium_fuel, 1), new Object[] { "nuggetUranium233", "nuggetUranium233", "nuggetUranium233", "nuggetThorium232", "nuggetThorium232", "nuggetThorium232", "nuggetThorium232", "nuggetThorium232", "nuggetThorium232" }));
-		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_plutonium_fuel, 1), new Object[] { "nuggetPlutonium238", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium240", "nuggetPlutonium240", "nuggetPlutonium240" }));
-		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_mox_fuel, 1), new Object[] { "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239" }));
-		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_uranium_fuel, 1), new Object[] { "tinyU235", "tinyU235", "tinyU235", "tinyU238", "tinyU238", "tinyU238", "tinyU238", "tinyU238", "tinyU238" }));
-		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_plutonium_fuel, 1), new Object[] { "tinyPu238", "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu240", "tinyPu240", "tinyPu240" }));
-		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_mox_fuel, 1), new Object[] { "tinyU235", "tinyU235", "tinyU235", "tinyU238", "tinyU238", "tinyPu238", "tinyPu239", "tinyPu239", "tinyPu239" }));
+		//GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_uranium_fuel, 1), new Object[] { "nuggetUranium235", "nuggetUranium235", "nuggetUranium235", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238" }));
+		//GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_uranium_fuel, 1), new Object[] { "nuggetUranium233", "nuggetUranium233", "nuggetUranium233", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238" }));
+		//GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_thorium_fuel, 1), new Object[] { "nuggetUranium233", "nuggetUranium233", "nuggetUranium233", "nuggetThorium232", "nuggetThorium232", "nuggetThorium232", "nuggetThorium232", "nuggetThorium232", "nuggetThorium232" }));
+		//GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_plutonium_fuel, 1), new Object[] { "nuggetPlutonium238", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium240", "nuggetPlutonium240", "nuggetPlutonium240" }));
+		//GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_mox_fuel, 1), new Object[] { "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239" }));
+		//GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_uranium_fuel, 1), new Object[] { "tinyU235", "tinyU235", "tinyU235", "tinyU238", "tinyU238", "tinyU238", "tinyU238", "tinyU238", "tinyU238" }));
+		//GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_plutonium_fuel, 1), new Object[] { "tinyPu238", "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu240", "tinyPu240", "tinyPu240" }));
+		//GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_mox_fuel, 1), new Object[] { "tinyU235", "tinyU235", "tinyU235", "tinyU238", "tinyU238", "tinyPu238", "tinyPu239", "tinyPu239", "tinyPu239" }));
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_schrabidium_fuel, 1), new Object[] { "nuggetSchrabidium", "nuggetSchrabidium", "nuggetSchrabidium", "nuggetNeptunium", "nuggetNeptunium", "nuggetNeptunium", ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium }));
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_hes, 1), new Object[] { "nuggetSchrabidium", "nuggetSchrabidium", "nuggetSchrabidium", "nuggetSchrabidium", "nuggetSchrabidium", "nuggetNeptunium", "nuggetNeptunium", ModItems.nugget_beryllium, ModItems.nugget_beryllium }));
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_les, 1), new Object[] { "nuggetSchrabidium", "nuggetNeptunium", "nuggetNeptunium", "nuggetNeptunium", "nuggetNeptunium", ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium }));

src/main/java/com/hbm/crafting/RecipesCommon.java

@@ -7,6 +7,7 @@ import net.minecraft.block.Block;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.ShapedOreRecipe;
 
 /**
  * Wrappers for common recipe schemes
@@ -39,6 +40,19 @@ public class RecipesCommon {
 	public static void add9To1(ItemStack nine, ItemStack one) {
 		GameRegistry.addRecipe(one, new Object[] { "###", "###", "###", '#', nine });
 	}
+
+	public static void addBillet(Item billet, Item nugget, String... ore) {
+		
+		for(String o : ore)
+			GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(billet), new Object[] { "###", "###", '#', o }));
+		
+		GameRegistry.addShapelessRecipe(new ItemStack(nugget, 6), new Object[] { billet });
+	}
+
+	public static void addBillet(Item billet, Item nugget) {
+		GameRegistry.addRecipe(new ItemStack(billet), new Object[] { "###", "###", '#', nugget });
+		GameRegistry.addShapelessRecipe(new ItemStack(nugget, 6), new Object[] { billet });
+	}
 	
 	//Fill rods with 6 nuggets
 	public static void addRod(Item nugget, Item out) {

src/main/java/com/hbm/crafting/WeaponRecipes.java

@@ -240,7 +240,7 @@ public class WeaponRecipes {
 		GameRegistry.addRecipe(new ItemStack(ModItems.ammo_5mm_explosive, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_5mm, 'A', ModItems.ingot_semtex });
 		GameRegistry.addRecipe(new ItemStack(ModItems.ammo_5mm_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_5mm, 'A', ModItems.ingot_u238 });
 		GameRegistry.addRecipe(new ItemStack(ModItems.ammo_5mm_star, 4), new Object[] { " B ", "BAB", " B ", 'B', ModItems.ammo_5mm_du, 'A', ModItems.ingot_starmetal });
-		GameRegistry.addRecipe(new ItemStack(ModItems.ammo_5mm_chlorophyte, 4), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_5mm, 'A', ModItems.pellet_chlorophyte });
+		GameRegistry.addRecipe(new ItemStack(ModItems.ammo_5mm_chlorophyte, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_5mm, 'A', ModItems.pellet_chlorophyte });
 		GameRegistry.addRecipe(new ItemStack(ModItems.ammo_9mm_ap, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_9mm, 'A', ModItems.ingot_dura_steel });
 		GameRegistry.addRecipe(new ItemStack(ModItems.ammo_9mm_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_9mm, 'A', ModItems.ingot_u238 });
 		GameRegistry.addRecipe(new ItemStack(ModItems.ammo_9mm_chlorophyte, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_9mm, 'A', ModItems.pellet_chlorophyte });

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

@@ -107,11 +107,14 @@ public class Gun75BoltFactory {
 				if(hit instanceof EntityLivingBase) {
 					EntityLivingBase living = (EntityLivingBase) hit;
 					float f = living.getHealth();
-					f = Math.max(0, f - 2);
-					living.setHealth(f);
 					
-					if(f == 0)
-						living.onDeath(ModDamageSource.lead);
+					if(f > 0) {
+						f = Math.max(0, f - 2);
+						living.setHealth(f);
+						
+						if(f == 0)
+							living.onDeath(ModDamageSource.lead);
+					}
 				}
 			}
 		};

src/main/java/com/hbm/inventory/MachineRecipes.java

@@ -1947,6 +1947,9 @@ public class MachineRecipes {
     	case XENON:
 			input[0] = new FluidStack(0, FluidType.NONE);
         	break;
+    	case XENON_OXY:
+			input[0] = new FluidStack(250, FluidType.OXYGEN);
+        	break;
     	case SATURN:
 			input[0] = new FluidStack(100, FluidType.ACID);
 			input[1] = new FluidStack(50, FluidType.MERCURY);
@@ -2216,6 +2219,9 @@ public class MachineRecipes {
         case XENON:
 			output[0] = new FluidStack(50, FluidType.XENON);
         	break;
+        case XENON_OXY:
+			output[0] = new FluidStack(50, FluidType.XENON);
+        	break;
         case BALEFIRE:
 			output[0] = new FluidStack(8000, FluidType.BALEFIRE);
         	break;

src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java

@@ -36,6 +36,7 @@ public class GUIMachineDiesel extends GuiInfoContainer {
 				"  Diesel (500 HE/t)",
 				"  Petroil (300 HE/t)",
 				"  Biofuel (400 HE/t)",
+				"  Diesel (1000 HE/t)",
 				"  NITAN Superfuel (5000 HE/t)" };
 		this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36, 16, 16, guiLeft - 8, guiTop + 36 + 16, text);
 		

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

@@ -62,6 +62,7 @@ public class ModItems {
 	public static Item ingot_pu238;
 	public static Item ingot_pu239;
 	public static Item ingot_pu240;
+	public static Item ingot_pu_mix;
 	public static Item ingot_neptunium;
 	public static Item ingot_polonium;
 	public static Item ingot_titanium;
@@ -134,6 +135,26 @@ public class ModItems {
 	public static Item nugget_mercury;
 	public static Item bottle_mercury;
 
+	public static Item billet_uranium;
+	public static Item billet_u233;
+	public static Item billet_u235;
+	public static Item billet_u238;
+	public static Item billet_th232;
+	public static Item billet_plutonium;
+	public static Item billet_pu238;
+	public static Item billet_pu239;
+	public static Item billet_pu240;
+	public static Item billet_pu_mix;
+	public static Item billet_neptunium;
+	public static Item billet_polonium;
+	public static Item billet_schrabidium;
+	public static Item billet_solinium;
+	public static Item billet_uranium_fuel;
+	public static Item billet_thorium_fuel;
+	public static Item billet_plutonium_fuel;
+	public static Item billet_mox_fuel;
+	public static Item billet_schrabidium_fuel;
+
 	public static Item nugget_th232;
 	public static Item nugget_uranium;
 	public static Item nugget_u233;
@@ -143,6 +164,7 @@ public class ModItems {
 	public static Item nugget_pu238;
 	public static Item nugget_pu239;
 	public static Item nugget_pu240;
+	public static Item nugget_pu_mix;
 	public static Item nugget_neptunium;
 	public static Item nugget_polonium;
 	public static Item plate_titanium;
@@ -2139,6 +2161,7 @@ public class ModItems {
 		ingot_pu238 = new ItemRadioactive(2.5F).setUnlocalizedName("ingot_pu238").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu238");
 		ingot_pu239 = new ItemRadioactive(5F).setUnlocalizedName("ingot_pu239").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu239");
 		ingot_pu240 = new ItemRadioactive(5F).setUnlocalizedName("ingot_pu240").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu240");
+		ingot_pu_mix = new ItemRadioactive(5F).setUnlocalizedName("ingot_pu_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu_mix");
 		ingot_neptunium = new ItemRadioactive(2.5F).setUnlocalizedName("ingot_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_neptunium");
 		ingot_polonium = new ItemRadioactive(10F).setUnlocalizedName("ingot_polonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_polonium");
 		ingot_titanium = new Item().setUnlocalizedName("ingot_titanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_titanium");
@@ -2204,6 +2227,26 @@ public class ModItems {
 		sat_base = new Item().setUnlocalizedName("sat_base").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":sat_base");
 		thruster_nuclear = new Item().setUnlocalizedName("thruster_nuclear").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":thruster_nuclear");
 
+		billet_uranium = new ItemRadioactive(0.5F).setUnlocalizedName("billet_uranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_uranium");
+		billet_u233 = new ItemRadioactive(5.0F).setUnlocalizedName("billet_u233").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_u233");
+		billet_u235 = new ItemRadioactive(5.0F).setUnlocalizedName("billet_u235").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_u235");
+		billet_u238 = new ItemRadioactive(0.5F).setUnlocalizedName("billet_u238").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_u238");
+		billet_th232 = new Item().setUnlocalizedName("billet_th232").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_th232");
+		billet_plutonium = new ItemRadioactive(2.5F).setUnlocalizedName("billet_plutonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_plutonium");
+		billet_pu238 = new ItemRadioactive(2.5F).setUnlocalizedName("billet_pu238").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pu238");
+		billet_pu239 = new ItemRadioactive(5.0F).setUnlocalizedName("billet_pu239").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pu239");
+		billet_pu240 = new ItemRadioactive(5.0F).setUnlocalizedName("billet_pu240").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pu240");
+		billet_pu_mix = new ItemRadioactive(5.0F).setUnlocalizedName("billet_pu_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pu_mix");
+		billet_neptunium = new ItemRadioactive(2.5F).setUnlocalizedName("billet_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_neptunium");
+		billet_polonium = new ItemRadioactive(10F).setUnlocalizedName("billet_polonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_polonium");
+		billet_schrabidium = new ItemRadioactive(7.5F, false, true).setUnlocalizedName("billet_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_schrabidium");
+		billet_solinium = new ItemRadioactive(7.5F, false, true).setUnlocalizedName("billet_solinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_solinium");
+		billet_uranium_fuel = new ItemRadioactive(2.5F).setUnlocalizedName("billet_uranium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_uranium_fuel");
+		billet_thorium_fuel = new ItemRadioactive(2.5F).setUnlocalizedName("billet_thorium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_thorium_fuel");
+		billet_plutonium_fuel = new ItemRadioactive(5.0F).setUnlocalizedName("billet_plutonium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_plutonium_fuel");
+		billet_mox_fuel = new ItemRadioactive(5.0F).setUnlocalizedName("billet_mox_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_mox_fuel");
+		billet_schrabidium_fuel = new ItemRadioactive(7.5F, false, true).setUnlocalizedName("billet_schrabidium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_schrabidium_fuel");
+
 		ingot_dura_steel = new ItemCustomLore().setUnlocalizedName("ingot_dura_steel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_dura_steel");
 		ingot_polymer = new ItemCustomLore().setUnlocalizedName("ingot_polymer").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_polymer");
 		ingot_desh = new ItemCustomLore().setUnlocalizedName("ingot_desh").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_desh");
@@ -2263,6 +2306,7 @@ public class ModItems {
 		nugget_pu238 = new ItemRadioactive(0.25F).setUnlocalizedName("nugget_pu238").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pu238");
 		nugget_pu239 = new ItemRadioactive(1.5F).setUnlocalizedName("nugget_pu239").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pu239");
 		nugget_pu240 = new ItemRadioactive(1.5F).setUnlocalizedName("nugget_pu240").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pu240");
+		nugget_pu_mix = new ItemRadioactive(1.5F).setUnlocalizedName("nugget_pu_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pu_mix");
 		nugget_neptunium = new ItemRadioactive(1.5F).setUnlocalizedName("nugget_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_neptunium");
 		nugget_polonium = new ItemRadioactive(3.5F).setUnlocalizedName("nugget_polonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_polonium");
 		plate_titanium = new Item().setUnlocalizedName("plate_titanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_titanium");
@@ -4454,6 +4498,7 @@ public class ModItems {
 		GameRegistry.registerItem(ingot_pu238, ingot_pu238.getUnlocalizedName());
 		GameRegistry.registerItem(ingot_pu239, ingot_pu239.getUnlocalizedName());
 		GameRegistry.registerItem(ingot_pu240, ingot_pu240.getUnlocalizedName());
+		GameRegistry.registerItem(ingot_pu_mix, ingot_pu_mix.getUnlocalizedName());
 		GameRegistry.registerItem(ingot_neptunium, ingot_neptunium.getUnlocalizedName());
 		GameRegistry.registerItem(ingot_polonium, ingot_polonium.getUnlocalizedName());
 		GameRegistry.registerItem(ingot_titanium, ingot_titanium.getUnlocalizedName());
@@ -4502,7 +4547,7 @@ public class ModItems {
 		GameRegistry.registerItem(ingot_meteorite_forged, ingot_meteorite_forged.getUnlocalizedName());
 		GameRegistry.registerItem(blade_meteorite, blade_meteorite.getUnlocalizedName());
 
-		//Dusts & Other
+		//Misc Ingots
 		GameRegistry.registerItem(ingot_phosphorus, ingot_phosphorus.getUnlocalizedName());
 		GameRegistry.registerItem(lithium, lithium.getUnlocalizedName());
 		GameRegistry.registerItem(ingot_semtex, ingot_semtex.getUnlocalizedName());
@@ -4510,6 +4555,29 @@ public class ModItems {
 		GameRegistry.registerItem(rocket_fuel, rocket_fuel.getUnlocalizedName());
 		GameRegistry.registerItem(ingot_fiberglass, ingot_fiberglass.getUnlocalizedName());
 		GameRegistry.registerItem(ingot_asbestos, ingot_asbestos.getUnlocalizedName());
+		
+		//Billets
+		GameRegistry.registerItem(billet_uranium, billet_uranium.getUnlocalizedName());
+		GameRegistry.registerItem(billet_u233, billet_u233.getUnlocalizedName());
+		GameRegistry.registerItem(billet_u235, billet_u235.getUnlocalizedName());
+		GameRegistry.registerItem(billet_u238, billet_u238.getUnlocalizedName());
+		GameRegistry.registerItem(billet_th232, billet_th232.getUnlocalizedName());
+		GameRegistry.registerItem(billet_plutonium, billet_plutonium.getUnlocalizedName());
+		GameRegistry.registerItem(billet_pu238, billet_pu238.getUnlocalizedName());
+		GameRegistry.registerItem(billet_pu239, billet_pu239.getUnlocalizedName());
+		GameRegistry.registerItem(billet_pu240, billet_pu240.getUnlocalizedName());
+		GameRegistry.registerItem(billet_pu_mix, billet_pu_mix.getUnlocalizedName());
+		GameRegistry.registerItem(billet_neptunium, billet_neptunium.getUnlocalizedName());
+		GameRegistry.registerItem(billet_polonium, billet_polonium.getUnlocalizedName());
+		GameRegistry.registerItem(billet_schrabidium, billet_schrabidium.getUnlocalizedName());
+		GameRegistry.registerItem(billet_solinium, billet_solinium.getUnlocalizedName());
+		GameRegistry.registerItem(billet_uranium_fuel, billet_uranium_fuel.getUnlocalizedName());
+		GameRegistry.registerItem(billet_thorium_fuel, billet_thorium_fuel.getUnlocalizedName());
+		GameRegistry.registerItem(billet_plutonium_fuel, billet_plutonium_fuel.getUnlocalizedName());
+		GameRegistry.registerItem(billet_mox_fuel, billet_mox_fuel.getUnlocalizedName());
+		GameRegistry.registerItem(billet_schrabidium_fuel, billet_schrabidium_fuel.getUnlocalizedName());
+		
+		//Dusts % Other
 		GameRegistry.registerItem(nugget_mercury, nugget_mercury.getUnlocalizedName());
 		GameRegistry.registerItem(bottle_mercury, bottle_mercury.getUnlocalizedName());
 		GameRegistry.registerItem(coke, coke.getUnlocalizedName());
@@ -4650,6 +4718,7 @@ public class ModItems {
 		GameRegistry.registerItem(nugget_pu238, nugget_pu238.getUnlocalizedName());
 		GameRegistry.registerItem(nugget_pu239, nugget_pu239.getUnlocalizedName());
 		GameRegistry.registerItem(nugget_pu240, nugget_pu240.getUnlocalizedName());
+		GameRegistry.registerItem(nugget_pu_mix, nugget_pu_mix.getUnlocalizedName());
 		GameRegistry.registerItem(nugget_neptunium, nugget_neptunium.getUnlocalizedName());
 		GameRegistry.registerItem(nugget_polonium, nugget_polonium.getUnlocalizedName());
 		GameRegistry.registerItem(nugget_lead, nugget_lead.getUnlocalizedName());

src/main/java/com/hbm/items/machine/ItemChemistryTemplate.java

@@ -85,6 +85,7 @@ public class ItemChemistryTemplate extends Item {
 		SOLID_FUEL,
 		ELECTROLYSIS,
 		XENON,
+		XENON_OXY,
 		SATURN,
 		BALEFIRE,
 		SCHRABIDIC,
@@ -255,7 +256,9 @@ public class ItemChemistryTemplate extends Item {
         case ELECTROLYSIS:
         	return 400;
         case XENON:
-        	return 600;
+        	return 300;
+        case XENON_OXY:
+        	return 20;
         case SATURN:
         	return 60;
         case BALEFIRE:

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

@@ -354,6 +354,9 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reinforced_lamp_off), 1), new Object[] { "FFF", "FBF", "FFF", 'F', Blocks.iron_bars, 'B', Blocks.redstone_lamp });
 		GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reinforced_sand), 8), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.sandstone });
 
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.lamp_tritium_green_off, 1), new Object[] { "GPG", "1T2", "GPG", 'G', "blockGlass", 'P', ModItems.powder_fire, 'T', ModItems.cell_tritium, '1', "dustSulfur", '2', "dustCopper" }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.lamp_tritium_blue_off, 1), new Object[] { "GPG", "1T2", "GPG", 'G', "blockGlass", 'P', ModItems.powder_fire, 'T', ModItems.cell_tritium, '1', "dustAluminum", '2', ModItems.powder_strontium }));
+		
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.barbed_wire, 16), new Object[] { "AIA", "I I", "AIA", 'A', ModItems.wire_aluminium, 'I', "ingotIron" }));
 		GameRegistry.addRecipe(new ItemStack(ModBlocks.barbed_wire_fire, 8), new Object[] { "BBB", "BIB", "BBB", 'B', ModBlocks.barbed_wire, 'I', ModItems.powder_fire });
 		GameRegistry.addRecipe(new ItemStack(ModBlocks.barbed_wire_poison, 8), new Object[] { "BBB", "BIB", "BBB", 'B', ModBlocks.barbed_wire, 'I', ModItems.powder_poison });

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

@@ -140,6 +140,8 @@ public class TileEntityMachineDiesel extends TileEntityMachineBase implements IS
 	
 	public int getHEFromFuel() {
 		FluidType type = tank.getTankType();
+		if(type.name().equals(FluidType.HYDROGEN.name()))
+			return 1000;
 		if(type.name().equals(FluidType.DIESEL.name()))
 			return 500;
 		if(type.name().equals(FluidType.PETROIL.name()))