aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core
diff options
context:
space:
mode:
authorJordan Byrne <draknyte1@hotmail.com>2018-01-29 22:15:28 +1000
committerJordan Byrne <draknyte1@hotmail.com>2018-01-29 22:15:28 +1000
commitcffd1acf470af2a79f24a4771e475e816de283b0 (patch)
tree9c7d531c937b0380ce0579f5d7e4537cd7d95201 /src/Java/gtPlusPlus/core
parent0d44c0b8810bda7a6d16b7a3aa27affa28f648f2 (diff)
downloadGT5-Unofficial-cffd1acf470af2a79f24a4771e475e816de283b0.tar.gz
GT5-Unofficial-cffd1acf470af2a79f24a4771e475e816de283b0.tar.bz2
GT5-Unofficial-cffd1acf470af2a79f24a4771e475e816de283b0.zip
+ Added Patron Capes.
% Changed Power Sub-Station recipe, harder in GTNH. Closes #194. Also closes https://github.com/GTNewHorizons/NewHorizons/issues/2517. % Tweaked Industrial Sifter & Wash Plant items/operation. % Greatly improved the Iron Blast Furnace for GT 5.09. It is now double the speed of a Bronze/Bricked Blast Furnace.
Diffstat (limited to 'src/Java/gtPlusPlus/core')
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java2
-rw-r--r--src/Java/gtPlusPlus/core/util/Utils.java2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 097802b32b..e194026297 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -1015,6 +1015,8 @@ public class RECIPES_Machines {
null, "plateIncoloy020", null,
GregtechItemList.Casing_Power_SubStation.get(Casing_Amount));
+ ItemStack mBattery = (!CORE.GTNH ? ItemList.Energy_LapotronicOrb2.get(1) : ItemList.ZPM2.get(1));
+
RecipeUtils.recipeBuilder(
"plateIncoloyMA956", GregtechItemList.Battery_RE_EV_Lithium.get(1), "plateIncoloyMA956",
GregtechItemList.Casing_Power_SubStation.get(1), GregtechItemList.Casing_Vanadium_Redox.get(1), GregtechItemList.Casing_Power_SubStation.get(1),
diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java
index ab11dccd4e..effe0952f7 100644
--- a/src/Java/gtPlusPlus/core/util/Utils.java
+++ b/src/Java/gtPlusPlus/core/util/Utils.java
@@ -566,7 +566,7 @@ public class Utils {
}
- public static int calculateVoltageTier(final int Voltage) {
+ public static int calculateVoltageTier(final long Voltage) {
int V;
if (Voltage == 8) {
V = 0;