Merge branch 'New_hightier_stuff_dev' into New_test_dev

# Conflicts:
#	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java

27 files changed, 6 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 de3a19fdec..0e0a8313e4 100644
--- a/src/main/resources/assets/gregtech/lang/en_US.lang
+++ b/src/main/resources/assets/gregtech/lang/en_US.lang
@@ -734,9 +734,15 @@ 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.32077.desc=Pickup this item to see the recipe in NEI
+achievement.gt.metaitem.03.32077=Bio 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.gt.metaitem.03.32099=Bioware Supercomputer
+achievement.gt.metaitem.03.32099.desc=Pickup this item to see the recipe in NEI
+achievement.gt.metaitem.03.32120=Bio Mainframe
+achievement.gt.metaitem.03.32120.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
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UEV.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UEV.png
new file mode 100644
index 0000000000..e3dcb7b2c9
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UEV.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UHV.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UHV.png
new file mode 100644
index 0000000000..e3dcb7b2c9
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UHV.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UIV.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UIV.png
new file mode 100644
index 0000000000..e3dcb7b2c9
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UIV.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png
index 2106b2533c..e14156d0f9 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png
index f3e0b5f67e..7fc79276ee 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png
index 3aed0ef200..edf04adc3d 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png
index 03d271872e..d181c017ed 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png
index dd87199ae2..190c30550b 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png
index 5b9053e1f4..7bd3b543a4 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png
index 23c87b8a2d..f7187595f1 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png
index 511366e648..93c9ca2bf3 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png
index d8d2012c51..52df2bd8a2 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png
index 1e538bce45..abf9e56ba7 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/107.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/107.png
new file mode 100644
index 0000000000..05825a9675
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/107.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/120.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/120.png
new file mode 100644
index 0000000000..f91bcd2f26
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/120.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/130.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/130.png
new file mode 100644
index 0000000000..fe039142e0
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/130.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/131.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/131.png
new file mode 100644
index 0000000000..2fad5c9386
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/131.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/132.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/132.png
new file mode 100644
index 0000000000..08ff840ea5
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/132.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/23.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/23.png
new file mode 100644
index 0000000000..28beb6060d
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/23.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/68.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/68.png
new file mode 100644
index 0000000000..e505f31be8
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/68.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/76.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/76.png
new file mode 100644
index 0000000000..8748b6dae4
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/76.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/77.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/77.png
new file mode 100644
index 0000000000..d7c74e8f19
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/77.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/8.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/8.png
new file mode 100644
index 0000000000..570cf27d9a
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/8.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/97.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/97.png
new file mode 100644
index 0000000000..be9e07ae7a
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/97.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/98.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/98.png
new file mode 100644
index 0000000000..f53e236793
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/98.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/99.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/99.png
new file mode 100644
index 0000000000..467fc0c666
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/99.png