v1.1.0 release!

1.7.2/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java

@@ -92,6 +92,7 @@ import WayofTime.alchemicalWizardry.common.rituals.RitualEffectItemSuction;
 import WayofTime.alchemicalWizardry.common.rituals.RitualEffectJumping;
 import WayofTime.alchemicalWizardry.common.rituals.RitualEffectLava;
 import WayofTime.alchemicalWizardry.common.rituals.RitualEffectLeap;
+import WayofTime.alchemicalWizardry.common.rituals.RitualEffectLifeConduit;
 import WayofTime.alchemicalWizardry.common.rituals.RitualEffectMagnetic;
 import WayofTime.alchemicalWizardry.common.rituals.RitualEffectSoulBound;
 import WayofTime.alchemicalWizardry.common.rituals.RitualEffectSummonMeteor;
@@ -408,6 +409,7 @@ public class AlchemicalWizardry
         ItemStack efficiencyRuneStack = new ItemStack(ModBlocks.efficiencyRune);
         ItemStack runeOfSacrificeStack = new ItemStack(ModBlocks.runeOfSacrifice);
         ItemStack runeOfSelfSacrificeStack = new ItemStack(ModBlocks.runeOfSelfSacrifice);
+        ItemStack runeOfBetterCapacityStack = new ItemStack(ModBlocks.bloodRune,1,4);
         ItemStack miningSigilStackCrafted = new ItemStack(ModItems.sigilOfTheFastMiner);
         ItemStack divinationSigilStackCrafted = new ItemStack(ModItems.divinationSigil);
         ItemStack seerSigilStack = new ItemStack(ModItems.itemSeerSigil);
@@ -478,6 +480,7 @@ public class AlchemicalWizardry
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.bloodRune, 1, 1), "sbs", "bob", "srs", 's', stoneStack, 'o', magicianBloodOrbStack, 'b', emptyBucketStack, 'r', new ItemStack(ModItems.imbuedSlate)));
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.bloodRune, 1, 2), "sbs", "bob", "srs", 's', stoneStack, 'o', magicianBloodOrbStack, 'b', waterBucketStack, 'r', new ItemStack(ModItems.imbuedSlate)));
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.bloodRune, 1, 3), "sws", "ror", "sws", 's', stoneStack, 'o', new ItemStack(ModItems.masterBloodOrb), 'w', weakBloodOrbStack, 'r', new ItemStack(ModItems.demonicSlate)));
+        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.bloodRune, 1, 4), "tst", "brb", "tot", 'b', emptyBucketStack, 't', new ItemStack(Blocks.obsidian), 'r', new ItemStack(ModBlocks.bloodRune,1,1), 's', new ItemStack(ModItems.demonicSlate),'o', new ItemStack(ModItems.masterBloodOrb)));
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(airSigilStack, "fgf", "fsf", "fof", 'f', featherStack, 'g', ghastTearStack, 's', reinforcedSlateStack, 'o', apprenticeBloodOrbStack));
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(miningSigilStackCrafted, "sps", "hra", "sos", 'o', apprenticeBloodOrbStack, 's', stoneStack, 'p', ironPickaxeStack, 'h', ironShovelStack, 'a', ironAxeStack, 'r', reinforcedSlateStack));
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(runeOfSacrificeStack, "srs", "gog", "srs", 's', stoneStack, 'g', goldIngotStack, 'o', apprenticeBloodOrbStack, 'r', reinforcedSlateStack));
@@ -767,7 +770,7 @@ public class AlchemicalWizardry
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(projectileCoreStack, "mbm","aca","mom",'c', emptyCoreStack,'b',weakBloodShardStack,'m', magicalesStack,'o', magicianBloodOrbStack,'a',new ItemStack(Items.arrow)));
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(selfCoreStack,"sbs","ncn","sos",'c', emptyCoreStack, 's',sanctusStack,'b', weakBloodShardStack,'o', magicianBloodOrbStack,'n',glowstoneDustStack));
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(meleeCoreStack,"sbs","ncn","sos",'c', emptyCoreStack, 's',incendiumStack,'b', weakBloodShardStack,'o', magicianBloodOrbStack,'n',new ItemStack(Items.fire_charge)));
-        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(meleeCoreStack,"sbs","ncn","sos",'c', emptyCoreStack, 's',incendiumStack,'b', weakBloodShardStack,'o', magicianBloodOrbStack,'n',new ItemStack(Blocks.obsidian)));
+        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(toolCoreStack,"sbs","ncn","sos",'c', emptyCoreStack, 's',terraeStack,'b', weakBloodShardStack,'o', magicianBloodOrbStack,'n',new ItemStack(Blocks.obsidian)));
         GameRegistry.addRecipe(paradigmBackPlateStack,"isi","rgr","isi",'i',ironIngotStack,'r',stoneStack,'g',goldIngotStack,'s',reinforcedSlateStack);
         GameRegistry.addRecipe(outputCableStack, " si","s c"," si",'s',stoneStack,'i',ironIngotStack,'c',simpleCatalystStack); 
         
