flixes

changelog

@@ -1,22 +1,11 @@
-## Added
-* Settings tool
-  * Allows settings of blocks and machines to be copied
-  * Uses settings such as conveyor item filters, fluid types and liquid metal types
-* Pyrolysis oven
-  * An oil 3 machine with multiple applications
-  * Can solidify most oils like a solidifier, but is way more efficient
-  * Can create syngas with high efficiency from coal, coke and biomass
-  * Large amounts of tar can be processed into fine soot, the base ingredient for fullerene
-  * Upgrades are not implemented yet
-  * Has a very short "chimney", exhaust pipes have to be connected there to work
-  * If no exhaust pipes are connected, the chimney will spawn particles
-
 ## Changed
-* Most loot piles now have configurable loot pools
-* The ntmsatellites command now has the "list" parameter which shows all active satellites in orbit
-* Burning in the nether in 528 mode now has a config option, and it no longer affects NPCs
-* Jet fuel can now be solidified
+* Pyrolysis recipes have been added
+  * Bedrock ores can be roasted at much higher speeds
+  * Pyrolysis ovens can now turn 4,000mB of coker gas into 500mB refgas
+  * Hydrogen + coal can be turned into heavy oil, heavy oil + coal turns into coalgas directly
+* The CCGT startup and shutdown sounds are now affected by mufflers
+* Armor battery packs now have recipes
 
 ## Fixed
-* Fixed some things not using variable max charge for armor mods, like static pads and DNT nanosuit tooltips
-* Fixed arc furnace recipe config parser breaking when reading fluid recipes
+* Crash caused by new system gun init on servers
+* Fixed chemfac output slots not being marked as outputs, not granting achievements and allowing items to be inserted

gradle.properties

@@ -1,6 +1,6 @@
 mod_version=1.0.27
 # Empty build number makes a release type
-mod_build_number=5089
+mod_build_number=5090
 
 credits=HbMinecraft,\
   \ rodolphito (explosion algorithms),\

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

@@ -183,6 +183,11 @@ public class ConsumableRecipes {
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.pads_slime, 1), new Object[] { "SPS", "DSD", "SPS", 'S', KEY_SLIME, 'P', ModItems.pads_rubber, 'D', ModItems.ducttape });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.pads_static, 1), new Object[] { "CDC", "ISI", "CDC", 'C', CU.ingot(), 'D', ModItems.ducttape, 'I', ANY_RUBBER.ingot(), 'S', ModItems.pads_slime });
 		
+		//Batteries
+		CraftingManager.addRecipeAuto(new ItemStack(ModItems.armor_battery, 1), new Object[] { "PCP", "PCP", "PCP", 'P', STEEL.plate(), 'C', ModBlocks.capacitor_gold });
+		CraftingManager.addRecipeAuto(new ItemStack(ModItems.armor_battery_mk2, 1), new Object[] { "PCP", "PCP", "PCP", 'P', ANY_PLASTIC.ingot(), 'C', ModBlocks.capacitor_niobium });
+		CraftingManager.addRecipeAuto(new ItemStack(ModItems.armor_battery_mk3, 1), new Object[] { "PCP", "PCP", "PCP", 'P', GOLD.plate(), 'C', ModBlocks.block_tantalium });
+		
 		//Special Mods
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.horseshoe_magnet, 1), new Object[] { "L L", "I I", "ILI", 'L', ModItems.lodestone, 'I', IRON.ingot() });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.industrial_magnet, 1), new Object[] { "SMS", " B ", "SMS", 'S', STEEL.ingot(), 'M', ModItems.horseshoe_magnet, 'B', ModBlocks.fusion_conductor });

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

@@ -5,10 +5,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.function.Consumer;
 
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
 import com.hbm.render.anim.BusAnimation;
 import com.hbm.render.anim.HbmAnimations.AnimType;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 
 import net.minecraft.util.ResourceLocation;
 

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

@@ -8,6 +8,7 @@ import com.hbm.handler.GunConfiguration;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ItemAmmoEnums.Ammo12Gauge;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.lib.HbmCollection;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
 import com.hbm.main.ResourceManager;
@@ -19,7 +20,6 @@ import com.hbm.potion.HbmPotion;
 import com.hbm.render.anim.BusAnimation;
 import com.hbm.render.anim.BusAnimationSequence;
 import com.hbm.render.anim.HbmAnimations.AnimType;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraft.entity.Entity;

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

@@ -7,6 +7,7 @@ import com.hbm.handler.CasingEjector;
 import com.hbm.handler.GunConfiguration;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.items.ItemAmmoEnums.Ammo20Gauge;
 import com.hbm.lib.HbmCollection;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
@@ -15,7 +16,6 @@ import com.hbm.particle.SpentCasing.CasingType;
 import com.hbm.render.anim.BusAnimation;
 import com.hbm.render.anim.BusAnimationSequence;
 import com.hbm.render.anim.HbmAnimations.AnimType;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;

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

