diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2018-02-05 18:16:05 -0800 |
|---|---|---|
| committer | Jason Mitchell <mitchej@gmail.com> | 2018-02-06 00:02:52 -0800 |
| commit | f9b06fc228e0006e88c2aead97d109763f2d4a55 (patch) | |
| tree | b3bd7e8283e8595e245028cff3201432caf711a9 /src/main | |
| parent | dcefe92cfb20582cd9a6d083ebe35f1bb5f2ee32 (diff) | |
| download | GT5-Unofficial-f9b06fc228e0006e88c2aead97d109763f2d4a55.tar.gz GT5-Unofficial-f9b06fc228e0006e88c2aead97d109763f2d4a55.tar.bz2 GT5-Unofficial-f9b06fc228e0006e88c2aead97d109763f2d4a55.zip | |
Cherry pick upstream texture changes
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java index 6fbc026e48..1170358e32 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java @@ -172,13 +172,8 @@ public class GT_MetaTileEntity_PyrolyseOven extends GT_MetaTileEntity_MultiBlock } } } else if (h == 3) {// innen decke (ulv casings + input + muffler) -<<<<<<< HEAD - if ((!addInputToMachineList(tTileEntity, 111)) && (!addMufflerToMachineList(tTileEntity, 111))) { - if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != CasingBlock) { -======= if ((!addInputToMachineList(tTileEntity, 22)) && (!addMufflerToMachineList(tTileEntity, 22))) { - if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != GregTech_API.sBlockCasings1) { ->>>>>>> f70c7d40... Added documentation to updateTexture in GT_MetaTileEntity_Hatch. + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != CasingBlock) { return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != CasingMeta) { @@ -190,15 +185,9 @@ public class GT_MetaTileEntity_PyrolyseOven extends GT_MetaTileEntity_MultiBlock return false; } } -<<<<<<< HEAD - } else {// Au�erer 5x5 ohne h�he - if (h == 0) {// au�en boden (controller, output, energy, maintainance, rest ulv casings) - if ((!addMaintenanceToMachineList(tTileEntity, 111)) && (!addOutputToMachineList(tTileEntity, 111)) && (!addEnergyInputToMachineList(tTileEntity, 111))) { -======= } else {// Aeusserer 5x5 ohne hoehe if (h == 0) {// aussen boden (controller, output, energy, maintainance, rest ulv casings) if ((!addMaintenanceToMachineList(tTileEntity, 22)) && (!addOutputToMachineList(tTileEntity, 22)) && (!addEnergyInputToMachineList(tTileEntity, 22))) { ->>>>>>> f70c7d40... Added documentation to updateTexture in GT_MetaTileEntity_Hatch. if ((xDir + i != 0) || (zDir + j != 0)) {//no controller if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != CasingBlock) { return false; |