+ Added Trinium Titanium Cable/wires.

+ Redid material components to better use GT texture assets.
% Gave all 32 ore types new TextureSets.
% Doubled capacity of all fluid pipes.
% Moved Item/Block creation from init() to preInit().
$ Fixed Sludge fluid texture.
$ Moved Darkworld from being a child mod into it's own mod, Renamed to Toxic Everglades.
$ Bundled SegmentHelper.java, for future development ease.

2 files changed, 7 insertions, 7 deletions

diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java b/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java
index 0eab691720..e74fe1e1a5 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java
@@ -38,16 +38,15 @@ public class DarkWorldContentLoader {
 	}
 
 	public synchronized static boolean initItems(){
-		portalItem = (itemDarkWorldPortalTrigger) (new itemDarkWorldPortalTrigger().setUnlocalizedName("dimensionDarkWorld_trigger"));
-		GameRegistry.registerItem(portalItem, "dimensionDarkWorld_trigger");	
-
+		portalItem = (itemDarkWorldPortalTrigger) (new itemDarkWorldPortalTrigger().setUnlocalizedName("everglades.trigger"));
+		GameRegistry.registerItem(portalItem, "everglades.trigger");	
 		return true;
 	}
 
 	public synchronized static boolean initBlocks(){		
 
 		//Create Block Instances
-		blockFluidLakes = new BlockBaseFluid("Sludge", SLUDGE, blockDarkWorldSludgeFluid.SLUDGE).setLightLevel(2f).setLightOpacity(1).setBlockName("blockDarkWorldSludgeFluid");
+		blockFluidLakes = new BlockBaseFluid("Sludge", SLUDGE, blockDarkWorldSludgeFluid.SLUDGE).setLightLevel(2f).setLightOpacity(1).setBlockName("fluidSludge");
 		portalBlock = new blockDarkWorldPortal();
 		blockTopLayer = new blockDarkWorldGround();
 		blockSecondLayer = new blockDarkWorldPollutedDirt();
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java
index 44d62663bd..65184b6f35 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java
@@ -137,7 +137,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
 			this.mIsGenerating = true;
 			Logger.WORLD("Setting Generation to true.");
 			int mList_sS = WorldGen_GT_Base.mList.size();
-			mList_sS = Math.min(mList_sS, 5); // Run a maximum of 5 chunks at a
+			mList_sS = Math.min(mList_sS, 3); // Run a maximum of 3 chunks at a
 												// time through worldgen. Extra
 												// chunks get done later.
 			for (int i = 0; i < mList_sS; i++) {
@@ -377,6 +377,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
 					case WorldGen_GT_Ore_Layer.NO_OVERLAP:
 						if (debugWorldGen)
 							GT_Log.out.println(" No overlap");
+						break;
 				}
 			}
 		}
@@ -391,11 +392,11 @@ public class WorldGen_GT_Base implements IWorldGenerator {
 			// For now, manually reducing oreveinMaxSize when not in the
 			// Underdark for performance
 			if (this.mWorld.provider.getDimensionName().equals("Underdark")) {
-				oreveinMaxSize = 32; // Leave Deep Dark/Underdark max oregen at
+				oreveinMaxSize = 24; // Leave Deep Dark/Underdark max oregen at
 										// 32, instead of 64
 			}
 			else {
-				oreveinMaxSize = 32;
+				oreveinMaxSize = 24;
 			}
 
 			int wXbox = this.mX - (oreveinMaxSize / 16);