aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2016-04-02 11:53:15 +0200
committerDream-Master <dream-master@gmx.net>2016-04-02 11:53:15 +0200
commitdc6314f396f4b946361f4f85c877c26fb3072c0d (patch)
treebfa8f560468aed37548599a7544b4c283fc91408
parentb61c25be00cdd4b65b1ff8962331dcf65f1f9653 (diff)
downloadGT5-Unofficial-dc6314f396f4b946361f4f85c877c26fb3072c0d.tar.gz
GT5-Unofficial-dc6314f396f4b946361f4f85c877c26fb3072c0d.tar.bz2
GT5-Unofficial-dc6314f396f4b946361f4f85c877c26fb3072c0d.zip
Adding Draconic Ores and Draconic Awakened Ores to GT code.
-rw-r--r--build.properties2
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/build.properties b/build.properties
index afedb17383..3e9d139a81 100644
--- a/build.properties
+++ b/build.properties
@@ -1,7 +1,7 @@
minecraft.version=1.7.10
forge.version=10.13.4.1566-1.7.10
-gt.version=5.08.33.9
+gt.version=5.08.33.10
ae2.version=rv2-beta-33
applecore.version=1.7.10-1.2.1+107.59407
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 711f67d78c..643a8820eb 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -192,8 +192,8 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
Fairy(-1, TextureSet.SET_NONE, 1.0F, 0, 2, 1 | 2, 255, 255, 255, 0, "Fairy", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL),
Ludicrite(-1, TextureSet.SET_NONE, 1.0F, 0, 2, 1 | 2, 255, 255, 255, 0, "Ludicrite", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL),
Pokefennium(-1, TextureSet.SET_NONE, 1.0F, 0, 2, 1 | 2, 255, 255, 255, 0, "Pokefennium", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL),
- Draconium(975, TextureSet.SET_SHINY, 20.0F, 32768, 7, 1|2| 64|128, 122, 68, 176, 0, "Draconium", 0, 0, 5000, 3300, true, false, 3, 1, 1, Dyes.dyePink),
- DraconiumAwakened(976, TextureSet.SET_SHINY, 40.0F, 65536, 8, 1|2| 64|128, 244, 78, 0, 0, "Awakened Draconium", 0, 0, 15000, 3600, true, false, 3, 1, 1, Dyes.dyeOrange),
+ Draconium(975, TextureSet.SET_SHINY, 20.0F, 32768, 7, 1|2| 8|16|32|64|128, 122, 68, 176, 0, "Draconium", 0, 0, 5000, 3300, true, false, 3, 1, 1, Dyes.dyePink),
+ DraconiumAwakened(976, TextureSet.SET_SHINY, 40.0F, 65536, 8, 1|2| 8|16|32|64|128, 244, 78, 0, 0, "Awakened Draconium", 0, 0, 15000, 3600, true, false, 3, 1, 1, Dyes.dyeOrange),
PurpleAlloy(-1, TextureSet.SET_NONE, 1.0F, 0, 2, 0, 100, 180, 255, 0, "Purple Alloy", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL),
InfusedTeslatite(-1, TextureSet.SET_NONE, 1.0F, 0, 2, 0, 100, 180, 255, 0, "Infused Teslatite", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL),