aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/objects
diff options
context:
space:
mode:
authorMuramasa <haydenkilloh@gmail.com>2016-08-17 06:09:55 +0100
committerMuramasa <haydenkilloh@gmail.com>2016-08-17 06:09:55 +0100
commit691767326453c14bd0e596399658bd0f3f708e88 (patch)
tree22a4c36daa85d427fa8d715054094d39467ee8a1 /src/main/java/gregtech/api/objects
parente6ecf4f2989eed1caedab4e0b01a13ddfd1be0b2 (diff)
downloadGT5-Unofficial-691767326453c14bd0e596399658bd0f3f708e88.tar.gz
GT5-Unofficial-691767326453c14bd0e596399658bd0f3f708e88.tar.bz2
GT5-Unofficial-691767326453c14bd0e596399658bd0f3f708e88.zip
Initial
Fixed Materials limitation Added ability to add Materials via a config Added ability to change all properties of a Material via a config
Diffstat (limited to 'src/main/java/gregtech/api/objects')
-rw-r--r--src/main/java/gregtech/api/objects/ItemData.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/objects/ItemData.java b/src/main/java/gregtech/api/objects/ItemData.java
index aedc48db5a..cb741344ba 100644
--- a/src/main/java/gregtech/api/objects/ItemData.java
+++ b/src/main/java/gregtech/api/objects/ItemData.java
@@ -119,6 +119,6 @@ public class ItemData {
@Override
public String toString() {
if (mPrefix == null || mMaterial == null || mMaterial.mMaterial == null) return "";
- return mPrefix.name() + mMaterial.mMaterial.name();
+ return mPrefix.name() + mMaterial.mMaterial.mName;
}
} \ No newline at end of file