aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorbass <tudurap.com@gmail.com>2019-02-06 14:12:17 +0000
committerbass <tudurap.com@gmail.com>2019-02-06 14:12:17 +0000
commite361c213cb6e2a913d6ee60a8d1ddef5ade675de (patch)
tree46dc65891b506ac25751239801bd0c3701fb7b3a /src/main
parent21dddd2bd5e7944dfbcdc12c2c5db8599d6a5588 (diff)
parent5b9ad96623f08158bed9373e1b356e0d64f1b5aa (diff)
downloadGT5-Unofficial-e361c213cb6e2a913d6ee60a8d1ddef5ade675de.tar.gz
GT5-Unofficial-e361c213cb6e2a913d6ee60a8d1ddef5ade675de.tar.bz2
GT5-Unofficial-e361c213cb6e2a913d6ee60a8d1ddef5ade675de.zip
Merge remote-tracking branch 'origin/master' into bassAdditions
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
index 168c5ba090..1d1c80f0da 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
@@ -823,7 +823,6 @@ public class DreamCraftRecipeLoader implements Runnable {
192000, 512, 2000000, 32, new ItemStack[]{
GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 8),
ItemList.Circuit_Biomainframe.get(2L),
- ItemList.UHV_Coil.get(32L),
ItemList.Circuit_Parts_CapacitorSMD.get(64L),
ItemList.Circuit_Parts_ResistorSMD.get(64L),
ItemList.Circuit_Parts_TransistorSMD.get(64L),