aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums/OrePrefixes.java
diff options
context:
space:
mode:
authorTechlone <techlone.mc@gmail.com>2016-05-02 15:14:10 +0500
committerTechlone <techlone.mc@gmail.com>2016-05-02 15:14:10 +0500
commit34c5fd807de251626c5a1ff90289619f3c6f6a97 (patch)
treeb6309d6eee65cccc464c8b595971bc81604e2ce1 /src/main/java/gregtech/api/enums/OrePrefixes.java
parent0aad2f76890c0490b3a277609fa48cce0a97ce1f (diff)
parent3f46725bbcf94ce0253119ecbc79ef266ef73725 (diff)
downloadGT5-Unofficial-34c5fd807de251626c5a1ff90289619f3c6f6a97.tar.gz
GT5-Unofficial-34c5fd807de251626c5a1ff90289619f3c6f6a97.tar.bz2
GT5-Unofficial-34c5fd807de251626c5a1ff90289619f3c6f6a97.zip
Merge branch 'experimental' of https://github.com/Blood-Asp/GT5-Unofficial into experimental
Diffstat (limited to 'src/main/java/gregtech/api/enums/OrePrefixes.java')
-rw-r--r--src/main/java/gregtech/api/enums/OrePrefixes.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java
index f5c53fc789..506bfe11a2 100644
--- a/src/main/java/gregtech/api/enums/OrePrefixes.java
+++ b/src/main/java/gregtech/api/enums/OrePrefixes.java
@@ -307,8 +307,10 @@ public enum OrePrefixes {
ganys("Ganys Stuff", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1),
liquid("Liquids", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1),
bars("Bars", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1),
- bar("Bars", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1);
-
+ bar("Bars", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1),
+ toolHeadMallet("Mallet Heads", "", " Mallet Head", true, true, false, false, false, false, true, true, false, false, B[6], M * 6, 16, 127), // Reverse Head consisting out of 6 Ingots.
+ handleMallet("Mallet Handle", "", " Handle", true, true, false, false, false, false, true, true, false, false, B[1] | B[2], M / 2, 64, 126); // Reverse Stick made of half an Ingot. Introduced by Eloraam
+
public static volatile int VERSION = 509;
static {