@@ -797,7 +800,7 @@ public class AlchemicalWizardry
         GameRegistry.addRecipe(new ItemStack(ModBlocks.blockSpellParadigm,1,0),"gb ","pcw","gb ",'p',paradigmBackPlateStack,'c', projectileCoreStack,'g',goldIngotStack,'b',stoneBraceStack,'w',outputCableStack);
         GameRegistry.addRecipe(new ItemStack(ModBlocks.blockSpellParadigm,1,1),"gb ","pcw","gb ",'p',paradigmBackPlateStack,'c', selfCoreStack,'g',goldIngotStack,'b',stoneBraceStack,'w',outputCableStack);
         GameRegistry.addRecipe(new ItemStack(ModBlocks.blockSpellParadigm,1,2),"gb ","pcw","gb ",'p',paradigmBackPlateStack,'c', meleeCoreStack,'g',goldIngotStack,'b',stoneBraceStack,'w',outputCableStack);
-        GameRegistry.addRecipe(new ItemStack(ModBlocks.blockSpellParadigm,1,3),"gb ","pcw","gb ",'p',paradigmBackPlateStack,'c', meleeCoreStack,'g',goldIngotStack,'b',stoneBraceStack,'w',outputCableStack);
+        GameRegistry.addRecipe(new ItemStack(ModBlocks.blockSpellParadigm,1,3),"gb ","pcw","gb ",'p',paradigmBackPlateStack,'c', toolCoreStack,'g',goldIngotStack,'b',stoneBraceStack,'w',outputCableStack);
         
         GameRegistry.addRecipe(new ItemStack(ModBlocks.blockSpellEffect,1,0),"bgb","ico","bgb",'c',flameCoreStack,'b',stoneBraceStack,'g',goldIngotStack,'i',inputCableStack,'o',outputCableStack);
         GameRegistry.addRecipe(new ItemStack(ModBlocks.blockSpellEffect,1,1),"bgb","ico","bgb",'c',iceCoreStack,'b',stoneBraceStack,'g',goldIngotStack,'i',inputCableStack,'o',outputCableStack);
@@ -976,7 +979,8 @@ public class AlchemicalWizardry
         Rituals.registerRitual("AW021Expulsion", 1, 1000000, new RitualEffectExpulsion(), "Aura of Expulsion");
         Rituals.registerRitual("AW022Supression", 1, 10000, new RitualEffectSupression(), "Dome of Supression");
         Rituals.registerRitual("AW023Zephyr", 1, 25000, new RitualEffectItemSuction(),"Call of the Zephyr");