@@ -5,12 +5,12 @@ import com.hbm.handler.CasingEjector;
 import com.hbm.handler.GunConfiguration;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.items.ItemAmmoEnums.Ammo22LR;
 import com.hbm.lib.HbmCollection;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
 import com.hbm.particle.SpentCasing;
 import com.hbm.particle.SpentCasing.CasingType;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 
 public class Gun22LRFactory {
 	

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

@@ -8,6 +8,7 @@ import com.hbm.handler.CasingEjector;
 import com.hbm.handler.GunConfiguration;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.items.ItemAmmoEnums.Ammo357Magnum;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
 import com.hbm.main.ResourceManager;
@@ -16,7 +17,6 @@ import com.hbm.particle.SpentCasing.CasingType;
 import com.hbm.lib.ModDamageSource;
 import com.hbm.potion.HbmPotion;
 import com.hbm.render.anim.HbmAnimations.AnimType;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.Vec3;

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

@@ -12,6 +12,7 @@ import com.hbm.handler.CasingEjector;
 import com.hbm.handler.GunConfiguration;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.items.ItemAmmoEnums.Ammo44Magnum;
 import com.hbm.lib.HbmCollection;
 import com.hbm.lib.RefStrings;
@@ -23,8 +24,6 @@ import com.hbm.particle.SpentCasing;
 import com.hbm.particle.SpentCasing.CasingType;
 import com.hbm.potion.HbmPotion;
 import com.hbm.render.anim.HbmAnimations.AnimType;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
-
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.potion.PotionEffect;

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

@@ -6,6 +6,7 @@ import com.hbm.handler.BulletConfiguration;
 import com.hbm.handler.GunConfiguration;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.items.ItemAmmoEnums.Ammo45ACP;
 import com.hbm.lib.HbmCollection;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
@@ -14,7 +15,6 @@ import com.hbm.particle.SpentCasing.CasingType;
 import com.hbm.render.anim.BusAnimation;
 import com.hbm.render.anim.BusAnimationSequence;
 import com.hbm.render.anim.HbmAnimations.AnimType;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 
 public class Gun45ACPFactory {
 	

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

@@ -14,6 +14,7 @@ import com.hbm.handler.CasingEjector;
 import com.hbm.handler.GunConfiguration;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.items.ItemAmmoEnums.Ammo4Gauge;
 import com.hbm.lib.HbmCollection;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
@@ -27,8 +28,6 @@ import com.hbm.potion.HbmPotion;
 import com.hbm.render.anim.BusAnimation;
 import com.hbm.render.anim.BusAnimationSequence;
 import com.hbm.render.anim.HbmAnimations.AnimType;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
-
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraft.entity.EntityCreature;
 import net.minecraft.entity.EntityLivingBase;

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

@@ -5,12 +5,12 @@ import com.hbm.handler.CasingEjector;
 import com.hbm.handler.GunConfiguration;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.items.ItemAmmoEnums.Ammo50AE;
 import com.hbm.lib.HbmCollection;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
 import com.hbm.particle.SpentCasing;
 import com.hbm.particle.SpentCasing.CasingType;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 
 public class Gun50AEFactory {
 	

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

@@ -9,6 +9,7 @@ import com.hbm.handler.CasingEjector;
 import com.hbm.handler.GunConfiguration;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.items.ItemAmmoEnums.Ammo50BMG;
 import com.hbm.items.ItemAmmoEnums.AmmoLunaticSniper;
 import com.hbm.lib.HbmCollection;
@@ -22,7 +23,6 @@ import com.hbm.potion.HbmPotion;
 import com.hbm.render.anim.BusAnimation;
 import com.hbm.render.anim.BusAnimationSequence;
 import com.hbm.render.anim.HbmAnimations.AnimType;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 import com.hbm.util.ContaminationUtil;
 import com.hbm.util.ContaminationUtil.ContaminationType;
 import com.hbm.util.ContaminationUtil.HazardType;

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

@@ -10,6 +10,7 @@ import com.hbm.handler.GunConfiguration;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ItemAmmoEnums.Ammo556mm;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.lib.HbmCollection;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
 import com.hbm.packet.PacketDispatcher;
@@ -20,8 +21,6 @@ import com.hbm.potion.HbmPotion;
 import com.hbm.render.anim.BusAnimation;
 import com.hbm.render.anim.BusAnimationSequence;
 import com.hbm.render.anim.HbmAnimations.AnimType;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
-
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.potion.PotionEffect;

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

@@ -6,11 +6,11 @@ import com.hbm.handler.GunConfiguration;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ItemAmmoEnums.Ammo5mm;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.lib.HbmCollection;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
 import com.hbm.particle.SpentCasing;
 import com.hbm.particle.SpentCasing.CasingType;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 
 public class Gun5mmFactory {
 	

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

@@ -7,6 +7,7 @@ import com.hbm.handler.GunConfiguration;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ItemAmmoEnums.Ammo75Bolt;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.lib.HbmCollection;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
 import com.hbm.lib.ModDamageSource;
@@ -16,8 +17,6 @@ import com.hbm.potion.HbmPotion;
 import com.hbm.render.anim.BusAnimation;
 import com.hbm.render.anim.BusAnimationSequence;
 import com.hbm.render.anim.HbmAnimations.AnimType;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
-
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.nbt.NBTTagCompound;

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

@@ -7,6 +7,7 @@ import com.hbm.handler.CasingEjector;
 import com.hbm.handler.GunConfiguration;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.items.ItemAmmoEnums.Ammo762NATO;
 import com.hbm.lib.HbmCollection;
 import com.hbm.lib.RefStrings;
@@ -17,7 +18,6 @@ import com.hbm.potion.HbmPotion;
 import com.hbm.render.anim.BusAnimation;
 import com.hbm.render.anim.BusAnimationSequence;
 import com.hbm.render.anim.HbmAnimations.AnimType;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.ResourceLocation;

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

@@ -8,11 +8,11 @@ import com.hbm.handler.CasingEjector;
 import com.hbm.handler.GunConfiguration;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.items.ItemAmmoEnums.Ammo9mm;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
 import com.hbm.particle.SpentCasing;
 import com.hbm.particle.SpentCasing.CasingType;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 
 public class Gun9mmFactory {
 	

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

@@ -10,9 +10,9 @@ import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ItemAmmoEnums.AmmoDart;
 import com.hbm.items.ModItems;
 import com.hbm.items.weapon.ItemGunDart;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
 import com.hbm.main.MainRegistry;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;

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

@@ -9,10 +9,10 @@ import com.hbm.interfaces.IBomb;
 import com.hbm.interfaces.IBomb.BombReturnCode;
 import com.hbm.main.MainRegistry;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
 import com.hbm.packet.PacketDispatcher;
 import com.hbm.packet.toclient.PlayerInformPacket;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 import com.hbm.util.ChatBuilder;
 
 import net.minecraft.block.Block;

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

@@ -16,6 +16,7 @@ import com.hbm.items.ItemAmmoEnums.AmmoCoilgun;
 import com.hbm.items.ItemAmmoEnums.AmmoFireExt;
 import com.hbm.items.ItemAmmoEnums.AmmoFlamethrower;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
 import com.hbm.lib.ModDamageSource;
 import com.hbm.main.MainRegistry;
@@ -23,7 +24,6 @@ import com.hbm.packet.PacketDispatcher;
 import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.packet.toclient.ExplosionKnockbackPacket;
 import com.hbm.potion.HbmPotion;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 import com.hbm.tileentity.IRepairable;
 import com.hbm.tileentity.IRepairable.EnumExtinguishType;
 import com.hbm.util.CompatExternal;

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

@@ -15,11 +15,11 @@ import com.hbm.handler.GunConfiguration;
 import com.hbm.handler.radiation.ChunkRadiationManager;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.items.ItemAmmoEnums.AmmoFatman;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
 import com.hbm.packet.PacketDispatcher;
 import com.hbm.packet.toclient.AuxParticlePacketNT;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraft.init.Blocks;

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

@@ -7,11 +7,11 @@ import com.hbm.handler.BulletConfiguration;
 import com.hbm.handler.GunConfiguration;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
 import com.hbm.render.anim.BusAnimation;
 import com.hbm.render.anim.BusAnimationSequence;
 import com.hbm.render.anim.HbmAnimations.AnimType;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 
 public class GunGaussFactory {
 	

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

@@ -8,6 +8,7 @@ import com.hbm.handler.CasingEjector;
 import com.hbm.handler.GunConfiguration;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.items.ItemAmmoEnums.AmmoGrenade;
 import com.hbm.lib.HbmCollection;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
@@ -17,8 +18,6 @@ import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.particle.SpentCasing;
 import com.hbm.particle.SpentCasing.CasingType;
 import com.hbm.render.anim.HbmAnimations.AnimType;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
-
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.MathHelper;

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

@@ -8,11 +8,10 @@ import com.hbm.handler.BulletConfiguration;
 import com.hbm.handler.GunConfiguration;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
 import com.hbm.lib.ModDamageSource;
 import com.hbm.potion.HbmPotion;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
-
 import net.minecraft.block.Block;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.potion.PotionEffect;

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

@@ -5,9 +5,8 @@ import java.util.ArrayList;
 import com.hbm.handler.BulletConfigSyncingUtil;
 import com.hbm.handler.BulletConfiguration;
 import com.hbm.handler.GunConfiguration;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
-
 import net.minecraft.util.EnumChatFormatting;
 
 public class GunPoweredFactory {

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

@@ -10,13 +10,12 @@ import com.hbm.handler.BulletConfiguration;
 import com.hbm.handler.GunConfiguration;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.items.ItemAmmoEnums.AmmoRocket;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
 import com.hbm.render.anim.BusAnimation;
 import com.hbm.render.anim.BusAnimationSequence;
 import com.hbm.render.anim.HbmAnimations.AnimType;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.world.World;
 

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

@@ -9,9 +9,8 @@ import com.hbm.handler.GunConfiguration;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ItemAmmoEnums.AmmoStinger;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
-
 import net.minecraft.entity.player.EntityPlayer;
 
 public class GunRocketHomingFactory {

src/main/java/com/hbm/interfaces/IHoldableWeapon.java

@@ -1,6 +1,6 @@
 package com.hbm.interfaces;
 
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
+import com.hbm.items.weapon.sedna.Crosshair;
 
 public interface IHoldableWeapon {
 	

src/main/java/com/hbm/inventory/container/ContainerChemfac.java

@@ -1,5 +1,6 @@
 package com.hbm.inventory.container;
 
+import com.hbm.inventory.SlotCraftingOutput;
 import com.hbm.inventory.SlotUpgrade;
 import com.hbm.tileentity.machine.TileEntityMachineChemfac;
 
@@ -35,7 +36,7 @@ public class ContainerChemfac extends Container {
 
 				for(int k = 0; k < 2; k++) {
 					for(int l = 0; l < 2; l++) {
-						this.addSlotToContainer(new Slot(tile, this.inventorySlots.size(), 69 + j * 110 + l * 16, 14  + i * 38 + k * 16));
+						this.addSlotToContainer(new SlotCraftingOutput(playerInv.player, tile, this.inventorySlots.size(), 69 + j * 110 + l * 16, 14  + i * 38 + k * 16));
 					}
 				}
 				

src/main/java/com/hbm/inventory/recipes/PyroOvenRecipes.java

@@ -22,6 +22,9 @@ import com.hbm.inventory.recipes.loader.SerializableRecipe;
 import com.hbm.items.ItemEnums.EnumAshType;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemFluidIcon;
+import com.hbm.items.special.ItemBedrockOreNew;
+import com.hbm.items.special.ItemBedrockOreNew.BedrockOreGrade;
+import com.hbm.items.special.ItemBedrockOreNew.BedrockOreType;
 
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
@@ -63,7 +66,17 @@ public class PyroOvenRecipes extends SerializableRecipe {
 		registerSFAuto(XYLENE);
 		registerSFAuto(BALEFIRE, 24_000_000L, ModItems.solid_fuel_bf);
 		
-		//other
+		//bedrock ores
+		
+		for(BedrockOreType type : BedrockOreType.values()) {
+			recipes.add(new PyroOvenRecipe(10).in(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.BASE, type))).out(new FluidStack(Fluids.VITRIOL, 50)).out(ItemBedrockOreNew.make(BedrockOreGrade.BASE_ROASTED, type)));
+			recipes.add(new PyroOvenRecipe(10).in(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY, type))).out(new FluidStack(Fluids.VITRIOL, 50)).out(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_ROASTED, type)));
+			recipes.add(new PyroOvenRecipe(10).in(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.SULFURIC_BYPRODUCT, type))).out(new FluidStack(Fluids.VITRIOL, 50)).out(ItemBedrockOreNew.make(BedrockOreGrade.SULFURIC_ROASTED, type)));
+			recipes.add(new PyroOvenRecipe(10).in(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.SOLVENT_BYPRODUCT, type))).out(new FluidStack(Fluids.VITRIOL, 50)).out(ItemBedrockOreNew.make(BedrockOreGrade.SOLVENT_ROASTED, type)));
+			recipes.add(new PyroOvenRecipe(10).in(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.RAD_BYPRODUCT, type))).out(new FluidStack(Fluids.VITRIOL, 50)).out(ItemBedrockOreNew.make(BedrockOreGrade.RAD_ROASTED, type)));
+		}
+		
+		//syngas from coal
 		recipes.add(new PyroOvenRecipe(100)
 				.in(new FluidStack(Fluids.STEAM, 500)).in(new OreDictStack(COAL.gem()))
 				.out(new FluidStack(Fluids.SYNGAS, 1_000)));
