diff options
| author | huajijam <strhuaji@gmail.com> | 2019-02-02 23:00:59 +0800 |
|---|---|---|
| committer | huajijam <strhuaji@gmail.com> | 2019-02-02 23:00:59 +0800 |
| commit | 465d11f475ff755fa3965239da4efd43cc427c94 (patch) | |
| tree | 99c4124ed041e191279c2cc629b7f3a65a55b6f6 /src/Java/gtPlusPlus/core/material/ALLOY.java | |
| parent | 491e53a2017f5d77e9146255966625545882736c (diff) | |
| parent | 754e8ab095531069181152cf9ca24c85defc1eac (diff) | |
| download | GT5-Unofficial-465d11f475ff755fa3965239da4efd43cc427c94.tar.gz GT5-Unofficial-465d11f475ff755fa3965239da4efd43cc427c94.tar.bz2 GT5-Unofficial-465d11f475ff755fa3965239da4efd43cc427c94.zip | |
Merge remote-tracking branch 'Gt++/master'
Diffstat (limited to 'src/Java/gtPlusPlus/core/material/ALLOY.java')
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/ALLOY.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java index a27cace300..c7397962ad 100644 --- a/src/Java/gtPlusPlus/core/material/ALLOY.java +++ b/src/Java/gtPlusPlus/core/material/ALLOY.java @@ -623,8 +623,8 @@ public final class ALLOY { "HG-1223", //Material Name MaterialState.LIQUID, //State new short[]{39,85,159, 0}, //Material Colour - -1, //Melting Point in C - -1, //Boiling Point in C + 6357, //Melting Point in C + 8563, //Boiling Point in C -1, -1, false, //Uses Blast furnace? |