-        Rituals.registerRitual("AW024Harvest", 1, 1000, new RitualEffectHarvest(), "Reap of the Harvest Moon");
+        Rituals.registerRitual("AW024Harvest", 1, 20000, new RitualEffectHarvest(), "Reap of the Harvest Moon");
+        Rituals.registerRitual("AW025Conduit", 2, 2000000, new RitualEffectLifeConduit(), "Cry of the Eternal Soul");
         //Rituals.registerRitual(1,100,new RitualEffectApiaryOverclock(),"Apiary Overclock"));
     }
     

1.7.2/main/java/WayofTime/alchemicalWizardry/api/harvest/HarvestRegistry.java

@@ -12,6 +12,7 @@ public class HarvestRegistry
 	
 	public static void registerHarvestHandler(IHarvestHandler handler)
 	{
+		System.out.println("Heeeeelllooooo");
 		handlerList.add(handler);
 	}
 	

1.7.2/main/java/WayofTime/alchemicalWizardry/common/block/BloodRune.java

@@ -22,6 +22,7 @@ public class BloodRune extends Block
     private IIcon altarCapacityRuneIcon;
     private IIcon dislocationRuneIcon;
     private IIcon orbCapacityRuneIcon;
+    private IIcon betterCapacityRuneIcon;
 
     public BloodRune()
     {
@@ -40,6 +41,7 @@ public class BloodRune extends Block
         this.altarCapacityRuneIcon = iconRegister.registerIcon("AlchemicalWizardry:AltarCapacityRune");
         this.dislocationRuneIcon = iconRegister.registerIcon("AlchemicalWizardry:DislocationRune");
         this.orbCapacityRuneIcon = iconRegister.registerIcon("AlchemicalWizardry:OrbCapacityRune");
+        this.betterCapacityRuneIcon = iconRegister.registerIcon("AlchemicalWizardry:BetterCapacityRune");
     }
 
     public int getRuneEffect(int metaData)
@@ -57,6 +59,9 @@ public class BloodRune extends Block
 
             case 3: //Orb Capacity rune
                 return 7;
+                
+            case 4: //Better Capacity rune
+            	return 8; 
         }
 
         return 0;
@@ -75,6 +80,7 @@ public class BloodRune extends Block
             par3List.add(new ItemStack(par1, 1, 1));
             par3List.add(new ItemStack(par1, 1, 2));
             par3List.add(new ItemStack(par1, 1, 3));
+            par3List.add(new ItemStack(par1, 1, 4));
         } else
         {
             super.getSubBlocks(par1, par2CreativeTabs, par3List);
@@ -98,6 +104,9 @@ public class BloodRune extends Block
 
             case 3:
                 return this.orbCapacityRuneIcon;
+                
+            case 4:
+            	return this.betterCapacityRuneIcon;
 
             default:
                 return blockIcon;

1.7.2/main/java/WayofTime/alchemicalWizardry/common/bloodAltarUpgrade/AltarUpgradeComponent.java

@@ -9,6 +9,7 @@ public class AltarUpgradeComponent
     private int displacementUpgrades;
     private int altarCapacitiveUpgrades;
     private int orbCapacitiveUpgrades;
+    private int betterCapacitiveUpgrades;
 
     public AltarUpgradeComponent()
     {
@@ -19,6 +20,7 @@ public class AltarUpgradeComponent
         displacementUpgrades = 0;
         altarCapacitiveUpgrades = 0;
         orbCapacitiveUpgrades = 0;
+        betterCapacitiveUpgrades = 0;
     }
 
     public void addSpeedUpgrade()
@@ -55,6 +57,11 @@ public class AltarUpgradeComponent
     {
         orbCapacitiveUpgrades++;
     }
+    
+    public void addBetterCapacitiveUpgrade()
+    {
+    	betterCapacitiveUpgrades++;
+    }
 
     public int getSpeedUpgrades()
     {
@@ -90,4 +97,9 @@ public class AltarUpgradeComponent
     {
         return this.orbCapacitiveUpgrades;
     }
+    
+    public int getBetterCapacitiveUpgrades()
+    {
+    	return this.betterCapacitiveUpgrades;
+    }
 }

1.7.2/main/java/WayofTime/alchemicalWizardry/common/bloodAltarUpgrade/UpgradedAltars.java

@@ -189,6 +189,10 @@ public class UpgradedAltars
                             case 7:
                                 upgrades.addorbCapacitiveUpgrade();
                                 break;
+                                
+                            case 8:
+                            	upgrades.addBetterCapacitiveUpgrade();
+                            	break;
                         }
                     }
                 }

