aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.gradle11
-rw-r--r--build.properties6
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java10
3 files changed, 21 insertions, 6 deletions
diff --git a/build.gradle b/build.gradle
index 0ba24930c6..7c1298fc49 100644
--- a/build.gradle
+++ b/build.gradle
@@ -173,6 +173,15 @@ processResources
}
}
+task devJar(type: Jar) {
+ from sourceSets.main.output
+ classifier = 'dev'
+}
+
+artifacts {
+ archives devJar
+}
+
task signJar(dependsOn: 'reobf') {
doLast {
ant.signjar(
@@ -186,4 +195,4 @@ task signJar(dependsOn: 'reobf') {
verbose: true
)
}
-} \ No newline at end of file
+}
diff --git a/build.properties b/build.properties
index 75d9f30324..941c22cd92 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=358
-gregtech.version=5.09.33.23
+gregtech.jenkinsbuild=370
+gregtech.version=5.09.33.25
cofhcore.version=[1.7.10]3.1.4-329-dev
yamcore.version=0.5.79
baubles.version=1.0.1.10
@@ -19,4 +19,4 @@ forestry.version=4.2.16.64
enderio.version=2.3.0.429_beta
endercore.version=0.2.0.39_beta
waila.version=1.5.10
-buildcraft.version=7.1.23 \ No newline at end of file
+buildcraft.version=7.1.23
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 362c86ab08..30b2b0e7ff 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
@@ -1133,7 +1133,10 @@ public class DreamCraftRecipeLoader implements Runnable {
//Batteries
TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Energy_Cluster.get(1L), 12000, 16, 100000, 3, new Object[]{
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tritanium, 64L),
- new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 4L},
+ new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 1L},
+ new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 1L},
+ new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 1L},
+ new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 1L},
ItemList.Energy_Cluster.get(8L),
ItemList.Field_Generator_UV.get(2),
ItemList.Circuit_Wafer_HPIC.get(64),
@@ -1148,7 +1151,10 @@ public class DreamCraftRecipeLoader implements Runnable {
TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.ZPM2.get(1L), 24000, 64, 200000, 6, new Object[]{
GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32L),
GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32L),
- new Object[]{OrePrefixes.circuit.get(Materials.Bio), 4L},
+ new Object[]{OrePrefixes.circuit.get(Materials.Bio), 1L},
+ new Object[]{OrePrefixes.circuit.get(Materials.Bio), 1L},
+ new Object[]{OrePrefixes.circuit.get(Materials.Bio), 1L},
+ new Object[]{OrePrefixes.circuit.get(Materials.Bio), 1L},
ItemList.ZPM2.get(8),
ItemList.Field_Generator_UHV.get(4),
ItemList.Circuit_Wafer_UHPIC.get(64),