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

2 files changed, 93 insertions, 0 deletions

diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang
index bbd488d7e2..970e5fd07c 100644
--- a/src/main/resources/assets/gregtech/lang/en_US.lang
+++ b/src/main/resources/assets/gregtech/lang/en_US.lang
@@ -411,6 +411,98 @@ achievement.denseaspossible.desc=Produce Neutronium
 achievement.whatnow=What now?
 achievement.whatnow.desc=Craft a Ultimate Battery
 
+achievement.gt.metaitem.01.32606=Electric Motor LuV tier
+achievement.gt.metaitem.01.32606.desc=Pickup this item to see the recipe in NEI
+achievement.gt.metaitem.01.32607=Electric Motor ZPM tier
+achievement.gt.metaitem.01.32607.desc=Pickup this item to see the recipe in NEI
+achievement.gt.metaitem.01.32608=Electric Motor UV tier
+achievement.gt.metaitem.01.32608.desc=Pickup this item to see the recipe in NEI
+
+achievement.gt.metaitem.01.32615=Electric Pump LuV tier
+achievement.gt.metaitem.01.32615.desc=Pickup this item to see the recipe in NEI
+achievement.gt.metaitem.01.32616=Electric Pump ZPM tier
+achievement.gt.metaitem.01.32616.desc=Pickup this item to see the recipe in NEI
+achievement.gt.metaitem.01.32617=Electric Pump UV tier
+achievement.gt.metaitem.01.32617.desc=Pickup this item to see the recipe in NEI
+
+achievement.gt.metaitem.01.32635=Conveyor Module LuV tier
+achievement.gt.metaitem.01.32635.desc=Pickup this item to see the recipe in NEI
+achievement.gt.metaitem.01.32636=Conveyor Module ZPM tier
+achievement.gt.metaitem.01.32636.desc=Pickup this item to see the recipe in NEI
+achievement.gt.metaitem.01.32637=Conveyor Module UV tier
+achievement.gt.metaitem.01.32637.desc=Pickup this item to see the recipe in NEI
+
+achievement.gt.metaitem.01.32645=Electric Piston LuV tier
+achievement.gt.metaitem.01.32645.desc=Pickup this item to see the recipe in NEI
+achievement.gt.metaitem.01.32646=Electric Piston ZPM tier
+achievement.gt.metaitem.01.32646.desc=Pickup this item to see the recipe in NEI
+achievement.gt.metaitem.01.32647=Electric Piston UV tier
+achievement.gt.metaitem.01.32647.desc=Pickup this item to see the recipe in NEI
+
+achievement.gt.metaitem.01.32655=Robot Arm LuV tier
+achievement.gt.metaitem.01.32655.desc=Pickup this item to see the recipe in NEI
+achievement.gt.metaitem.01.32656=Robot Arm ZPM tier
+achievement.gt.metaitem.01.32656.desc=Pickup this item to see the recipe in NEI
+achievement.gt.metaitem.01.32657=Robot Arm UV tier
+achievement.gt.metaitem.01.32657.desc=Pickup this item to see the recipe in NEI
+
+achievement.gt.metaitem.01.32675=Field Generator tier VI
+achievement.gt.metaitem.01.32675.desc=Pickup this item to see the recipe in NEI
+achievement.gt.metaitem.01.32676=Field Generator tier VII
+achievement.gt.metaitem.01.32676.desc=Pickup this item to see the recipe in NEI
+achievement.gt.metaitem.01.32677=Field Generator tier VIII
+achievement.gt.metaitem.01.32677.desc=Pickup this item to see the recipe in NEI
+
+achievement.gt.metaitem.01.32685=Emitter LuV tier
+achievement.gt.metaitem.01.32685.desc=Pickup this item to see the recipe in NEI
+achievement.gt.metaitem.01.32686=Emitter ZPM tier
+achievement.gt.metaitem.01.32686.desc=Pickup this item to see the recipe in NEI
+achievement.gt.metaitem.01.32687=Emitter UV tier
+achievement.gt.metaitem.01.32687.desc=Pickup this item to see the recipe in NEI
+
+achievement.gt.metaitem.01.32695=Sensor LuV tier
+achievement.gt.metaitem.01.32695.desc=Pickup this item to see the recipe in NEI
+achievement.gt.metaitem.01.32696=Sensor ZPM tier
+achievement.gt.metaitem.01.32696.desc=Pickup this item to see the recipe in NEI
+achievement.gt.metaitem.01.32697=Sensor UV tier
+achievement.gt.metaitem.01.32697.desc=Pickup this item to see the recipe in NEI
+
+achievement.gt.blockmachines.fusioncomputer.tier.06=Fusion Computer Mark I
+achievement.gt.blockmachines.fusioncomputer.tier.06.desc=Pickup this item to see the recipe in NEI
+achievement.gt.blockmachines.fusioncomputer.tier.07=Fusion Computer Mark II
+achievement.gt.blockmachines.fusioncomputer.tier.07.desc=Pickup this item to see the recipe in NEI
+achievement.gt.blockmachines.fusioncomputer.tier.08=Fusion Computer Mark III
+achievement.gt.blockmachines.fusioncomputer.tier.08.desc=Pickup this item to see the recipe in NEI
+
+achievement.gt.metaitem.03.32072=Neuro Processing Unit
+achievement.gt.metaitem.03.32072.desc=Pickup this item to see the recipe in NEI
+achievement.gt.metaitem.03.32095=Wetware Mainframe
+achievement.gt.metaitem.03.32095.desc=Pickup this item to see the recipe in NEI
+
+achievement.item.NanoCircuit=Nano Circuit
+achievement.item.NanoCircuit.desc=Pickup this item to see the recipe in NEI
+achievement.item.PikoCircuit=Piko Circuit
+achievement.item.PikoCircuit.desc=Pickup this item to see the recipe in NEI
+achievement.item.QuantumCircuit=Quantum Circuit
+achievement.item.QuantumCircuit.desc=Pickup this item to see the recipe in NEI
+
+achievement.gt.metaitem.01.32605=Ultimate Battery
+achievement.gt.metaitem.01.32605.desc=Pickup this item to see the recipe in NEI
+achievement.gt.metaitem.01.32609=Really Ultimate Battery
+achievement.gt.metaitem.01.32609.desc=Pickup this item to see the recipe in NEI
+
+achievement.ic2.itemArmorQuantumHelmet=Quantum Helmet
+achievement.ic2.itemArmorQuantumHelmet.desc=Pickup this item to see the recipe in NEI
+achievement.ic2.itemArmorQuantumChestplate=Quantum Chestplate
+achievement.ic2.itemArmorQuantumChestplate.desc=Pickup this item to see the recipe in NEI
+achievement.ic2.itemArmorQuantumLegs=Quantum Leggings
+achievement.ic2.itemArmorQuantumLegs.desc=Pickup this item to see the recipe in NEI
+achievement.ic2.itemArmorQuantumBoots=Quantum Boots
+achievement.ic2.itemArmorQuantumBoots.desc=Pickup this item to see the recipe in NEI
+
+achievement.item.graviChestPlate=Gravi Chestplate
+achievement.item.graviChestPlate.desc=Pickup this item to see the recipe in NEI
+
 for.bees.species.clay=Clay
 for.bees.species.slimeball=Slimeball
 for.bees.species.peat=Peat
@@ -444,3 +536,4 @@ for.bees.species.iridium=Iridium
 for.bees.species.uranium=Uranium
 for.bees.species.plutonium=Plutonium
 for.bees.species.naquadah=Naquadah
+
diff --git a/src/main/resources/assets/gregtech/textures/gui/FakeAssemblyline.png b/src/main/resources/assets/gregtech/textures/gui/FakeAssemblyline.png
new file mode 100644
index 0000000000..e56d1e686e
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/gui/FakeAssemblyline.png