> Why does Git make me do these? arghhh...

Merge branch 'master' of https://github.com/draknyte1/GTplusplus

# Conflicts:
#	src/Java/gtPlusPlus/core/material/ALLOY.java
#	src/Java/gtPlusPlus/core/material/ELEMENT.java
#	src/Java/gtPlusPlus/core/material/Material.java
#	src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java

1 files changed, 14 insertions, 7 deletions

diff --git a/src/Java/cofh/energy/TileEnergyHandler.java b/src/Java/cofh/energy/TileEnergyHandler.java
index 24cd3c0e34..f8e3ea4291 100644
--- a/src/Java/cofh/energy/TileEnergyHandler.java
+++ b/src/Java/cofh/energy/TileEnergyHandler.java
@@ -10,39 +10,46 @@ public class TileEnergyHandler
 {
   protected EnergyStorage storage = new EnergyStorage(32000);
   
-  public void readFromNBT(NBTTagCompound nbt)
+  @Override
+public void readFromNBT(NBTTagCompound nbt)
   {
     super.readFromNBT(nbt);
     this.storage.readFromNBT(nbt);
   }
   
-  public void writeToNBT(NBTTagCompound nbt)
+  @Override
+public void writeToNBT(NBTTagCompound nbt)
   {
     super.writeToNBT(nbt);
     this.storage.writeToNBT(nbt);
   }
   
-  public boolean canConnectEnergy(ForgeDirection from)
+  @Override
+public boolean canConnectEnergy(ForgeDirection from)
   {
     return true;
   }
   
-  public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate)
+  @Override
+public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate)
   {
     return this.storage.receiveEnergy(maxReceive, simulate);
   }
   
-  public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate)
+  @Override
+public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate)
   {
     return this.storage.extractEnergy(maxExtract, simulate);
   }
   
-  public int getEnergyStored(ForgeDirection from)
+  @Override
+public int getEnergyStored(ForgeDirection from)
   {
     return this.storage.getEnergyStored();
   }
   
-  public int getMaxEnergyStored(ForgeDirection from)
+  @Override
+public int getMaxEnergyStored(ForgeDirection from)
   {
     return this.storage.getMaxEnergyStored();
   }