diff options
| author | Shawn Buckley <shawntbuckley@gmail.com> | 2015-10-25 09:32:11 -0400 |
|---|---|---|
| committer | Shawn Buckley <shawntbuckley@gmail.com> | 2015-10-25 09:32:11 -0400 |
| commit | f9ee88cf64f9e9085c15848c3ac5702ca66f699c (patch) | |
| tree | 52d15df9624d22f47c7e53eb8e4e0966ee04ef87 /src/main/java/gregtech/common | |
| parent | 40be76a82b1725aac3c4e52fd0a934aa4cd47c1e (diff) | |
| parent | 2a08dcc756b143fceee294e088fac5e03c9bd86e (diff) | |
| download | GT5-Unofficial-f9ee88cf64f9e9085c15848c3ac5702ca66f699c.tar.gz GT5-Unofficial-f9ee88cf64f9e9085c15848c3ac5702ca66f699c.tar.bz2 GT5-Unofficial-f9ee88cf64f9e9085c15848c3ac5702ca66f699c.zip | |
Merge branch 'experimental' of github.com:Blood-Asp/GT5-Unofficial into experimental
Diffstat (limited to 'src/main/java/gregtech/common')
| -rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 7be4eb413f..c9770a557e 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -109,7 +109,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { "unfinishedTank", "valvePart", "aquaRegia", "leatherSeal", "leatherSlimeSeal", "hambone", "slimeball", "clay", "enrichedUranium", "camoPaste", "antiBlock", "burntQuartz", "salmonRaw", "blockHopper", "blockEnderObsidian", "blockIcestone", "blockMagicWood", "blockEnderCore", "blockHeeEndium", "oreHeeEndPowder", "oreHeeStardust", "oreHeeIgneousRock", "oreHeeInstabilityOrb", "crystalPureFluix", "shardNether", "gemFluorite", - "stickObsidian", "caveCrystal", "shardCrystal", "dyeCrystal"})); + "stickObsidian", "caveCrystal", "shardCrystal", "dyeCrystal","shardFire","shardWater","shardAir","shardEarth"})); private final Collection<String> mInvalidNames = new HashSet(Arrays.asList(new String[]{"diamondShard", "redstoneRoot", "obsidianStick", "bloodstoneOre", "universalCable", "bronzeTube", "ironTube", "netherTube", "obbyTube", "infiniteBattery", "eliteBattery", "advancedBattery", "10kEUStore", "blueDye", "MonazitOre", "quartzCrystal", "whiteLuminiteCrystal", "darkStoneIngot", "invisiumIngot", "demoniteOrb", "enderGem", "starconiumGem", 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 e14a425a39..a468783f8a 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 @@ -103,7 +103,7 @@ public class GT_MetaTileEntity_PyrolyseOven extends GT_MetaTileEntity_MultiBlock } } } else {// innen air - if (!aBaseMetaTileEntity.getAir(xDir + i, h, zDir + j)) { + if (!aBaseMetaTileEntity.getAirOffset(xDir + i, h, zDir + j)) { return false; } } |