diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java
index e8103b911..b19b1cbc6 100644
--- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java
+++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java
@@ -110,30 +110,26 @@ public class PartUniversalCable extends PartTransmitter<EnergyNetwork> implement
 							}
 							else if(MekanismUtils.useRF() && outputter instanceof IEnergyProvider)
 							{
-								double received = ((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)drawAmount, true) * Mekanism.FROM_TE;
+								double received = ((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)drawAmount, true) * general.FROM_TE;
 								double toDraw = received;
 
 								if(received > 0)
 								{
 									toDraw -= getTransmitterNetwork().emit(received, true);
 								}
-<<<<<<< HEAD
-								
-								((IEnergySource)acceptor).drawEnergy(toDraw*general.TO_IC2);
-=======
+
 								((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)toDraw, false);
 							}
 							else if(MekanismUtils.useIC2() && outputter instanceof IEnergySource)
 							{
-								double received = Math.min(((IEnergySource)outputter).getOfferedEnergy() * Mekanism.FROM_IC2, drawAmount);
+								double received = Math.min(((IEnergySource)outputter).getOfferedEnergy() * general.FROM_IC2, drawAmount);
 								double toDraw = received;
 
 								if(received > 0)
 								{
 									toDraw -= getTransmitterNetwork().emit(received, true);
 								}
-								((IEnergySource)outputter).drawEnergy(toDraw * Mekanism.TO_IC2);
->>>>>>> 92f1579... Make PULL mode actually, and exclusively, pull.
+								((IEnergySource)outputter).drawEnergy(toDraw * general.TO_IC2);
 							}
 						}
 					}
diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
index c5f9c1da1..8189d0c7d 100644
--- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
+++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
@@ -3,7 +3,6 @@ package mekanism.common.tile;
 import java.util.ArrayList;
 
 import mekanism.api.EnumColor;
-import mekanism.api.StackUtils;
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasStack;
 import mekanism.api.gas.GasTank;
diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java
index c72cb726e..9e5944547 100644
--- a/src/main/java/mekanism/common/tile/TileEntityFactory.java
+++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java
@@ -8,7 +8,6 @@ import mekanism.api.EnumColor;
 import mekanism.api.MekanismConfig.general;
 import mekanism.api.MekanismConfig.usage;
 import mekanism.api.Range4D;
-import mekanism.api.StackUtils;
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasStack;
 import mekanism.api.gas.GasTank;
diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java
index 5706ffa8e..7590ffb6c 100644
--- a/src/main/java/mekanism/generators/common/MekanismGenerators.java
+++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java
@@ -98,7 +98,7 @@ public class MekanismGenerators implements IModule
 				}
 			}
 
-			BuildcraftFuelRegistry.fuel.addFuel(FluidRegistry.getFluid("ethene"), (int)(240 * Mekanism.TO_TE), 40 * FluidContainerRegistry.BUCKET_VOLUME);
+			BuildcraftFuelRegistry.fuel.addFuel(FluidRegistry.getFluid("ethene"), (int)(240 * general.TO_TE), 40 * FluidContainerRegistry.BUCKET_VOLUME);
 		}
 	}
 	
diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
index 990f9de7e..3bac24a72 100644
--- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
+++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
@@ -254,4 +254,10 @@ public abstract class TileEntityGenerator extends TileEntityNoisyElectricBlock i
 		controlType = type;
 		MekanismUtils.saveChunk(this);
 	}
+
+	@Override
+	public boolean canPulse()
+	{
+		return false;
+	}
 }