From 452431a40a25d40ed3428bd2b010be6d23e1913c Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Sat, 3 Oct 2015 23:15:52 +0200 Subject: [PATCH] Hotfix --- build.gradle | 9 --------- .../GT_MetaTileEntity_MultiBlockBase.java | 2 +- .../loaders/postload/GT_MachineRecipeLoader.java | 2 +- .../blocks/crop/blockCrop.Corpseplant.4.png | Bin 0 -> 531 bytes 4 files changed, 2 insertions(+), 11 deletions(-) create mode 100644 main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corpseplant.4.png diff --git a/build.gradle b/build.gradle index 4012680f..ba2e368b 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 77fc590c..1cb3c89a 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=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 cddc16be..c202fea5 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 new file mode 100644 index 0000000000000000000000000000000000000000..ed0831ad53f0b81ea13859708be9c73e2529019f GIT binary patch literal 531 zcmV+u0_^>XP)0ia1l zK~y-)?UBt(RACs!fA7=~L3i*PI#mM>sBuCXxX3Vg(bK~5t3YkvSsi#D4(9{@<1a*^)xX?QM~MX> zfKkvyou5dcl*?(_adaAxwsi03Ja0XZ6AARZUd1aE$QC9U1R$Z<-pk6`+VS~|i&Kh1 zt6!C(zIAu&PE(Tx8XI-Hp+SqCotkl79VsA{6@^w(P1itupkB}w(2aCjQE2t@k1h^H zm^4}P?>Cq_cb+$uBK^SAt}fhEip?YeV7>mk90Z5myvt;?JJo{kYg;8cVU6k0v5 zmz%d%+bZou7z5qh_yWLcXepP=#Bt08$011)9LE7F41GGwK>V2wYk9IV%dN~segoaq V#Brl-+{6F?002ovPDHLkV1mj`