diff --git a/build.gradle b/build.gradle
index cddb93dbb..6de32ec24 100644
--- a/build.gradle
+++ b/build.gradle
@@ -57,7 +57,7 @@ tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
 
-version = trousers + "-" + aeversion + "-" + aechannel + "-" + aebuild + "-" + trousersversion
+version = extended + "-" + aeversion + "-" + aechannel + "-" + aebuild + "-" + extendedversion
 group = aegroup
 archivesBaseName = aebasename
 
diff --git a/gradle.properties b/gradle.properties
index 547e236b8..fc9f6fffc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,15 +3,14 @@ aechannel=stable
 aebuild=7
 aegroup=appeng
 aebasename=appliedenergistics2
-trousers=trousers_edition
-trousersversion=v49s
+extended=extended_life
+extendedversion=v49t
 #########################################################
 # Versions                                              #
 #########################################################
 minecraft_version=1.12.2
 mcp_mappings=snapshot_20171003
 forge_version=14.23.5.2847
-
 #########################################################
 # Installable                                           #
 #########################################################
diff --git a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java
index b0245a3be..617b1f2a2 100644
--- a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java
+++ b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java
@@ -80,14 +80,9 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry
 		gtceOreDict.add("cableGtSingle");
 
 		for(String oreDict : gtceOreDict) {
-			Arrays.stream(OreDictionary.getOreNames()).filter(s -> s.startsWith(oreDict)).forEach(s -> {
-						OreHelper.INSTANCE.getCachedOres(s).forEach(
-								stack -> {
-									this.addNewAttunement(stack, TunnelType.GTCEU_POWER);
-									AELog.info("Added " + stack + " to P2P Tunnel Registry");
-								});
-					}
-			);
+			Arrays.stream( OreDictionary.getOreNames() ).filter( oreName -> oreName.startsWith( oreDict ) ).forEach( oreName -> {
+				OreHelper.INSTANCE.getCachedOres( oreName ).forEach( stack -> this.addNewAttunement( stack, TunnelType.GTCEU_POWER ) );
+			} );
 		}
 
 		/**
diff --git a/src/main/java/appeng/parts/p2p/PartP2PGTCEPower.java b/src/main/java/appeng/parts/p2p/PartP2PGTCEPower.java
index 7e9ab89f6..968137054 100644
--- a/src/main/java/appeng/parts/p2p/PartP2PGTCEPower.java
+++ b/src/main/java/appeng/parts/p2p/PartP2PGTCEPower.java
@@ -94,7 +94,32 @@ public class PartP2PGTCEPower extends PartP2PTunnel<PartP2PGTCEPower>
         @Override
         public long getEnergyCanBeInserted()
         {
-            return Long.MAX_VALUE;
+            long canInsert = 0;
+            if( outputs.isEmpty() )
+            {
+                try
+                {
+                    for( PartP2PGTCEPower o : PartP2PGTCEPower.this.getOutputs() )
+                        outputs.add( o );
+                }
+                catch( GridAccessException e )
+                {
+                    e.printStackTrace();
+                }
+            }
+
+            while ( !outputs.isEmpty() )
+            {
+                PartP2PGTCEPower target = outputs.poll();
+                final IEnergyContainer output = target.getAttachedEnergyStorage();
+
+                if( output == null || output.getEnergyCanBeInserted() <= 0 )
+                {
+                    continue;
+                }
+                canInsert += output.getEnergyCanBeInserted();
+            }
+            return canInsert;
         }
 
         @Override
@@ -165,13 +190,13 @@ public class PartP2PGTCEPower extends PartP2PTunnel<PartP2PGTCEPower>
         @Override
         public long getInputAmperage()
         {
-            return Long.MAX_VALUE;
+            return 0;
         }
 
         @Override
         public long getInputVoltage()
         {
-            return Long.MAX_VALUE;
+            return 0;
         }
     }
 
@@ -186,7 +211,11 @@ public class PartP2PGTCEPower extends PartP2PTunnel<PartP2PGTCEPower>
             }
             final IEnergyContainer output = getAttachedEnergyStorage();
             voltage *= 0.95;
-            return output.acceptEnergyFromNetwork( facing, voltage, amperage );
+            if( voltage > 0 )
+            {
+                return output.acceptEnergyFromNetwork( facing, voltage, amperage );
+            }
+            return 0;
         }
 
         @Override
diff --git a/src/main/java/appeng/util/item/OreHelper.java b/src/main/java/appeng/util/item/OreHelper.java
index cdfd1f267..fcfcd3952 100644
--- a/src/main/java/appeng/util/item/OreHelper.java
+++ b/src/main/java/appeng/util/item/OreHelper.java
@@ -204,7 +204,7 @@ public class OreHelper
 		return oreIDs;
 	}
 
-	List<ItemStack> getCachedOres( final String oreName )
+	public List<ItemStack> getCachedOres( final String oreName )
 	{
 		return this.oreDictCache.getUnchecked( oreName );
 	}