diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2017-06-06 17:58:27 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2017-06-06 17:58:27 +1000 |
| commit | eae002a116c4685b41e7cdea15fc55bf22a3fd09 (patch) | |
| tree | 7a34a58f89e92d0fba71f90f911842401302aa83 /src/Java/gtPlusPlus/xmod/gregtech/api | |
| parent | 14f58372394c22de8ce31220ba2aa854eecfb6f2 (diff) | |
| parent | 1d49ad58f6ada069813739c985c5e10d21c10a83 (diff) | |
| download | GT5-Unofficial-eae002a116c4685b41e7cdea15fc55bf22a3fd09.tar.gz GT5-Unofficial-eae002a116c4685b41e7cdea15fc55bf22a3fd09.tar.bz2 GT5-Unofficial-eae002a116c4685b41e7cdea15fc55bf22a3fd09.zip | |
Merge branch 'master' of https://github.com/draknyte1/GTplusplus
# Conflicts:
# src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java (Actually fixed it this time)
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java | 10 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java | 5 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index d89a9f207e..1e5305a683 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -55,6 +55,16 @@ public enum GregtechItemList implements GregtechItemContainer { Field_Generator_LuV, Field_Generator_ZPM, Field_Generator_UV, Field_Generator_MAX, Emitter_LuV, Emitter_ZPM, Emitter_UV, Emitter_MAX, Sensor_LuV, Sensor_ZPM, Sensor_UV, Sensor_MAX, + + //ULV Components + Electric_Motor_ULV, + Electric_Pump_ULV, + Conveyor_Module_ULV, + Electric_Piston_ULV, + Robot_Arm_ULV, + Field_Generator_ULV, + Emitter_ULV, + Sensor_ULV, //Circuits Circuit_Primitive, Circuit_Basic, Circuit_Good, Circuit_Advanced, 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")){ |