diff --git a/build.properties b/build.properties index 999a6f8e..98faeb75 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ # -#Fri Feb 27 09:41:14 EST 2015 +#Fri Feb 27 17:40:41 EST 2015 mod_name=BloodMagic forge_version=10.13.2.1232 ccc_version=1.0.4.29 @@ -8,5 +8,5 @@ nei_version=1.0.3.64 package_group=com.wayoftime.bloodmagic mod_version=1.3.1 minetweaker_version=Dev-1.7.10-3.0.9B -build_number=1 +build_number=3 mc_version=1.7.10 diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/compress/StorageBlockCraftingManager.java b/src/main/java/WayofTime/alchemicalWizardry/common/compress/StorageBlockCraftingManager.java index 78c6e08e..80032bd3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/compress/StorageBlockCraftingManager.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/compress/StorageBlockCraftingManager.java @@ -35,7 +35,7 @@ public class StorageBlockCraftingManager { IRecipe recipe = (IRecipe)obj; ItemStack outputStack = recipe.getRecipeOutput(); - if(outputStack == null) + if(outputStack == null || outputStack.getItem() == null) { continue; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java index 350a20bd..0ec8a551 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Random; +import java.util.regex.Pattern; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid;