diff options
| author | Alkalus <Draknyte1@hotmail.com> | 2020-03-31 03:39:20 +0100 |
|---|---|---|
| committer | Alkalus <Draknyte1@hotmail.com> | 2020-03-31 03:39:20 +0100 |
| commit | 8a8048a6418ca8da9de0bd7b49f6ec39f9b0aad6 (patch) | |
| tree | 80e377c85c8a89edeac671cc6b2f2655a150f41e /src/Java/gtPlusPlus/core/material | |
| parent | d58dc988a2d378cf9c5544f037f074cba169c5f4 (diff) | |
| parent | 47816dec7729bde0bf247ff7db8ebf6b25b92048 (diff) | |
| download | GT5-Unofficial-8a8048a6418ca8da9de0bd7b49f6ec39f9b0aad6.tar.gz GT5-Unofficial-8a8048a6418ca8da9de0bd7b49f6ec39f9b0aad6.tar.bz2 GT5-Unofficial-8a8048a6418ca8da9de0bd7b49f6ec39f9b0aad6.zip | |
Merge branch 'master' of https://bitbucket.org/draknyte1/gtpp-development into AlkWork
# Conflicts:
# src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
Diffstat (limited to 'src/Java/gtPlusPlus/core/material')
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/ALLOY.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java index 4e28b4a428..616a3f68ce 100644 --- a/src/Java/gtPlusPlus/core/material/ALLOY.java +++ b/src/Java/gtPlusPlus/core/material/ALLOY.java @@ -731,7 +731,7 @@ public final class ALLOY { "Lafium Compound", //Material Name MaterialState.SOLID, //State null, //Material Colour - 6750, //Melting Point in C + 6350, //Melting Point in C 9865, //Boiling Point in C -1, -1, |