aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/material
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2020-01-13 21:22:46 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2020-01-13 21:22:46 +0000
commit694b7e5a189a45f6f6c8b85388380d6c1e81cc0f (patch)
tree41835bd7a736998e5b78a2b24c2a01545b4d7ebf /src/Java/gtPlusPlus/core/material
parentd304d49e7e835fa601accd0740b53ae06909a71e (diff)
parentb8a2285f955e410fc6c6c611e68530f71082c084 (diff)
downloadGT5-Unofficial-694b7e5a189a45f6f6c8b85388380d6c1e81cc0f.tar.gz
GT5-Unofficial-694b7e5a189a45f6f6c8b85388380d6c1e81cc0f.tar.bz2
GT5-Unofficial-694b7e5a189a45f6f6c8b85388380d6c1e81cc0f.zip
Merge branch 'master' of https://github.com/alkcorp/GTplusplus
Diffstat (limited to 'src/Java/gtPlusPlus/core/material')
-rw-r--r--src/Java/gtPlusPlus/core/material/ALLOY.java2
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 95e3631aaf..4e28b4a428 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -775,7 +775,7 @@ public final class ALLOY {
"Pikyonium 64B", //Material Name
MaterialState.SOLID, //State
new short[]{52, 103, 186, 0}, //Material Colour
- 7850, //Melting Point in C
+ 6850, //Melting Point in C
11765, //Boiling Point in C
-1,
-1,