diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-03-14 12:46:27 +0000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-03-14 12:46:27 +0000 |
| commit | 1de090fb2eac6a26ffd71617c940127130206f5d (patch) | |
| tree | ae3534db55896497420f6e82922d2dde84b08a75 | |
| parent | 4c2e210572288275f36a1e604c7b20bfe9012e18 (diff) | |
| download | GT5-Unofficial-1de090fb2eac6a26ffd71617c940127130206f5d.tar.gz GT5-Unofficial-1de090fb2eac6a26ffd71617c940127130206f5d.tar.bz2 GT5-Unofficial-1de090fb2eac6a26ffd71617c940127130206f5d.zip | |
* % Xenil is no longer a primal aspect.
% Disabled Control Cores for Multiblocks.
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java | 3 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java | 3 | ||||
| -rw-r--r-- | src/resources/assets/miscutils/textures/items/bomb.png | bin | 0 -> 311 bytes | |||
| -rw-r--r-- | src/resources/assets/miscutils/textures/items/bomb_casing.png | bin | 0 -> 280 bytes | |||
| -rw-r--r-- | src/resources/assets/miscutils/textures/items/bomb_lit.png | bin | 0 -> 328 bytes |
5 files changed, 4 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index 7ae0c6b246..d011043a57 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -71,6 +71,7 @@ extends GT_MetaTileEntity_MultiBlockBase { + private static final boolean DEBUG_DISABLE_CORES_TEMPORARILY = true; static { @@ -1567,7 +1568,7 @@ GT_MetaTileEntity_MultiBlockBase { public final boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { boolean aStructureCheck = checkMultiblock(aBaseMetaTileEntity, aStack); - boolean aHasCore = (requireControlCores ? (this.getControlCoreBus() != null) : true); + boolean aHasCore = DEBUG_DISABLE_CORES_TEMPORARILY; //(requireControlCores ? (this.getControlCoreBus() != null) : true); return aStructureCheck && aHasCore; } diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java b/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java index ee623f4a1e..6cd5af02b6 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java +++ b/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java @@ -132,7 +132,8 @@ public class GTPP_AspectCompat { "Xenil", Utils.rgbtoHexValue(25, 25, 25), new TC_Aspect_Wrapper[]{ - }, + get(TC_Aspects.MAGNETO), + get(TC_Aspects.RADIO)}, new ResourceLocation(CORE.MODID+":textures/aspects/" + "Xenil.png"), false, 1, diff --git a/src/resources/assets/miscutils/textures/items/bomb.png b/src/resources/assets/miscutils/textures/items/bomb.png Binary files differnew file mode 100644 index 0000000000..e8e9b0f532 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/bomb.png diff --git a/src/resources/assets/miscutils/textures/items/bomb_casing.png b/src/resources/assets/miscutils/textures/items/bomb_casing.png Binary files differnew file mode 100644 index 0000000000..d4238babe2 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/bomb_casing.png diff --git a/src/resources/assets/miscutils/textures/items/bomb_lit.png b/src/resources/assets/miscutils/textures/items/bomb_lit.png Binary files differnew file mode 100644 index 0000000000..e40029160b --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/bomb_lit.png |
