diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2016-10-15 15:42:45 +0200 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2016-10-15 15:42:45 +0200 |
| commit | f97698b054c1d3ef1544365a65ccd90ba8d3bb6c (patch) | |
| tree | cc65d5228106669e7f3fd0d1e0aadd9e8b816e21 | |
| parent | f037d652a7c464f5d3be7c020e52ee4edd10d08b (diff) | |
| download | GT5-Unofficial-f97698b054c1d3ef1544365a65ccd90ba8d3bb6c.tar.gz GT5-Unofficial-f97698b054c1d3ef1544365a65ccd90ba8d3bb6c.tar.bz2 GT5-Unofficial-f97698b054c1d3ef1544365a65ccd90ba8d3bb6c.zip | |
Catch crash with Fossils Archeology Revival #642
| -rw-r--r-- | build.properties | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Utility.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/build.properties b/build.properties index a785b9383f..d67ef8c27b 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ minecraft.version=1.7.10 forge.version=10.13.4.1566-1.7.10 -gt.version=5.09.25 +gt.version=5.09.26pre ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407 diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index f14d4ad08f..31cf28b250 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -863,6 +863,7 @@ public class GT_Utility { ItemStack[] tStack = GT_OreDictUnificator.getStackArray(true, aOutput); if(tStack==null||(tStack.length>0&>_Utility.areStacksEqual(aInput, tStack[0])))return false; if (tOreName != null) { + if(tOreName.toString().equals("dustAsh")&&tStack[0].getUnlocalizedName().equals("tile.volcanicAsh"))return false; aRecipeList.put(new RecipeInputOreDict(tOreName.toString(), aInput.stackSize), new RecipeOutput(aNBT, tStack)); } else { aRecipeList.put(new RecipeInputItemStack(copy(aInput), aInput.stackSize), new RecipeOutput(aNBT, tStack)); |