Merge branch 'unstable_blood' into unstable

Conflicts:
	src/main/java/gregtech/api/enums/MaterialBuilder.java
	src/main/java/gregtech/common/GT_RecipeAdder.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java

1 files changed, 4 insertions, 0 deletions

diff --git a/src/main/java/gregtech/nei/NEI_GT_Config.java b/src/main/java/gregtech/nei/NEI_GT_Config.java
index 8eab68775f..3caaaa0911 100644
--- a/src/main/java/gregtech/nei/NEI_GT_Config.java
+++ b/src/main/java/gregtech/nei/NEI_GT_Config.java
@@ -1,11 +1,13 @@
 package gregtech.nei;

 

 import codechicken.nei.api.IConfigureNEI;

+import cpw.mods.fml.common.FMLCommonHandler;

 import gregtech.api.util.GT_Recipe;

 

 public class NEI_GT_Config

         implements IConfigureNEI {

     public static boolean sIsAdded = true;

+    public static GT_NEI_AssLineHandler ALH;

 

     public void loadConfig() {

         sIsAdded = false;

@@ -14,6 +16,8 @@ public class NEI_GT_Config
                 new GT_NEI_DefaultHandler(tMap);

             }

         }

+        if(FMLCommonHandler.instance().getEffectiveSide().isClient())

+            ALH=new GT_NEI_AssLineHandler(GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes);

         sIsAdded = true;

     }