1.7.2/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBileDemon.java

@@ -137,7 +137,6 @@ public class EntityBileDemon extends EntityDemon
     {
         super.writeEntityToNBT(par1NBTTagCompound);
         par1NBTTagCompound.setBoolean("Angry", this.isAngry());
-        par1NBTTagCompound.setByte("CollarColor", (byte) this.getCollarColor());
         par1NBTTagCompound.setByte("attackTimer", (byte) attackTimer);
     }
 
@@ -149,11 +148,6 @@ public class EntityBileDemon extends EntityDemon
         super.readEntityFromNBT(par1NBTTagCompound);
         this.setAngry(par1NBTTagCompound.getBoolean("Angry"));
 
-        if (par1NBTTagCompound.hasKey("CollarColor"))
-        {
-            this.setCollarColor(par1NBTTagCompound.getByte("CollarColor"));
-        }
-
         attackTimer = par1NBTTagCompound.getByte("attackTimer");
     }
 

1.7.2/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBoulderFist.java

@@ -138,7 +138,6 @@ public class EntityBoulderFist extends EntityDemon
     {
         super.writeEntityToNBT(par1NBTTagCompound);
         par1NBTTagCompound.setBoolean("Angry", this.isAngry());
-        par1NBTTagCompound.setByte("CollarColor", (byte) this.getCollarColor());
     }
 
     /**
@@ -149,10 +148,6 @@ public class EntityBoulderFist extends EntityDemon
         super.readEntityFromNBT(par1NBTTagCompound);
         this.setAngry(par1NBTTagCompound.getBoolean("Angry"));
 
-        if (par1NBTTagCompound.hasKey("CollarColor"))
-        {
-            this.setCollarColor(par1NBTTagCompound.getByte("CollarColor"));
-        }
 
         this.setCombatTask();
     }

1.7.2/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityFallenAngel.java

@@ -147,7 +147,6 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob
     {
         super.writeEntityToNBT(par1NBTTagCompound);
         par1NBTTagCompound.setBoolean("Angry", this.isAngry());
-        par1NBTTagCompound.setByte("CollarColor", (byte) this.getCollarColor());
     }
 
     /**
@@ -158,11 +157,6 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob
         super.readEntityFromNBT(par1NBTTagCompound);
         this.setAngry(par1NBTTagCompound.getBoolean("Angry"));
 
-        if (par1NBTTagCompound.hasKey("CollarColor"))
-        {
-            this.setCollarColor(par1NBTTagCompound.getByte("CollarColor"));
-        }
-
         this.setCombatTask();
     }
 

1.7.2/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityIceDemon.java

@@ -149,7 +149,6 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
     {
         super.writeEntityToNBT(par1NBTTagCompound);
         par1NBTTagCompound.setBoolean("Angry", this.isAngry());
-        par1NBTTagCompound.setByte("CollarColor", (byte) this.getCollarColor());
     }
 
     /**
@@ -159,12 +158,6 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
     {
         super.readEntityFromNBT(par1NBTTagCompound);
         this.setAngry(par1NBTTagCompound.getBoolean("Angry"));
-
-        if (par1NBTTagCompound.hasKey("CollarColor"))
-        {
-            this.setCollarColor(par1NBTTagCompound.getByte("CollarColor"));
-        }
-
         this.setCombatTask();
     }
 

1.7.2/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityLowerGuardian.java

@@ -133,7 +133,6 @@ public class EntityLowerGuardian extends EntityDemon
     {
         super.writeEntityToNBT(par1NBTTagCompound);
         par1NBTTagCompound.setBoolean("Angry", this.isAngry());
-        par1NBTTagCompound.setByte("CollarColor", (byte) this.getCollarColor());
         par1NBTTagCompound.setByte("attackTimer", (byte) attackTimer);
         par1NBTTagCompound.setBoolean("isAggro", this.isAggro());
     }
@@ -146,10 +145,6 @@ public class EntityLowerGuardian extends EntityDemon
         super.readEntityFromNBT(par1NBTTagCompound);
         this.setAngry(par1NBTTagCompound.getBoolean("Angry"));
 
-        if (par1NBTTagCompound.hasKey("CollarColor"))
-        {
-            this.setCollarColor(par1NBTTagCompound.getByte("CollarColor"));
-        }
 
         attackTimer = par1NBTTagCompound.getByte("attackTimer");
         isAggro = par1NBTTagCompound.getBoolean("isAggro");

1.7.2/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityShade.java

@@ -138,7 +138,6 @@ public class EntityShade extends EntityDemon
     {
         super.writeEntityToNBT(par1NBTTagCompound);
         par1NBTTagCompound.setBoolean("Angry", this.isAngry());
-        par1NBTTagCompound.setByte("CollarColor", (byte) this.getCollarColor());
     }
 
     /**
@@ -149,11 +148,6 @@ public class EntityShade extends EntityDemon
         super.readEntityFromNBT(par1NBTTagCompound);
         this.setAngry(par1NBTTagCompound.getBoolean("Angry"));
 
-        if (par1NBTTagCompound.hasKey("CollarColor"))
-        {
-            this.setCollarColor(par1NBTTagCompound.getByte("CollarColor"));
-        }
-
         this.setCombatTask();
     }
 

1.7.2/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntitySmallEarthGolem.java

@@ -146,7 +146,6 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM
     {
         super.writeEntityToNBT(par1NBTTagCompound);
         par1NBTTagCompound.setBoolean("Angry", this.isAngry());
-        par1NBTTagCompound.setByte("CollarColor", (byte) this.getCollarColor());
     }
 
     /**
@@ -157,11 +156,6 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM
         super.readEntityFromNBT(par1NBTTagCompound);
         this.setAngry(par1NBTTagCompound.getBoolean("Angry"));
 
-        if (par1NBTTagCompound.hasKey("CollarColor"))
-        {
-            this.setCollarColor(par1NBTTagCompound.getByte("CollarColor"));
-        }
-
         this.setCombatTask();
     }
 

1.7.2/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityWingedFireDemon.java

@@ -148,7 +148,6 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM
     {
         super.writeEntityToNBT(par1NBTTagCompound);
         par1NBTTagCompound.setBoolean("Angry", this.isAngry());
-        par1NBTTagCompound.setByte("CollarColor", (byte) this.getCollarColor());
     }
 
     /**
@@ -159,11 +158,6 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM
         super.readEntityFromNBT(par1NBTTagCompound);
         this.setAngry(par1NBTTagCompound.getBoolean("Angry"));
 
-        if (par1NBTTagCompound.hasKey("CollarColor"))
-        {
-            this.setCollarColor(par1NBTTagCompound.getByte("CollarColor"));
-        }
-
         this.setCombatTask();
     }
 

1.7.2/main/java/WayofTime/alchemicalWizardry/common/harvest/BloodMagicHarvestHandler.java

@@ -17,7 +17,7 @@ public class BloodMagicHarvestHandler implements IHarvestHandler
 	@Override
 	public boolean canHandleBlock(Block block) 
 	{
-		return block == Blocks.wheat || block == Blocks.carrots || block == Blocks.potatoes;
+		return block == Blocks.wheat || block == Blocks.carrots || block == Blocks.potatoes || block == Blocks.nether_wart;
 	}
 
 	@Override
@@ -35,6 +35,10 @@ public class BloodMagicHarvestHandler implements IHarvestHandler
 		{
 			return 7;
 		}
+		if(block == Blocks.nether_wart)
+		{
+			return 3;
+		}
 		return 7;
 	}
 
@@ -116,6 +120,10 @@ public class BloodMagicHarvestHandler implements IHarvestHandler
 		{
 			return (IPlantable) Items.potato;
 		}
+		if(block == Blocks.nether_wart)
+		{
+			return (IPlantable) Items.nether_wart;
+		}
 		
 		return null;
 	}

1.7.2/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodRuneBlock.java

@@ -41,11 +41,15 @@ public class ItemBloodRuneBlock extends ItemBlock
                 break;
 
             case 3:
-                name = "test";
+                name = "orb";
                 break;
 
+            case 4:
+                name = "betterCapacity";
+                break;
+                
             default:
-                name = "broken";
+            	name = "broken";
         }
 
         return getUnlocalizedName() + "." + name;

1.7.2/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectGrowth.java

@@ -84,7 +84,7 @@ public class RitualEffectGrowth extends RitualEffect
     @Override
     public int getCostPerRefresh()
     {
-        return 100;
+        return 25;
     }
 
     @Override

1.7.2/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLifeConduit.java

@@ -0,0 +1,180 @@
+package WayofTime.alchemicalWizardry.common.rituals;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone;
+import WayofTime.alchemicalWizardry.api.rituals.RitualComponent;
+import WayofTime.alchemicalWizardry.api.rituals.RitualEffect;
+import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
+import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
+
+public class RitualEffectLifeConduit extends RitualEffect
+{
+    @Override
+    public void performEffect(IMasterRitualStone ritualStone)
+    {
+        String owner = ritualStone.getOwner();
+        World worldSave = MinecraftServer.getServer().worldServers[0];
+        LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, owner);
+
+        if (data == null)
+        {
+            data = new LifeEssenceNetwork(owner);
+            worldSave.setItemData(owner, data);
+        }
+
+        int currentEssence = data.currentEssence;
+        World world = ritualStone.getWorld();
+        int x = ritualStone.getXCoord();
+        int y = ritualStone.getYCoord();
+        int z = ritualStone.getZCoord();
+
+        TEAltar tileAltar = null;
+        boolean testFlag = false;
+
+        for (int i = -5; i <= 5; i++)
+        {
+            for (int j = -5; j <= 5; j++)
+            {
+                for (int k = -10; k <= 10; k++)
+                {
+                    if (world.getTileEntity(x + i, y + k, z + j) instanceof TEAltar)
+                    {
+                        tileAltar = (TEAltar) world.getTileEntity(x + i, y + k, z + j);
+                        testFlag = true;
+                    }
+                }
+            }
+        }
+
+        if (!testFlag)
+        {
+            return;
+        }
+
+        //tileAltar = (TEAltar)world.getBlockTileEntity(x,y-1,z);
+        int d0 = 15;
+        int vertRange = 20;
+        
+        EntityPlayer entityOwner = null;
+        List<EntityPlayer> list = SpellHelper.getPlayersInRange(world, x, y, z, d0, vertRange);
+        
+        for(EntityPlayer player : list)
+        {
+        	if(SpellHelper.getUsername(player).equals(owner))
+        	{
+            	entityOwner = player;
+        	}
+        }
+
+        if (entityOwner == null)
+        {
+            return;
+        }
+        
+        int fillAmount = Math.min(currentEssence/2,tileAltar.fill(ForgeDirection.UP, new FluidStack(AlchemicalWizardry.lifeEssenceFluid,10000), false));
+        
+        {
+        	tileAltar.fill(ForgeDirection.UP, new FluidStack(AlchemicalWizardry.lifeEssenceFluid,fillAmount), true);
+        	if(entityOwner.getHealth() > 2.0f && fillAmount != 0)
+        	{
+        		entityOwner.setHealth(2.0f);
+        	}
+        	data.currentEssence = currentEssence - fillAmount*2;
+        }
+    }
+
+    @Override
+    public int getCostPerRefresh()
+    {
+    	return 0;
+    }
+
+    @Override
+	public List<RitualComponent> getRitualComponentList() 
+	{
+		ArrayList<RitualComponent> conduitRitual = new ArrayList();
+        
+		conduitRitual.add(new RitualComponent(-1,0,-1,RitualComponent.FIRE));
+		conduitRitual.add(new RitualComponent(-1,0,1,RitualComponent.FIRE));
+		conduitRitual.add(new RitualComponent(1,0,1,RitualComponent.FIRE));
+		conduitRitual.add(new RitualComponent(1,0,-1,RitualComponent.FIRE));
+		
+		for(int i=0; i<4; i++)
+		{
+			conduitRitual.add(new RitualComponent(-2,i,-2,RitualComponent.AIR));
+			conduitRitual.add(new RitualComponent(-2,i,2,RitualComponent.AIR));
+			conduitRitual.add(new RitualComponent(2,i,2,RitualComponent.AIR));
+			conduitRitual.add(new RitualComponent(2,i,-2,RitualComponent.AIR));
+		}
+		
+		conduitRitual.add(new RitualComponent(4,1,4,RitualComponent.EARTH));
+		conduitRitual.add(new RitualComponent(4,1,-4,RitualComponent.EARTH));
+		conduitRitual.add(new RitualComponent(-4,1,-4,RitualComponent.EARTH));
+		conduitRitual.add(new RitualComponent(-4,1,4,RitualComponent.EARTH));
+		conduitRitual.add(new RitualComponent(3,1,4,RitualComponent.EARTH));
+		conduitRitual.add(new RitualComponent(4,1,3,RitualComponent.EARTH));
+		conduitRitual.add(new RitualComponent(-3,1,4,RitualComponent.EARTH));
+		conduitRitual.add(new RitualComponent(-4,1,3,RitualComponent.EARTH));
+		conduitRitual.add(new RitualComponent(3,1,-4,RitualComponent.EARTH));
+		conduitRitual.add(new RitualComponent(4,1,-3,RitualComponent.EARTH));
+		conduitRitual.add(new RitualComponent(-3,1,-4,RitualComponent.EARTH));
+		conduitRitual.add(new RitualComponent(-4,1,-3,RitualComponent.EARTH));
+
+		
+		for(int i=0; i<2; i++)
+		{
+			conduitRitual.add(new RitualComponent(4,i+2,4,RitualComponent.WATER));
+			conduitRitual.add(new RitualComponent(4,i+2,-4,RitualComponent.WATER));
+			conduitRitual.add(new RitualComponent(-4,i+2,-4,RitualComponent.WATER));
+			conduitRitual.add(new RitualComponent(-4,i+2,4,RitualComponent.WATER));
+		}
+		
+		conduitRitual.add(new RitualComponent(4,4,4,RitualComponent.DUSK));
+		conduitRitual.add(new RitualComponent(4,4,-4,RitualComponent.DUSK));
+		conduitRitual.add(new RitualComponent(-4,4,-4,RitualComponent.DUSK));
+		conduitRitual.add(new RitualComponent(-4,4,4,RitualComponent.DUSK));
+		
+		conduitRitual.add(new RitualComponent(6,0,5,RitualComponent.FIRE));
+		conduitRitual.add(new RitualComponent(5,0,6,RitualComponent.FIRE));
+		conduitRitual.add(new RitualComponent(-6,0,5,RitualComponent.FIRE));
+		conduitRitual.add(new RitualComponent(-5,0,6,RitualComponent.FIRE));
+		conduitRitual.add(new RitualComponent(6,0,-5,RitualComponent.FIRE));
+		conduitRitual.add(new RitualComponent(5,0,-6,RitualComponent.FIRE));
+		conduitRitual.add(new RitualComponent(-6,0,-5,RitualComponent.FIRE));
+		conduitRitual.add(new RitualComponent(-5,0,-6,RitualComponent.FIRE));
+
+		for(int i=0; i<2; i++)
+		{
+			conduitRitual.add(new RitualComponent(6,i,6,RitualComponent.FIRE));
+			conduitRitual.add(new RitualComponent(6,i,-6,RitualComponent.FIRE));
+			conduitRitual.add(new RitualComponent(-6,i,6,RitualComponent.FIRE));
+			conduitRitual.add(new RitualComponent(-6,i,-6,RitualComponent.FIRE));
+		}
+		
+		for(int i=0; i<3; i++)
+		{
+			conduitRitual.add(new RitualComponent(6,i+2,6,RitualComponent.BLANK));
+			conduitRitual.add(new RitualComponent(6,i+2,-6,RitualComponent.BLANK));
+			conduitRitual.add(new RitualComponent(-6,i+2,6,RitualComponent.BLANK));
+			conduitRitual.add(new RitualComponent(-6,i+2,-6,RitualComponent.BLANK));
+		}
+		
+		conduitRitual.add(new RitualComponent(6,5,6,RitualComponent.DUSK));
+		conduitRitual.add(new RitualComponent(6,5,-6,RitualComponent.DUSK));
+		conduitRitual.add(new RitualComponent(-6,5,6,RitualComponent.DUSK));
+		conduitRitual.add(new RitualComponent(-6,5,-6,RitualComponent.DUSK));
+		
+        return conduitRitual;
+	}
+}

1.7.2/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java

@@ -867,11 +867,11 @@ public class TEAltar extends TileEntity implements IInventory, IFluidTank, IFlui
 
         this.isUpgraded = checkUpgrade;
         this.upgradeLevel = upgradeState;
-        this.consumptionMultiplier = (float) (0.15 * upgrades.getSpeedUpgrades());
+        this.consumptionMultiplier = (float) (0.20 * upgrades.getSpeedUpgrades());
         this.efficiencyMultiplier = (float) Math.pow(0.85, upgrades.getSpeedUpgrades());
         this.sacrificeEfficiencyMultiplier = (float) (0.10 * upgrades.getSacrificeUpgrades());
         this.selfSacrificeEfficiencyMultiplier = (float) (0.10 * upgrades.getSelfSacrificeUpgrades());
-        this.capacityMultiplier = (float) (1 + 0.15 * upgrades.getAltarCapacitiveUpgrades());
+        this.capacityMultiplier = (float) ((1*Math.pow(1.10,upgrades.getBetterCapacitiveUpgrades()) + 0.20 * upgrades.getAltarCapacitiveUpgrades()));
         //TODO finalize values
         this.dislocationMultiplier = (float) (Math.pow(1.2, upgrades.getDisplacementUpgrades()));
         this.orbCapacityMultiplier = (float) (1 + 0.02 * upgrades.getOrbCapacitiveUpgrades());

1.7.2/main/resources/assets/alchemicalwizardry/lang/en_US.lang

@@ -3,7 +3,8 @@ tile.bloodAltar.name=Blood Altar
 tile.bloodRune.blank.name=Blood Rune
 tile.bloodRune.fill.name=Rune of Augmented Capacity
 tile.bloodRune.empty.name=Rune of Dislocation
-tile.bloodRune.test.name=Rune of the Orb
+tile.bloodRune.orb.name=Rune of the Orb
+tile.bloodRune.betterCapacity.name=Rune of Superior Capacity
 tile.speedRune.name=Speed Rune
 tile.efficiencyRune.name=Efficiency Rune
 tile.runeOfSacrifice.name=Rune of Sacrifice