diff options
| author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2020-01-15 14:55:25 +0100 |
|---|---|---|
| committer | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2020-01-15 14:55:25 +0100 |
| commit | 6a5213ca2fae939809f9520d3ab29a3471f9dab3 (patch) | |
| tree | a647b96a2cf41084483a7251e19817cb9b411590 /src | |
| parent | a0782b97055efc31016b18ac6a495c9d0372f815 (diff) | |
| parent | 3f83dfce5fa5f954a5bfb3a21f7da3a89a7a77de (diff) | |
| download | GT5-Unofficial-6a5213ca2fae939809f9520d3ab29a3471f9dab3.tar.gz GT5-Unofficial-6a5213ca2fae939809f9520d3ab29a3471f9dab3.tar.bz2 GT5-Unofficial-6a5213ca2fae939809f9520d3ab29a3471f9dab3.zip | |
Merge remote-tracking branch 'origin/master'
Former-commit-id: a4159f9a947cf91b79cf9c38917611149d94707a
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java index c72c7acebc..79ee9d697a 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java @@ -91,7 +91,7 @@ public class CircuitPartLoader implements Runnable { // tt += "Internal Name = "+single; String localised = GT_LanguageManager.getTranslation(GT_LanguageManager.getTranslateableItemStackName(itemStack)); BW_Meta_Items.getNEWCIRCUITS().addItem(CircuitImprintLoader.reverseIDs, "Wrap of " + localised+"s", tt); - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{single.get(16).copy()}, Materials.Plastic.getMolten(72),BW_Meta_Items.getNEWCIRCUITS().getStack(CircuitImprintLoader.reverseIDs),600,30); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{single.get(16).copy(), GT_Utility.getIntegratedCircuit(16)}, Materials.Plastic.getMolten(72),BW_Meta_Items.getNEWCIRCUITS().getStack(CircuitImprintLoader.reverseIDs),600,30); CircuitImprintLoader.circuitIIconRefs.put(CircuitImprintLoader.reverseIDs,single); CircuitImprintLoader.reverseIDs--; } |