diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java | 5 | ||||
-rw-r--r-- | src/resources/assets/miscutils/textures/items/MU-metaitem.01/32.png | bin | 0 -> 501 bytes | |||
-rw-r--r-- | src/resources/assets/miscutils/textures/items/MU-metaitem.01/33.png | bin | 0 -> 415 bytes | |||
-rw-r--r-- | src/resources/assets/miscutils/textures/items/MU-metaitem.01/34.png | bin | 0 -> 358 bytes | |||
-rw-r--r-- | src/resources/assets/miscutils/textures/items/MU-metaitem.01/35.png | bin | 0 -> 411 bytes | |||
-rw-r--r-- | src/resources/assets/miscutils/textures/items/MU-metaitem.01/36.png | bin | 0 -> 461 bytes | |||
-rw-r--r-- | src/resources/assets/miscutils/textures/items/MU-metaitem.01/37.png | bin | 0 -> 617 bytes | |||
-rw-r--r-- | src/resources/assets/miscutils/textures/items/MU-metaitem.01/38.png | bin | 0 -> 545 bytes | |||
-rw-r--r-- | src/resources/assets/miscutils/textures/items/MU-metaitem.01/39.png | bin | 0 -> 482 bytes |
9 files changed, 4 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java index 3ab0ed5544..f06b69a07d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java @@ -185,7 +185,10 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem { @Override public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) { - if (stack.getDisplayName().contains("LuV")){ + if (stack.getDisplayName().contains("ULV")){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(200, 180, 180); + } + else if (stack.getDisplayName().contains("LuV")){ HEX_OxFFFFFF = 0xffffcc; } else if (stack.getDisplayName().contains("ZPM")){ diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/32.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/32.png Binary files differnew file mode 100644 index 0000000000..4a7c1ce427 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/32.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/33.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/33.png Binary files differnew file mode 100644 index 0000000000..1a3acd9e94 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/33.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/34.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/34.png Binary files differnew file mode 100644 index 0000000000..bf81a1b4b2 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/34.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/35.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/35.png Binary files differnew file mode 100644 index 0000000000..051b45e6bc --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/35.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/36.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/36.png Binary files differnew file mode 100644 index 0000000000..5ddb32de79 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/36.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/37.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/37.png Binary files differnew file mode 100644 index 0000000000..38f7ec8756 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/37.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/38.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/38.png Binary files differnew file mode 100644 index 0000000000..a1c2183ee8 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/38.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/39.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/39.png Binary files differnew file mode 100644 index 0000000000..5e4886b0f8 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/39.png |