24 files changed, 28 insertions, 33 deletions
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java b/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
index 1dd550aac5..964da5d38d 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
@@ -72,7 +72,7 @@ public class Biome_DarkWorld {
 			enableRain = true;
 			enableSnow = false;
 			rainfall = 0.7F;
-			setHeight(new BiomeGenBase.Height(0.15F, 0.8F));
+			setHeight(new BiomeGenBase.Height(0.15F, 0.65F));
 			waterColorMultiplier = 0x2d0b2d;
 			rootHeight = 48; //Ground level
 
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/chunk/ChunkProviderModded.java b/src/Java/gtPlusPlus/core/world/darkworld/chunk/ChunkProviderModded.java
index 0ebdd9fd69..6fb88631bf 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/chunk/ChunkProviderModded.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/chunk/ChunkProviderModded.java
@@ -158,7 +158,7 @@ public class ChunkProviderModded implements IChunkProvider {
 
 						for (int i3 = 0; i3 < 4; ++i3) {
 							int j3 = i3 + k * 4 << 12 | 0 + j1 * 4 << 8 | k2 * 8 + l2;
-							short short1 = 256;
+							short short1 = 256; //TODO - wots dis do
 							j3 -= short1;
 							double d14 = 0.25D;
 							double d16 = (d11 - d10) * d14;
@@ -361,7 +361,7 @@ public class ChunkProviderModded implements IChunkProvider {
 	 */
 	@Override
 	public void populate(IChunkProvider par1IChunkProvider, int par2, int par3) {
-		BlockFalling.fallInstantly = true;
+		BlockFalling.fallInstantly = false;
 		int k = par2 * 16;
 		int l = par3 * 16;
 		BiomeGenBase biomegenbase = this.worldObj.getBiomeGenForCoords(k + 16, l + 16);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 7f9d03f3d0..4b74f48e3b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -180,7 +180,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Old_Circuit_Board_Basic, Old_Circuit_Board_Advanced, Old_Circuit_Board_Elite,
 	Old_Circuit_Parts_Crystal_Chip_Elite, Old_Circuit_Parts_Crystal_Chip_Master, Old_Circuit_Parts_Advanced,
 	Old_Circuit_Parts_Wiring_Basic, Old_Circuit_Parts_Wiring_Advanced, Old_Circuit_Parts_Wiring_Elite,
-	Old_Empty_Board_Basic, Old_Empty_Board_Elite
+	Old_Empty_Board_Basic, Old_Empty_Board_Elite, TESTITEM
 	;
 
 	public static final GregtechItemList[]
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index 326e1027d2..5b6ffd8d82 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -6,9 +6,7 @@ import gregtech.api.GregTech_API;
 import gregtech.api.enums.*;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.objects.*;
-import gregtech.api.util.GT_FoodStat;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.*;
 import gregtech.common.covers.*;
 import gregtech.common.items.behaviors.Behaviour_DataOrb;
 import gregtech.common.items.behaviors.Behaviour_DataStick;
@@ -245,37 +243,34 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
 	private boolean registerOldCircuits(){
 		//Enable Old Circuits
 		
-		GregtechItemList.Old_Circuit_Primitive.set(addItem(800, "NAND Chip", "A very simple Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Primitive)}));
-		GregtechItemList.Old_Circuit_Basic.set(addItem(801, "Basic Electronic Circuit", "A basic Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Basic)}));
-		GregtechItemList.Old_Circuit_Good.set(addItem(802, "Good Electronic Circuit", "A good Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Good)}));
-		GregtechItemList.Old_Circuit_Advanced.set(addItem(803, "Advanced Circuit", "An advanced Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Advanced)}));
-		GregtechItemList.Old_Circuit_Data.set(addItem(804, "Data Storage Circuit", "A Data Storage Chip", new Object[]{OrePrefixes.circuit.get(Materials.Data)}));
-		GregtechItemList.Old_Circuit_Elite.set(addItem(805, "Data Control Circuit", "A Processor", new Object[]{OrePrefixes.circuit.get(Materials.Elite)}));
-
-		GregtechItemList.Old_Circuit_Master.set(addItem(806, "Energy Flow Circuit", "A High Voltage Processor", new Object[]{OrePrefixes.circuit.get(Materials.Master)}));
-
-		GregtechItemList.Old_Tool_DataOrb.set(addItem(807, "Data Orbv[GT++]", "A High Capacity Data Storage", new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION, new Behaviour_DataOrb()}));
+		GregtechItemList.Old_Circuit_Primitive.set(this.addItem(200, "NAND Chip", "A very simple Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Primitive)}));
+		GregtechItemList.Old_Circuit_Basic.set(this.addItem(201, "Basic Electronic Circuit", "A basic Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Basic)}));
+		GregtechItemList.Old_Circuit_Good.set(this.addItem(202, "Good Electronic Circuit", "A good Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Good)}));
+		GregtechItemList.Old_Circuit_Advanced.set(this.addItem(203, "Advanced Circuit", "An advanced Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Advanced)}));
+		GregtechItemList.Old_Circuit_Data.set(this.addItem(204, "Data Storage Circuit", "A Data Storage Chip", new Object[]{OrePrefixes.circuit.get(Materials.Data)}));
+		GregtechItemList.Old_Circuit_Elite.set(this.addItem(205, "Data Control Circuit", "A Processor", new Object[]{OrePrefixes.circuit.get(Materials.Elite)}));
+		GregtechItemList.Old_Circuit_Master.set(this.addItem(206, "Energy Flow Circuit", "A High Voltage Processor", new Object[]{OrePrefixes.circuit.get(Materials.Master)}));
+
+		GregtechItemList.Old_Tool_DataOrb.set(this.addItem(207, "Data Orb [GT++]", "A High Capacity Data Storage", new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION, new Behaviour_DataOrb()}));
 		GregtechItemList.Old_Circuit_Ultimate.set(GregtechItemList.Old_Tool_DataOrb.get(1L, new Object[0]));
 		GT_ModHandler.addShapelessCraftingRecipe(GregtechItemList.Old_Tool_DataOrb.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{GregtechItemList.Old_Tool_DataOrb.get(1L, new Object[0])});
 
-		GregtechItemList.Old_Tool_DataStick.set(addItem(808, "Data Stick [GT++]", "A Low Capacity Data Storage", new Object[]{OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION, new Behaviour_DataStick()}));
+		GregtechItemList.Old_Tool_DataStick.set(this.addItem(208, "Data Stick [GT++]", "A Low Capacity Data Storage", new Object[]{OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION, new Behaviour_DataStick()}));
 		GT_ModHandler.addShapelessCraftingRecipe(GregtechItemList.Old_Tool_DataStick.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{GregtechItemList.Old_Tool_DataStick.get(1L, new Object[0])});
 
-
-		GregtechItemList.Old_Circuit_Board_Basic.set(addItem(810, "Basic Circuit Board", "A basic Board", new Object[0]));
-		GregtechItemList.Old_Circuit_Board_Advanced.set(addItem(811, "Advanced Circuit Board", "An advanced Board", new Object[0]));
-		GregtechItemList.Old_Circuit_Board_Elite.set(addItem(812, "Processor Board", "A Processor Board", new Object[0]));
-		GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite.set(addItem(813, "Engraved Crystal Chip", "Needed for Circuits", new Object[0]));
-		GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master.set(addItem(814, "Engraved Lapotron Chip", "Needed for Circuits", new Object[0]));
-		GregtechItemList.Old_Circuit_Parts_Advanced.set(addItem(815, "Advanced Circuit Parts", "Advanced Circuit Parts", new Object[0]));
-		GregtechItemList.Old_Circuit_Parts_Wiring_Basic.set(addItem(816, "Etched Medium Voltage Wiring", "Part of Circuit Boards", new Object[0]));
-		GregtechItemList.Old_Circuit_Parts_Wiring_Advanced.set(addItem(817, "Etched High Voltage Wiring", "Part of Circuit Boards", new Object[0]));
-		GregtechItemList.Old_Circuit_Parts_Wiring_Elite.set(addItem(818, "Etched Extreme Voltage Wiring", "Part of Circuit Boards", new Object[0]));
-		GregtechItemList.Old_Empty_Board_Basic.set(addItem(819, "Empty Circuit Board", "A Board Part", new Object[0]));
-		GregtechItemList.Old_Empty_Board_Elite.set(addItem(820, "Empty Processor Board", "A Processor Board Part", new Object[0]));
-
-
-		Utils.LOG_INFO("[Old Feature] Enabling Pre 5.09.28 circuits & recipes. "+GregtechItemList.Old_Circuit_Basic.get(1).getDisplayName());
+		GregtechItemList.Old_Circuit_Board_Basic.set(this.addItem(210, "Basic Circuit Board", "A basic Board", new Object[0]));
+		GregtechItemList.Old_Circuit_Board_Advanced.set(this.addItem(211, "Advanced Circuit Board", "An advanced Board", new Object[0]));
+		GregtechItemList.Old_Circuit_Board_Elite.set(this.addItem(212, "Processor Board", "A Processor Board", new Object[0]));
+		GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite.set(this.addItem(213, "Engraved Crystal Chip", "Needed for Circuits", new Object[0]));
+		GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master.set(this.addItem(214, "Engraved Lapotron Chip", "Needed for Circuits", new Object[0]));
+		GregtechItemList.Old_Circuit_Parts_Advanced.set(this.addItem(215, "Advanced Circuit Parts", "Advanced Circuit Parts", new Object[0]));
+		GregtechItemList.Old_Circuit_Parts_Wiring_Basic.set(this.addItem(216, "Etched Medium Voltage Wiring", "Part of Circuit Boards", new Object[0]));
+		GregtechItemList.Old_Circuit_Parts_Wiring_Advanced.set(this.addItem(217, "Etched High Voltage Wiring", "Part of Circuit Boards", new Object[0]));
+		GregtechItemList.Old_Circuit_Parts_Wiring_Elite.set(this.addItem(218, "Etched Extreme Voltage Wiring", "Part of Circuit Boards", new Object[0]));
+		GregtechItemList.Old_Empty_Board_Basic.set(this.addItem(219, "Empty Circuit Board", "A Board Part", new Object[0]));
+		GregtechItemList.Old_Empty_Board_Elite.set(this.addItem(220, "Empty Processor Board", "A Processor Board Part", new Object[0]));
+
+		Utils.LOG_INFO("[Old Feature] Enabling Pre 5.09.28 circuits & recipes.");
 		
 		return true;
 	}
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/800.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/200.png
index e10815677a..e10815677a 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/800.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/200.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/801.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/201.png
index 661cd14817..661cd14817 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/801.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/201.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/802.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/202.png
index 6c64b90877..6c64b90877 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/802.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/202.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/803.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/203.png
index ec3c0358a1..ec3c0358a1 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/803.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/203.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/804.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/204.png
index daace0f92a..daace0f92a 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/804.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/204.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/805.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/205.png
index f5d5a1bc39..f5d5a1bc39 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/805.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/205.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/806.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/206.png
index d6ff394c66..d6ff394c66 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/806.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/206.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/807.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/207.png
index 9f03d572b7..9f03d572b7 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/807.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/207.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/808.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/208.png
index 548784db2a..548784db2a 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/808.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/208.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/810.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/210.png
index 6f403c14f5..6f403c14f5 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/810.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/210.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/811.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/211.png
index 6614c152a6..6614c152a6 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/811.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/211.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/812.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/212.png
index 98c4b4f2b7..98c4b4f2b7 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/812.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/212.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/813.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/213.png
index 7da7ab1e69..7da7ab1e69 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/813.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/213.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/814.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/214.png
index 56da7e8d0d..56da7e8d0d 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/814.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/214.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/815.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/215.png
index cffad53f13..cffad53f13 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/815.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/215.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/816.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/216.png
index 6c9c006044..6c9c006044 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/816.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/216.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/817.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/217.png
index ee1c87e1b1..ee1c87e1b1 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/817.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/217.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/818.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/218.png
index 6f8d8bdde5..6f8d8bdde5 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/818.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/218.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/219.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/219.png
new file mode 100644
index 0000000000..881bdaa78a
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/219.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/220.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/220.png
new file mode 100644
index 0000000000..00900203dc
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/220.png