diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2016-04-11 13:41:51 +0200 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2016-04-11 13:41:51 +0200 |
| commit | 150aed2f84b1e226eae0d9147b50085b0dc3ae79 (patch) | |
| tree | 819730f801d8358abf5929763964d625f9a3bdb7 /src/main/java/gregtech/api/enums | |
| parent | a04b7f515957e6468963e40ce08d252ea49305d1 (diff) | |
| parent | e634563157b47e179960ff631fbca43d32c8962d (diff) | |
| download | GT5-Unofficial-150aed2f84b1e226eae0d9147b50085b0dc3ae79.tar.gz GT5-Unofficial-150aed2f84b1e226eae0d9147b50085b0dc3ae79.tar.bz2 GT5-Unofficial-150aed2f84b1e226eae0d9147b50085b0dc3ae79.zip | |
Merge pull request #482 from draknyte1/UpToDateGTPRBranch
Changes Soft Hammer -> Soft Mallet & Flips Icon. Makes them easier to differ now.
Diffstat (limited to 'src/main/java/gregtech/api/enums')
| -rw-r--r-- | src/main/java/gregtech/api/enums/OrePrefixes.java | 5 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/enums/TextureSet.java | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index f5c53fc789..5791fe00f0 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -308,7 +308,10 @@ public enum OrePrefixes { 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); - + + 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 { diff --git a/src/main/java/gregtech/api/enums/TextureSet.java b/src/main/java/gregtech/api/enums/TextureSet.java index 8448b0262a..4cedf08ec0 100644 --- a/src/main/java/gregtech/api/enums/TextureSet.java +++ b/src/main/java/gregtech/api/enums/TextureSet.java @@ -143,7 +143,7 @@ public class TextureSet { mTextures[123] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void"); mTextures[124] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void"); mTextures[125] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void"); - mTextures[126] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void"); - mTextures[127] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/void"); + mTextures[126] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/handleMallet"); + mTextures[127] = new Textures.ItemIcons.CustomIcon("materialicons/" + mSetName + "/toolHeadMallet"); } }
\ No newline at end of file |