diff options
| author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2019-04-09 17:58:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-09 17:58:14 +0200 |
| commit | b0c7254410064d8a2ad1068cd233420169871a72 (patch) | |
| tree | 7bed04330af6de5b9ad069946072a6028e68019d /src/main/java/gregtech/common/blocks | |
| parent | 9b71ae54da263e6c5d0e808f847f8ba8fe6c891a (diff) | |
| parent | f5f9d29c848705effe4414c2ed39ce118430476c (diff) | |
| download | GT5-Unofficial-b0c7254410064d8a2ad1068cd233420169871a72.tar.gz GT5-Unofficial-b0c7254410064d8a2ad1068cd233420169871a72.tar.bz2 GT5-Unofficial-b0c7254410064d8a2ad1068cd233420169871a72.zip | |
Merge branch 'experimental' into bmf
Diffstat (limited to 'src/main/java/gregtech/common/blocks')
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java b/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java index cf4ad9c317..c5393f0be1 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java @@ -139,7 +139,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block { return 400.0F; } if (tMeta == 2) { - return 400.0F; + return 40.0F; } if (tMeta == 3) { return 250.0F; diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java index 68aa777d8c..1ca55d499f 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java @@ -20,8 +20,8 @@ public abstract class GT_Item_Casings_Abstract protected final String mCoil05Tooltip = GT_LanguageManager.addStringLocalization("gt.coil05tooltip", "Base Heating Capacity = 5400 Kelvin"); protected final String mCoil06Tooltip = GT_LanguageManager.addStringLocalization("gt.coil06tooltip", "Base Heating Capacity = 7200 Kelvin"); protected final String mCoil07Tooltip = GT_LanguageManager.addStringLocalization("gt.coil07tooltip", "Base Heating Capacity = 9001 Kelvin"); - protected final String mCoil08Tooltip = GT_LanguageManager.addStringLocalization("gt.coil08tooltip", "Base Heating Capacity = 12000 Kelvin"); - protected final String mCoil09Tooltip = GT_LanguageManager.addStringLocalization("gt.coil09tooltip", "Base Heating Capacity = 15000 Kelvin"); + protected final String mCoil08Tooltip = GT_LanguageManager.addStringLocalization("gt.coil08tooltip", "Base Heating Capacity = 9900 Kelvin"); + protected final String mCoil09Tooltip = GT_LanguageManager.addStringLocalization("gt.coil09tooltip", "Base Heating Capacity = 10800 Kelvin"); protected final String mCoilOverheated1Tooltip = GT_LanguageManager.addStringLocalization("gt.coil.overheated1.tooltip", "These coils are deprecated"); protected final String mCoilOverheated2Tooltip = GT_LanguageManager.addStringLocalization("gt.coil.overheated2.tooltip", "Place in crafting grid to get regular coils"); protected final String mBlastProofTooltip = GT_LanguageManager.addStringLocalization("gt.blastprooftooltip", "This Block is Blast Proof"); |