diff options
| author | botn365 <42187820+botn365@users.noreply.github.com> | 2020-01-08 16:48:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 16:48:18 +0100 |
| commit | a3a9d4a5c2e466db33879176626670f2f07b635a (patch) | |
| tree | 8176e79d6be425dc28cc3a612416b832a5bed3c5 /src/Java/gtPlusPlus/xmod/gregtech/loaders | |
| parent | d7c83c3cd1036668c1f520f144c08de444f675a4 (diff) | |
| parent | 6bb3c6872c97b36c84f32bf730eee31206728c74 (diff) | |
| download | GT5-Unofficial-a3a9d4a5c2e466db33879176626670f2f07b635a.tar.gz GT5-Unofficial-a3a9d4a5c2e466db33879176626670f2f07b635a.tar.bz2 GT5-Unofficial-a3a9d4a5c2e466db33879176626670f2f07b635a.zip | |
Merge pull request #7 from alkcorp/master
sync
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java | 9 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java index 375b63e584..361fadcb5a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java @@ -9,21 +9,24 @@ import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks; import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks2; import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks3; import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks4; +import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaTieredCasingBlocks1; public class Gregtech_Blocks { public static void run(){ - Logger.INFO("Expanding Gregtech Texture Array from 128 -> 1024."); + //Logger.INFO("Expanding Gregtech Texture Array from 128 -> 1024."); boolean didExpand = TAE.hookGtTextures(); - Logger.INFO("Did Texture Array expand correctly? "+didExpand); - Logger.INFO("|======| Texture Array New Length: "+Textures.BlockIcons.CASING_BLOCKS.length+" |======|"); + //Logger.INFO("Did Texture Array expand correctly? "+didExpand); + Logger.INFO("|======| Texture Array Length: "+Textures.BlockIcons.CASING_BLOCKS.length+" |======|"); //Casing Blocks ModBlocks.blockCasingsMisc = new GregtechMetaCasingBlocks(); ModBlocks.blockCasings2Misc = new GregtechMetaCasingBlocks2(); ModBlocks.blockCasings3Misc = new GregtechMetaCasingBlocks3(); ModBlocks.blockCasings4Misc = new GregtechMetaCasingBlocks4(); + + ModBlocks.BlockTieredCasings1 = new GregtechMetaTieredCasingBlocks1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java index 8a4ae1344a..609d4e0649 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java @@ -111,7 +111,7 @@ public class RecipeLoader_AlgaeFarm { new int[] {}, new FluidStack[] {GT_Values.NF}, new FluidStack[] {GT_Values.NF}, - (int) (aDurations[aTier] * aOutputTimeMulti.get()), // Time + (int) (aDurations[aTier] * aOutputTimeMulti.get() / 2), // Time 0, 0); |