aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2016-08-14 23:05:24 +0200
committerDream-Master <dream-master@gmx.net>2016-08-14 23:05:24 +0200
commitd57c26a2a1fea9f762dbae73863ee6c28b242113 (patch)
treeacba25a280180f216ad8bea16249d75d2bca7878 /src
parente859fb57b3d85a51994ca21f4042aa929293c935 (diff)
downloadGT5-Unofficial-d57c26a2a1fea9f762dbae73863ee6c28b242113.tar.gz
GT5-Unofficial-d57c26a2a1fea9f762dbae73863ee6c28b242113.tar.bz2
GT5-Unofficial-d57c26a2a1fea9f762dbae73863ee6c28b242113.zip
make adamantium ebf furnace required
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 4efe9de623..bdde797a1c 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -188,7 +188,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
/**
* Unknown Material Components. Dead End Section.
*/
- Adamantium ( 319, TextureSet.SET_SHINY , 10.0F, 5120, 5, 1|2 |8 |64|128 , 255, 255, 255, 0, "Adamantium" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray ),
+ Adamantium ( 319, TextureSet.SET_SHINY , 15.0F, 8192, 5, 1|2 |8 |64|128 , 255, 255, 255, 0, "Adamantium" , 0, 0, 7200, 7200, true, false, 1, 1, 1, Dyes.dyeLightGray ),
Adamite ( -1, TextureSet.SET_NONE , 1.0F, 0, 3, 1 |8 , 255, 255, 255, 0, "Adamite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray ),
Adluorite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 |8 , 255, 255, 255, 0, "Adluorite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL ),
Agate ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Agate" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ),
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
index 7567577c20..1df62f08f7 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
@@ -58,7 +58,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
}
switch (aMaterial) {
case Mercury:
- System.err.println("'blockQuickSilver'?, In which Ice Desert can you actually place this as a solid Block? On Pluto maybe Greg :)");
+ System.err.println("'blockQuickSilver'?, In which Ice Desert can you actually place this as a solid Block? On Pluto Greg :)");
break;
case Iron:
case WroughtIron: