Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

Conflicts:
	core/localization/GuiText.java
	core/sync/AppEngPacketHandlerBase.java

client/gui/AEBaseGui.java

@@ -45,10 +45,12 @@ import appeng.container.slot.SlotPatternTerm;
 import appeng.container.slot.SlotRestrictedInput;
 import appeng.core.AEConfig;
 import appeng.core.AELog;
+import appeng.core.AppEng;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.PacketInventoryAction;
 import appeng.core.sync.packets.PacketSwapSlots;
 import appeng.helpers.InventoryAction;
+import appeng.integration.abstraction.INEI;
 import appeng.util.Platform;
 import cpw.mods.fml.common.ObfuscationReflectionHelper;
 
@@ -580,6 +582,22 @@ public abstract class AEBaseGui extends GuiContainer
 		return builder.toString();
 	}
 
+	boolean useNEI = false;
+
+	private RenderItem setItemRender(RenderItem aeri2)
+	{
+		if ( AppEng.instance.isIntegrationEnabled( "NEI" ) )
+		{
+			return ((INEI) AppEng.instance.getIntegration( "NEI" )).setItemRender( aeri2 );
+		}
+		else
+		{
+			RenderItem ri = itemRender;
+			itemRender = aeri2;
+			return ri;
+		}
+	}
+
 	private void safeDrawSlot(Slot s)
 	{
 		try
@@ -617,8 +635,7 @@ public abstract class AEBaseGui extends GuiContainer
 	{
 		if ( s instanceof SlotME )
 		{
-			RenderItem pIR = itemRender;
-			itemRender = aeri;
+			RenderItem pIR = setItemRender( aeri );
 			try
 			{
 				this.zLevel = 100.0F;
@@ -647,7 +664,7 @@ public abstract class AEBaseGui extends GuiContainer
 				if ( Platform.isDrawing( Tessellator.instance ) )
 					Tessellator.instance.draw();
 			}
-			itemRender = pIR;
+			setItemRender( pIR );
 			return;
 		}
 		else