diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2018-05-15 19:12:19 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-05-15 19:12:19 +1000 |
| commit | c7b39a04db6f567b1fe62d03abafbe5a77026721 (patch) | |
| tree | cc7afb926bf9cbea3d164322de741e4198d85506 /src/Java/gtPlusPlus/core | |
| parent | 9205c63146f96d7cc3280d05102de830ee3cd7f6 (diff) | |
| download | GT5-Unofficial-c7b39a04db6f567b1fe62d03abafbe5a77026721.tar.gz GT5-Unofficial-c7b39a04db6f567b1fe62d03abafbe5a77026721.tar.bz2 GT5-Unofficial-c7b39a04db6f567b1fe62d03abafbe5a77026721.zip | |
+ Added new textures for the GT Shelves.
$ Fixed a bug during ore recipe generation.
$ Fixed all GT Shelves using incorrect textures.
Diffstat (limited to 'src/Java/gtPlusPlus/core')
| -rw-r--r-- | src/Java/gtPlusPlus/core/block/base/BasicBlock.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java index f2edf65740..34da346ff2 100644 --- a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java +++ b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java @@ -25,7 +25,7 @@ public class BasicBlock extends BlockContainer { super(material); this.setBlockName(Utils.sanitizeString(unlocalizedName)); - if (type != BlockTypes.ORE) { + if (type != BlockTypes.ORE && !unlocalizedName.toLowerCase().contains("ore")) { this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 0cb36d4859..5f3969310b 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -286,12 +286,12 @@ public class RECIPES_Machines { //Buffer Core RecipeUtils.addShapedGregtechRecipe( CI.component_Plate[1], cableTier1, CI.component_Plate[1], - CI.circuitPrimitive, "plateStaballloy", CI.circuitPrimitive, + "circuitPrimitive", "plateStaballloy", "circuitPrimitive", CI.component_Plate[1], cableTier1, CI.component_Plate[1], RECIPE_BufferCore_ULV); RecipeUtils.addShapedGregtechRecipe( CI.component_Plate[2], cableTier2, CI.component_Plate[2], - CI.circuitTier1, IC2MFE, CI.circuitTier1, + CI.circuitTier1, CI.machineHull_HV, CI.circuitTier1, CI.component_Plate[2], cableTier2, CI.component_Plate[2], RECIPE_BufferCore_LV); RecipeUtils.addShapedGregtechRecipe( |