diff options
| author | YoungGT <noonpp44895@qq.com> | 2018-12-10 07:16:02 +0800 |
|---|---|---|
| committer | Dream-MasterXXL <dream-master@gmx.net> | 2018-12-11 11:07:26 +0100 |
| commit | 480408a7bfb63c176242172bab61a804105b440d (patch) | |
| tree | 8631feabeb2f52716b92d89e7cd84bc6410d498a /src/main/java/gregtech/common/items | |
| parent | aa079e3a7186c0b731d03ba735bc7a02e053ef09 (diff) | |
| download | GT5-Unofficial-480408a7bfb63c176242172bab61a804105b440d.tar.gz GT5-Unofficial-480408a7bfb63c176242172bab61a804105b440d.tar.bz2 GT5-Unofficial-480408a7bfb63c176242172bab61a804105b440d.zip | |
cherry pick cd841ad39edfef8c4f32096416b0c68b98ccc96e
Fix #1439 and #1456 (#1503)
* Fix #1439
* Fix #1456
* mistake
Diffstat (limited to 'src/main/java/gregtech/common/items')
| -rw-r--r-- | src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java | 4 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/ItemComb.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 042811eba5..d61e89dfac 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -347,10 +347,10 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { addItemBehavior(32472, tBehaviour); addItemBehavior(32473, tBehaviour); - GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Phosphor, 1L), ItemList.Tool_Matches.get(1L, new Object[0]), 16, 16); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Phosphorus, 1L), ItemList.Tool_Matches.get(1L, new Object[0]), 16, 16); - GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphor, 1L), ItemList.Tool_Matches.get(4L, new Object[0]), 64, 16); + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.TricalciumPhosphate, 1L), ItemList.Tool_Matches.get(1L, new Object[0]), 16, 16); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L), ItemList.Tool_Matches.get(4L, new Object[0]), 64, 16); + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1L), ItemList.Tool_Matches.get(4L, new Object[0]), 64, 16); GT_Values.RA.addBoxingRecipe(ItemList.Tool_Matches.get(16L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1L), ItemList.Tool_MatchBox_Full.get(1L, new Object[0]), 64, 16); GT_Values.RA.addUnboxingRecipe(ItemList.Tool_MatchBox_Full.get(1L, new Object[0]), ItemList.Tool_Matches.get(16L, new Object[0]), null, 32, 16); diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index 91218763dd..fcf33eaa7d 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -210,7 +210,7 @@ public class ItemComb extends Item { addProcessLV(tComb, Materials.Talc, 90); addProcessLV(tComb, Materials.Apatite, 80); addProcessLV(tComb, Materials.Phosphate, 75); - addProcessLV(tComb, Materials.Phosphorus, 75); + addProcessLV(tComb, Materials.TricalciumPhosphate, 75); tComb = getStackForType(CombType.CERTUS); addProcessLV(tComb, Materials.CertusQuartz, 100); addProcessLV(tComb, Materials.Quartzite, 80); |