Merge branch 'master' of git@github.com:StevenRS11/DimDoors.git into 1.5udpate

Conflicts:
	StevenDimDoors/mod_pocketDim/EventHookContainer.java
	StevenDimDoors/mod_pocketDim/mod_pocketDim.java

StevenDimDoors/mod_pocketDim/CommonTickHandler.java

@@ -40,6 +40,7 @@ public class CommonTickHandler implements ITickHandler
     //replaces rifts in game that have been destroyed/have blocks placed over them. 
     private void onTickInGame()
     {
+    	/**
     	try
     	{
     	
@@ -156,5 +157,7 @@ public class CommonTickHandler implements ITickHandler
     	}
     	
     	tickCount2++;
+    	**/
     }
+    
 }