diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2017-08-24 18:47:40 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2017-08-24 18:47:40 +1000 |
| commit | 9532786295e39c639ae40fcdaa90e5b9faf1a73f (patch) | |
| tree | 749497fd09aab181b17687737ebcc2a3717202ad /src/Java/gtPlusPlus/xmod/gregtech/api | |
| parent | 7573ee56c6d8ee08319ef17ca28b46efcc5c6ed1 (diff) | |
| parent | 4928538ba331e835cbe640c36d1324f375282629 (diff) | |
| download | GT5-Unofficial-9532786295e39c639ae40fcdaa90e5b9faf1a73f.tar.gz GT5-Unofficial-9532786295e39c639ae40fcdaa90e5b9faf1a73f.tar.bz2 GT5-Unofficial-9532786295e39c639ae40fcdaa90e5b9faf1a73f.zip | |
Merge branch 'master' of https://github.com/draknyte1/GTplusplus
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java index d3ec2b024b..e480ffbfef 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java @@ -60,7 +60,7 @@ public class CONTAINER_AdvancedBoiler this.mWaterAmount = Math.min(54, Math.max(0, this.mWaterAmount * 54 / (this.maxStorage-100))); this.mProcessingEnergy = Math.min(14, Math.max(this.mProcessingEnergy > 0 ? 1 : 0, this.mProcessingEnergy * 14 / 1000)); - Iterator var2 = this.crafters.iterator(); + Iterator<?> var2 = this.crafters.iterator(); while (var2.hasNext()) { ICrafting var1 = (ICrafting) var2.next(); var1.sendProgressBarUpdate(this, 100, this.mTemperature); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java index 0a5351afdc..fb35c0ac21 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java @@ -120,7 +120,7 @@ public class GregtechItemData { } public ArrayList<GregtechMaterialStack> getAllGT_MaterialStacks() { - final ArrayList<GregtechMaterialStack> rList = new ArrayList(); + final ArrayList<GregtechMaterialStack> rList = new ArrayList<GregtechMaterialStack>(); if (this.hasValidMaterialData()) { rList.add(this.mMaterial); } |