diff options
| author | bass <tudurap.com@gmail.com> | 2019-02-06 14:12:17 +0000 |
|---|---|---|
| committer | bass <tudurap.com@gmail.com> | 2019-02-06 14:12:17 +0000 |
| commit | e361c213cb6e2a913d6ee60a8d1ddef5ade675de (patch) | |
| tree | 46dc65891b506ac25751239801bd0c3701fb7b3a | |
| parent | 21dddd2bd5e7944dfbcdc12c2c5db8599d6a5588 (diff) | |
| parent | 5b9ad96623f08158bed9373e1b356e0d64f1b5aa (diff) | |
| download | GT5-Unofficial-e361c213cb6e2a913d6ee60a8d1ddef5ade675de.tar.gz GT5-Unofficial-e361c213cb6e2a913d6ee60a8d1ddef5ade675de.tar.bz2 GT5-Unofficial-e361c213cb6e2a913d6ee60a8d1ddef5ade675de.zip | |
Merge remote-tracking branch 'origin/master' into bassAdditions
| -rw-r--r-- | build.properties | 4 | ||||
| -rw-r--r-- | src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/build.properties b/build.properties index ff25af8631..2920f08653 100644 --- a/build.properties +++ b/build.properties @@ -6,8 +6,8 @@ ic2.version=2.2.790-experimental codechickenlib.version=1.1.3.140 codechickencore.version=1.0.7.47 nei.version=1.0.5.120 -gregtech.jenkinsbuild=223 -gregtech.version=5.09.33.06 +gregtech.jenkinsbuild=227 +gregtech.version=5.09.33.07 cofhcore.version=[1.7.10]3.1.4-329-dev cofhlib.version=[1.7.10]1.0.3-175-dev 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), |