diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2015-10-03 23:15:52 +0200 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2015-10-03 23:15:52 +0200 |
| commit | 452431a40a25d40ed3428bd2b010be6d23e1913c (patch) | |
| tree | 4ebe87bb57fabc5eacd6a857d8131f7739c1d144 | |
| parent | 6d9c73a70a6374f3619e0ba9648ec64f6bdd784e (diff) | |
| download | GT5-Unofficial-452431a40a25d40ed3428bd2b010be6d23e1913c.tar.gz GT5-Unofficial-452431a40a25d40ed3428bd2b010be6d23e1913c.tar.bz2 GT5-Unofficial-452431a40a25d40ed3428bd2b010be6d23e1913c.zip | |
Hotfix
| -rw-r--r-- | build.gradle | 9 | ||||
| -rw-r--r-- | main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java | 2 | ||||
| -rw-r--r-- | main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 2 | ||||
| -rw-r--r-- | main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corpseplant.4.png | bin | 0 -> 531 bytes |
4 files changed, 2 insertions, 11 deletions
diff --git a/build.gradle b/build.gradle index 4012680fde..ba2e368bcb 100644 --- a/build.gradle +++ b/build.gradle @@ -72,15 +72,6 @@ manifest { //attributes 'FMLCorePluginContainsFMLMod': 'true' } } -//task apiJar(type: Jar) { -//from sourceSets.main.allSource -//include 'api/**' -//classifier = 'sources' -//manifest { -//attributes 'FMLCorePlugin': 'WhateverLoaderClass' -//attributes 'FMLCorePluginContainsFMLMod': 'true' -//} -} artifacts { archives devJar }
\ No newline at end of file diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index 77fc590ce1..1cb3c89a84 100644 --- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -472,7 +472,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { private void addFluidOutputs(FluidStack[] mOutputFluids2) { for(int i=0;i<mOutputFluids2.length;i++){ - if(mOutputHatches.size()>=i&&mOutputHatches.get(i)!=null&&mOutputFluids2[i]!=null&&isValidMetaTileEntity(mOutputHatches.get(i))){ + if(mOutputHatches.size()>i&&mOutputHatches.get(i)!=null&&mOutputFluids2[i]!=null&&isValidMetaTileEntity(mOutputHatches.get(i))){ mOutputHatches.get(i).fill(mOutputFluids2[i], true); } } diff --git a/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index cddc16be4f..c202fea5ac 100644 --- a/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -698,7 +698,7 @@ public class GT_MachineRecipeLoader GT_Values.RA.addForgeHammerRecipe(new ItemStack(Blocks.glass_pane, 1, 32767), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3L), 16, 10); GT_Values.RA.addForgeHammerRecipe(GT_ModHandler.getModItem("HardcoreEnderExpansion", "endium_ore", 1), GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Endium,1), 16, 10); - GT_ModHandler.addPulverisationRecipe(GT_ModHandler.getModItem("HardcoreEnderExpansion", "endium_ore", 1), GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Endium,2),GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Endstone,1),5000,GT_Values.NI,0, true); + GT_ModHandler.addPulverisationRecipe(GT_ModHandler.getModItem("HardcoreEnderExpansion", "endium_ore", 1), GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Endium,2),GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Endstone,1),50,GT_Values.NI,0, true); GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.Endium, GT_ModHandler.getModItem("HardcoreEnderExpansion", "endium_ingot", 1), true, true); GT_Values.RA.addAmplifier(ItemList.IC2_Scrap.get(9L, new Object[0]), 180, 1); diff --git a/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corpseplant.4.png b/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corpseplant.4.png Binary files differnew file mode 100644 index 0000000000..ed0831ad53 --- /dev/null +++ b/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corpseplant.4.png |