@@ -73,12 +86,38 @@ public class PyroOvenRecipes extends SerializableRecipe {
 		recipes.add(new PyroOvenRecipe(100)
 				.in(new FluidStack(Fluids.STEAM, 250)).in(new OreDictStack(ANY_COKE.gem()))
 				.out(new FluidStack(Fluids.SYNGAS, 1_000)));
+		//syngas from biomass
 		recipes.add(new PyroOvenRecipe(100)
 				.in(new ComparableStack(ModItems.biomass, 4))
 				.out(new FluidStack(Fluids.SYNGAS, 1_000)).out(new ItemStack(Items.coal, 1, 1)));
+		//soot from tar
 		recipes.add(new PyroOvenRecipe(40)
 				.out(new FluidStack(Fluids.HYDROGEN, 250)).in(new OreDictStack(ANY_TAR.any(), 8))
 				.out(new FluidStack(Fluids.CARBONDIOXIDE, 1_000)).out(DictFrame.fromOne(ModItems.powder_ash, EnumAshType.SOOT)));
+		//heavyoil from coal
+		recipes.add(new PyroOvenRecipe(100)
+				.in(new FluidStack(Fluids.HYDROGEN, 500)).in(new OreDictStack(COAL.gem()))
+				.out(new FluidStack(Fluids.HEAVYOIL, 1_000)));
+		recipes.add(new PyroOvenRecipe(100)
+				.in(new FluidStack(Fluids.HYDROGEN, 500)).in(new OreDictStack(COAL.dust()))
+				.out(new FluidStack(Fluids.HEAVYOIL, 1_000)));
+		recipes.add(new PyroOvenRecipe(100)
+				.in(new FluidStack(Fluids.HYDROGEN, 250)).in(new OreDictStack(ANY_COKE.gem()))
+				.out(new FluidStack(Fluids.HEAVYOIL, 1_000)));
+		//coalgas from coal
+		recipes.add(new PyroOvenRecipe(50)
+				.in(new FluidStack(Fluids.HEAVYOIL, 500)).in(new OreDictStack(COAL.gem()))
+				.out(new FluidStack(Fluids.COALGAS, 1_000)));
+		recipes.add(new PyroOvenRecipe(50)
+				.in(new FluidStack(Fluids.HEAVYOIL, 500)).in(new OreDictStack(COAL.dust()))
+				.out(new FluidStack(Fluids.COALGAS, 1_000)));
+		recipes.add(new PyroOvenRecipe(50)
+				.in(new FluidStack(Fluids.HEAVYOIL, 500)).in(new OreDictStack(ANY_COKE.gem()))
+				.out(new FluidStack(Fluids.COALGAS, 1_000)));
+		//refgas from coker gas
+		recipes.add(new PyroOvenRecipe(60)
+				.in(new FluidStack(GAS_COKER, 4_000))
+				.out(new FluidStack(Fluids.REFORMGAS, 100)));
 	}
 
 	private static void registerSFAuto(FluidType fluid) {

src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java

@@ -196,7 +196,7 @@ public class ShredderRecipes extends SerializableRecipe {
 		ShredderRecipes.setRecipe(ModBlocks.boxcar, new ItemStack(ModItems.powder_steel, 32));
 		ShredderRecipes.setRecipe(ModItems.ingot_schrabidate, new ItemStack(ModItems.powder_schrabidate, 1));
 		ShredderRecipes.setRecipe(ModBlocks.block_schrabidate, new ItemStack(ModItems.powder_schrabidate, 9));
-		ShredderRecipes.setRecipe(ModItems.coal_infernal, new ItemStack(ModItems.powder_coal, 3));
+		ShredderRecipes.setRecipe(ModItems.coal_infernal, new ItemStack(ModItems.powder_coal, 2));
 		ShredderRecipes.setRecipe(Items.fermented_spider_eye, new ItemStack(ModItems.powder_poison, 3));
 		ShredderRecipes.setRecipe(Items.poisonous_potato, new ItemStack(ModItems.powder_poison, 1));
 		ShredderRecipes.setRecipe(ModBlocks.ore_tektite_osmiridium, new ItemStack(ModItems.powder_tektite, 1));

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

@@ -8,11 +8,11 @@ import com.hbm.config.GeneralConfig;
 import com.hbm.interfaces.IBomb;
 import com.hbm.interfaces.IBomb.BombReturnCode;
 import com.hbm.interfaces.IHoldableWeapon;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.lib.Library;
 import com.hbm.main.MainRegistry;
 import com.hbm.packet.PacketDispatcher;
 import com.hbm.packet.toclient.PlayerInformPacket;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 import com.hbm.util.ChatBuilder;
 
 import net.minecraft.entity.player.EntityPlayer;

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

@@ -4,7 +4,7 @@ import com.hbm.entity.projectile.EntityBulletBaseNT;
 import com.hbm.handler.BulletConfigSyncingUtil;
 import com.hbm.interfaces.IHoldableWeapon;
 import com.hbm.items.ModItems;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
+import com.hbm.items.weapon.sedna.Crosshair;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;

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

@@ -9,12 +9,12 @@ import com.hbm.handler.BulletConfigSyncingUtil;
 import com.hbm.handler.BulletConfiguration;
 import com.hbm.handler.GunConfiguration;
 import com.hbm.interfaces.IHoldableWeapon;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.packet.PacketDispatcher;
 import com.hbm.packet.toclient.GunAnimationPacket;
 import com.hbm.packet.toserver.GunButtonPacket;
 import com.hbm.render.anim.HbmAnimations.AnimType;
 import com.hbm.render.util.RenderScreenOverlay;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 import com.hbm.util.BobMathUtil;
 import com.hbm.util.ChatBuilder;
 

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

@@ -18,6 +18,7 @@ import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.IEquipReceiver;
 import com.hbm.items.ModItems;
 import com.hbm.items.armor.ArmorFSB;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.lib.HbmCollection;
 import com.hbm.packet.PacketDispatcher;
 import com.hbm.packet.toclient.AuxParticlePacketNT;
@@ -26,7 +27,6 @@ import com.hbm.packet.toserver.GunButtonPacket;
 import com.hbm.render.anim.BusAnimation;
 import com.hbm.render.anim.HbmAnimations.AnimType;
 import com.hbm.render.util.RenderScreenOverlay;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 import com.hbm.util.I18nUtil;
 import com.hbm.util.InventoryUtil;
 

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

@@ -10,12 +10,11 @@ import com.hbm.interfaces.IHoldableWeapon;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.items.machine.ItemFluidIcon;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.packet.PacketDispatcher;
 import com.hbm.packet.toclient.GunAnimationPacket;
 import com.hbm.render.anim.HbmAnimations.AnimType;
 import com.hbm.render.util.RenderScreenOverlay;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
-
 import api.hbm.fluid.IFillableItem;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/main/java/com/hbm/items/weapon/sedna/Crosshair.java

@@ -0,0 +1,34 @@
+package com.hbm.items.weapon.sedna;
+
+public enum Crosshair {
+
+	NONE(0, 0, 0),
+	CROSS(1, 55, 16),
+	CIRCLE(19, 55, 16),
+	SEMI(37, 55, 16),
+	KRUCK(55, 55, 16),
+	DUAL(1, 73, 16),
+	SPLIT(19, 73, 16),
+	CLASSIC(37, 73, 16),
+	BOX(55, 73, 16),
+	
+	L_CROSS(0, 90, 32),
+	L_KRUCK(32, 90, 32),
+	L_CLASSIC(64, 90, 32),
+	L_CIRCLE(96, 90, 32),
+	L_SPLIT(0, 122, 32),
+	L_ARROWS(32, 122, 32),
+	L_BOX(64, 122, 32),
+	L_CIRCUMFLEX(96, 122, 32),
+	L_RAD(0, 154, 32);
+	
+	public int x;
+	public int y;
+	public int size;
+	
+	private Crosshair(int x, int y, int size) {
+		this.x = x;
+		this.y = y;
+		this.size = size;
+	}
+}

src/main/java/com/hbm/items/weapon/sedna/GunConfig.java

@@ -6,7 +6,6 @@ import java.util.function.BiFunction;
 import com.hbm.items.weapon.sedna.ItemGunBaseNT.LambdaContext;
 import com.hbm.render.anim.BusAnimation;
 import com.hbm.render.anim.HbmAnimations.AnimType;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 
 import net.minecraft.item.ItemStack;
 

src/main/java/com/hbm/items/weapon/sedna/ItemGunBaseNT.java

@@ -11,6 +11,8 @@ import com.hbm.render.anim.HbmAnimations.AnimType;
 import com.hbm.render.util.RenderScreenOverlay;
 import com.hbm.util.EnumUtil;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -169,6 +171,7 @@ public class ItemGunBaseNT extends Item implements IKeybindReceiver, IEquipRecei
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public void renderHUD(Pre event, ElementType type, EntityPlayer player, ItemStack stack) {
 		if(type == ElementType.CROSSHAIRS) {
 			event.setCanceled(true);

src/main/java/com/hbm/items/weapon/sedna/factory/GunFactory.java

@@ -2,13 +2,13 @@ package com.hbm.items.weapon.sedna.factory;
 
 import com.hbm.items.ModItems;
 import com.hbm.items.weapon.sedna.BulletConfig;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.items.weapon.sedna.GunConfig;
 import com.hbm.items.weapon.sedna.ItemGunBaseNT;
 import com.hbm.items.weapon.sedna.Receiver;
 import com.hbm.items.weapon.sedna.mags.MagazineRevolverDrum;
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
-import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 
 import net.minecraft.item.Item;
 

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

@@ -3,7 +3,7 @@ package com.hbm.lib;
 public class RefStrings {
 	public static final String MODID = "hbm";
 	public static final String NAME = "Hbm's Nuclear Tech Mod";
-	public static final String VERSION = "1.0.27 BETA (5089)";
+	public static final String VERSION = "1.0.27 BETA (5090)";
 	//HBM's Beta Naming Convention:
 	//V T (X)
 	//V -> next release version

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

@@ -6,6 +6,7 @@ import org.lwjgl.opengl.GL12;
 import com.hbm.extprop.HbmPlayerProps;
 import com.hbm.interfaces.Spaghetti;
 import com.hbm.interfaces.Untested;
+import com.hbm.items.weapon.sedna.Crosshair;
 import com.hbm.lib.RefStrings;
 
 import net.minecraft.client.Minecraft;
@@ -352,37 +353,4 @@ public class RenderScreenOverlay {
 		GL11.glEnable(GL11.GL_ALPHA_TEST);
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 	}
-	
-	public enum Crosshair {
-
-		NONE(0, 0, 0),
-		CROSS(1, 55, 16),
-		CIRCLE(19, 55, 16),
-		SEMI(37, 55, 16),
-		KRUCK(55, 55, 16),
-		DUAL(1, 73, 16),
-		SPLIT(19, 73, 16),
-		CLASSIC(37, 73, 16),
-		BOX(55, 73, 16),
-		L_CROSS(0, 90, 32),
-		L_KRUCK(32, 90, 32),
-		L_CLASSIC(64, 90, 32),
-		L_CIRCLE(96, 90, 32),
-		L_SPLIT(0, 122, 32),
-		L_ARROWS(32, 122, 32),
-		L_BOX(64, 122, 32),
-		L_CIRCUMFLEX(96, 122, 32),
-		L_RAD(0, 154, 32);
-		
-		public int x;
-		public int y;
-		public int size;
-		
-		private Crosshair(int x, int y, int size) {
-			this.x = x;
-			this.y = y;
-			this.size = size;
-		}
-	}
-
 }

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

@@ -180,12 +180,12 @@ public class TileEntityMachineTurbineGas extends TileEntityMachineBase implement
 				
 				if(audio == null) { //if there is no sound playing, start it
 					
-					audio = MainRegistry.proxy.getLoopedSound("hbm:block.turbinegasRunning", xCoord, yCoord, zCoord, 1.0F, 20F, 2.0F);
+					audio = MainRegistry.proxy.getLoopedSound("hbm:block.turbinegasRunning", xCoord, yCoord, zCoord, getVolume(1.0F), 20F, 2.0F);
 					audio.startSound();
 					
 				} else if(!audio.isPlaying()) {
 					audio.stopSound();
-					audio = MainRegistry.proxy.getLoopedSound("hbm:block.turbinegasRunning", xCoord, yCoord, zCoord, 1.0F, 20F, 2.0F);
+					audio = MainRegistry.proxy.getLoopedSound("hbm:block.turbinegasRunning", xCoord, yCoord, zCoord, getVolume(1.0F), 20F, 2.0F);
 					audio.startSound();
 				}
 				
@@ -235,7 +235,7 @@ public class TileEntityMachineTurbineGas extends TileEntityMachineBase implement
 		}
 		
 		if(counter == 50) {
-			worldObj.playSoundEffect(xCoord, yCoord + 2, zCoord, "hbm:block.turbinegasStartup", 1F, 1.0F);
+			worldObj.playSoundEffect(xCoord, yCoord + 2, zCoord, "hbm:block.turbinegasStartup", getVolume(1.0F), 1.0F);
 		}
 			
 		if(counter == 580) {
@@ -259,7 +259,7 @@ public class TileEntityMachineTurbineGas extends TileEntityMachineBase implement
 			
 			if(counter == 225) {
 				
-				worldObj.playSoundEffect(xCoord, yCoord + 2, zCoord, "hbm:block.turbinegasShutdown", 1F, 1.0F);
+				worldObj.playSoundEffect(xCoord, yCoord + 2, zCoord, "hbm:block.turbinegasShutdown", getVolume(1.0F), 1.0F);
 				
 				rpmLast = rpm;
 				tempLast = temp;

src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachinePyroOven.java

@@ -1,19 +1,26 @@
 package com.hbm.tileentity.machine.oil;
 
+import java.util.List;
+
+import com.hbm.blocks.ModBlocks;
 import com.hbm.handler.pollution.PollutionHandler;
 import com.hbm.handler.pollution.PollutionHandler.PollutionType;
+import com.hbm.inventory.UpgradeManager;
 import com.hbm.inventory.container.ContainerPyroOven;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.inventory.gui.GUIPyroOven;
 import com.hbm.inventory.recipes.PyroOvenRecipes;
 import com.hbm.inventory.recipes.PyroOvenRecipes.PyroOvenRecipe;
+import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType;
 import com.hbm.lib.Library;
 import com.hbm.main.MainRegistry;
 import com.hbm.sound.AudioWrapper;
 import com.hbm.tileentity.IFluidCopiable;
 import com.hbm.tileentity.IGUIProvider;
+import com.hbm.tileentity.IUpgradeInfoProvider;
 import com.hbm.tileentity.TileEntityMachinePolluting;
+import com.hbm.util.I18nUtil;
 import com.hbm.util.fauxpointtwelve.DirPos;
 
 import api.hbm.energymk2.IEnergyReceiverMK2;
@@ -27,17 +34,18 @@ import net.minecraft.inventory.Container;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-public class TileEntityMachinePyroOven extends TileEntityMachinePolluting implements IEnergyReceiverMK2, IFluidStandardTransceiver, IGUIProvider, IFluidCopiable {
+public class TileEntityMachinePyroOven extends TileEntityMachinePolluting implements IEnergyReceiverMK2, IFluidStandardTransceiver, IGUIProvider, IUpgradeInfoProvider, IFluidCopiable {
 	
 	public long power;
 	public static final long maxPower = 1_000_000;
 	public boolean isVenting;
 	public boolean isProgressing;
 	public float progress;
-	public int consumption = 10_000;
+	public static int consumption = 10_000;
 	
 	public int prevAnim;
 	public int anim = 0;
@@ -76,16 +84,18 @@ public class TileEntityMachinePyroOven extends TileEntityMachinePolluting implem
 			ForgeDirection rot = dir.getRotation(ForgeDirection.DOWN);
 			if(smoke.getFill() > 0) this.sendFluid(smoke, worldObj, xCoord - rot.offsetX, yCoord + 3, zCoord - rot.offsetZ, Library.POS_Y);
 			
-			//UpgradeManager.eval(slots, 4, 5);
+			UpgradeManager.eval(slots, 4, 5);
+			int speed = Math.min(UpgradeManager.getLevel(UpgradeType.SPEED), 3);
+			int powerSaving = Math.min(UpgradeManager.getLevel(UpgradeType.POWER), 3);
 			
 			this.isProgressing = false;
 			this.isVenting = false;
 			
 			if(this.canProcess()) {
 				PyroOvenRecipe recipe = getMatchingRecipe();
-				this.progress += 1F / recipe.duration;
+				this.progress += 1F / (recipe.duration - speed * (recipe.duration / 4));
 				this.isProgressing = true;
-				this.power -= this.consumption;
+				this.power -= this.getConsumption(speed, powerSaving);
 				
 				if(progress >= 1F) {
 					this.progress = 0F;
@@ -153,6 +163,10 @@ public class TileEntityMachinePyroOven extends TileEntityMachinePolluting implem
 		}
 	}
 	
+	public static int getConsumption(int speed, int powerSaving) {
+		return (int) (consumption * Math.pow(speed + 1, 2)) / (powerSaving + 1);
+	}
+	
 	protected PyroOvenRecipe lastValidRecipe;
 	
 	public PyroOvenRecipe getMatchingRecipe() {
@@ -185,7 +199,10 @@ public class TileEntityMachinePyroOven extends TileEntityMachinePolluting implem
 	}
 	
 	public boolean canProcess() {
-		if(power < consumption) return false; // not enough power
+		int speed = Math.min(UpgradeManager.getLevel(UpgradeType.SPEED), 3);
+		int powerSaving = Math.min(UpgradeManager.getLevel(UpgradeType.POWER), 3);
+		if(power < this.getConsumption(speed, powerSaving)) return false; // not enough power
+		
 		PyroOvenRecipe recipe = this.getMatchingRecipe();
 		if(recipe == null) return false; // no matching recipe
 		if(recipe.inputFluid != null && tanks[0].getFill() < recipe.inputFluid.fill) return false; // not enough input fluid
@@ -325,4 +342,28 @@ public class TileEntityMachinePyroOven extends TileEntityMachinePolluting implem
 
 	@Override public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { return new ContainerPyroOven(player.inventory, this); }
 	@Override public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { return new GUIPyroOven(player.inventory, this); }
+
+	@Override
+	public boolean canProvideInfo(UpgradeType type, int level, boolean extendedInfo) {
+		return type == UpgradeType.SPEED || type == UpgradeType.POWER;
+	}
+
+	@Override
+	public void provideInfo(UpgradeType type, int level, List<String> info, boolean extendedInfo) {
+		info.add(IUpgradeInfoProvider.getStandardLabel(ModBlocks.machine_pyrooven));
+		if(type == UpgradeType.SPEED) {
+			info.add(EnumChatFormatting.GREEN + I18nUtil.resolveKey(this.KEY_DELAY, "-" + (level * 25) + "%"));
+			info.add(EnumChatFormatting.RED + I18nUtil.resolveKey(this.KEY_CONSUMPTION, "+" + (Math.pow(level + 1, 2) * 100 - 100) + "%"));
+		}
+		if(type == UpgradeType.POWER) {
+			info.add(EnumChatFormatting.GREEN + I18nUtil.resolveKey(this.KEY_CONSUMPTION, "-" + (100 - 100 / (level + 1)) + "%"));
+		}
+	}
+
+	@Override
+	public int getMaxLevel(UpgradeType type) {
+		if(type == UpgradeType.SPEED) return 3;
+		if(type == UpgradeType.POWER) return 3;
+		return 0;
+	}
 }