aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2020-11-03 16:18:26 +0100
committerbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2020-11-03 16:18:26 +0100
commitd7f0d4575188c477e60184a08c882c380a1805cb (patch)
treefcc54b4e1e0407f6f766e27b1cd5d8108091b938
parent87c3702289ff4eddd345906dbf24c2f5fdc24674 (diff)
downloadGT5-Unofficial-d7f0d4575188c477e60184a08c882c380a1805cb.tar.gz
GT5-Unofficial-d7f0d4575188c477e60184a08c882c380a1805cb.tar.bz2
GT5-Unofficial-d7f0d4575188c477e60184a08c882c380a1805cb.zip
Fixes a bug where only 1Item is in stack
Former-commit-id: c5b014c5f18f083be19bfb625436db89f2a59242
-rw-r--r--build.gradle.kts6
-rw-r--r--libs/gregtech-5.09.33.54-dev.jar.REMOVED.git-id1
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java2
3 files changed, 6 insertions, 3 deletions
diff --git a/build.gradle.kts b/build.gradle.kts
index c5cb8b82db..fe8e52a958 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -115,7 +115,8 @@ dependencies {
val enderioVersion: String by project
//hard deps
compile("net.industrial-craft:industrialcraft-2:$ic2Version:dev")
- //compile("com.github.GTNH2:GT5-Unofficial:experimental-SNAPSHOT:dev") //broken jitpack.io dep
+ //jitpack
+ compile("com.github.GTNewHorizons:GT5-Unofficial:experimental-SNAPSHOT:dev")
//soft deps
compileOnly("com.azanor.baubles:Baubles:1.7.10-1.0.1.10:deobf")
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
@@ -125,7 +126,10 @@ dependencies {
compileOnly("micdoodle8.mods:Galacticraft-Planets:$galacticraftVersion:Dev")
compileOnly("li.cil.oc:OpenComputers:MC1.7.10-1.5.+:api")
compileOnly("net.sengir.forestry:forestry_1.7.10:4.2.16.64:dev")
+ //jitpack
compileOnly("com.github.GTNewHorizons:GalacticGregGT5:master-SNAPSHOT")
+ //compileOnly("com.github.Technus:TecTech:BassAddons-SNAPSHOT")
+ //Files
compileOnly(fileTree("libs") { this.include("*.jar") })
//CoreLibs for compile-age
diff --git a/libs/gregtech-5.09.33.54-dev.jar.REMOVED.git-id b/libs/gregtech-5.09.33.54-dev.jar.REMOVED.git-id
deleted file mode 100644
index 396d628a54..0000000000
--- a/libs/gregtech-5.09.33.54-dev.jar.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-fdcf1725ae123ce50af73ffbe38f8f0ec312f32b \ No newline at end of file
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
index ccc8966bcf..c4dedef9d7 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
@@ -1429,7 +1429,7 @@ public class WerkstoffLoader {
public static ItemStack getCorrespondingItemStackUnsafe(OrePrefixes orePrefixes, Werkstoff werkstoff, int amount) {
if (!werkstoff.getGenerationFeatures().enforceUnification) {
- ItemStack ret = GT_OreDictUnificator.get(orePrefixes, werkstoff.getBridgeMaterial(), 1);
+ ItemStack ret = GT_OreDictUnificator.get(orePrefixes, werkstoff.getBridgeMaterial(), amount);
if (ret != null)
return ret;
ret = OreDictHandler.getItemStack(werkstoff.getVarName(), orePrefixes, amount);