diff --git a/gradle.properties b/gradle.properties
index 02a8664a..21cc8d51 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -41,7 +41,7 @@ pneumaticcraft_version=1.9.15-105
 # Self Compiled APIs                                    #
 #########################################################
 mekansim_version=8.0.1.198
-rotarycraft_version=V6e
+rotarycraft_version=V6f
 
 
 #########################################################
diff --git a/gradle/scripts/dependencies.gradle b/gradle/scripts/dependencies.gradle
index 2ab0e3e7..71c54897 100644
--- a/gradle/scripts/dependencies.gradle
+++ b/gradle/scripts/dependencies.gradle
@@ -32,11 +32,6 @@ repositories {
         url "http://mobiusstrip.eu/maven"
     }
 
-    maven {
-        name "FireBall API Depot"
-        url "http://dl.tsr.me/artifactory/libs-release-local"
-    }
-
     maven {
         name = "Player"
         url = "http://maven.ic2.player.to/"
@@ -47,11 +42,6 @@ repositories {
         url = "http://maven.tterrag.com/"
     }
 
-    maven  {
-        name = "RX14 Proxy"
-        url = "http://mvn.rx14.co.uk/repo/"
-    }
-
     maven {
         name "OpenComputers Repo"
         url = "http://maven.cil.li/"
@@ -62,6 +52,11 @@ repositories {
         url = "http://maven.k-4u.nl/"
     }
 
+    maven {
+        name = "tilera"
+        url = "https://data.tilera.xyz/maven/"
+    }
+
     ivy {
         name "BuildCraft"
         artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]"
@@ -131,7 +126,7 @@ dependencies {
     compile "appeng:Waila:${waila_version}_${minecraft_version}:api"
     compile "appeng:RotaryCraft:${rotarycraft_version}:api"
     compile "appeng:mekanism:${minecraft_version}-${mekansim_version}:api"
-    compile "appeng:InventoryTweaks:${invtweaks_version}:api"
+    //compile "appeng:InventoryTweaks:${invtweaks_version}:api"
 
     // self compiled stubs
     compile(group: 'api', name: 'coloredlightscore', version: "${api_coloredlightscore_version}")
diff --git a/src/api/java/appeng/api/networking/pathing/ControllerState.java b/src/api/java/appeng/api/networking/pathing/ControllerState.java
index 0bb0e5e1..c027d673 100644
--- a/src/api/java/appeng/api/networking/pathing/ControllerState.java
+++ b/src/api/java/appeng/api/networking/pathing/ControllerState.java
@@ -39,5 +39,10 @@ public enum ControllerState
 	/**
 	 * Controller rules not followed, lock up while booting.
 	 */
-	CONTROLLER_CONFLICT
+	CONTROLLER_CONFLICT,
+
+	/**
+	 * Controller is online and has infinite channels
+	 */
+	CONTROLLER_INFINITE
 }
diff --git a/src/main/java/appeng/me/cache/PathGridCache.java b/src/main/java/appeng/me/cache/PathGridCache.java
index cb52bccb..0df65a2f 100644
--- a/src/main/java/appeng/me/cache/PathGridCache.java
+++ b/src/main/java/appeng/me/cache/PathGridCache.java
@@ -83,7 +83,7 @@ public class PathGridCache implements IPathingGrid
 			this.updateNetwork = false;
 			this.setChannelsInUse( 0 );
 
-			if( !AEConfig.instance.isFeatureEnabled( AEFeature.Channels ) )
+			if( this.controllerState == ControllerState.CONTROLLER_INFINITE )
 			{
 				final int used = this.calculateRequiredChannels();
 
@@ -162,7 +162,7 @@ public class PathGridCache implements IPathingGrid
 
 			if( this.active.isEmpty() && this.ticksUntilReady <= 0 )
 			{
-				if( this.controllerState == ControllerState.CONTROLLER_ONLINE )
+				if( this.controllerState == ControllerState.CONTROLLER_ONLINE || this.controllerState == ControllerState.CONTROLLER_INFINITE)
 				{
 					final Iterator<TileController> controllerIterator = this.controllers.iterator();
 					if( controllerIterator.hasNext() )
@@ -273,7 +273,11 @@ public class PathGridCache implements IPathingGrid
 
 			if( cv.isValid() && cv.getFound() == this.controllers.size() )
 			{
-				this.controllerState = ControllerState.CONTROLLER_ONLINE;
+				if (AEConfig.instance.isFeatureEnabled( AEFeature.Channels )) {
+					this.controllerState = ControllerState.CONTROLLER_ONLINE;
+				} else {
+					this.controllerState = ControllerState.CONTROLLER_INFINITE;
+				}
 			}
 			else
 			{