diff options
| author | Techlone <techlone.mc@gmail.com> | 2017-06-07 18:17:23 +0500 |
|---|---|---|
| committer | Techlone <techlone.mc@gmail.com> | 2017-06-07 18:17:23 +0500 |
| commit | 86318b7b44c0df467cc7b0ecd0d9516981dc4bcf (patch) | |
| tree | 34b80e1948fbcfd9eaa200e99f163ba445883747 /src/main/java/gregtech/api/enums | |
| parent | a19e8b10eb33ac5b8f0557675ac03d110c47987d (diff) | |
| parent | 38e12d554c23daee29fd2a9ee4e2d3989096c9a9 (diff) | |
| download | GT5-Unofficial-86318b7b44c0df467cc7b0ecd0d9516981dc4bcf.tar.gz GT5-Unofficial-86318b7b44c0df467cc7b0ecd0d9516981dc4bcf.tar.bz2 GT5-Unofficial-86318b7b44c0df467cc7b0ecd0d9516981dc4bcf.zip | |
Merge branch 'unstable' into advminer2_improvements
# Conflicts:
# src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
Diffstat (limited to 'src/main/java/gregtech/api/enums')
| -rw-r--r-- | src/main/java/gregtech/api/enums/Textures.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index 3d4560cfac..bb846c74b6 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -15,7 +15,7 @@ import static gregtech.api.enums.GT_Values.RES_PATH_ITEM; public class Textures { public enum BlockIcons implements IIconContainer, Runnable { VOID // The Empty Texture - , RENDERING_ERROR, PIPE_RESTRICTOR, INSULATION_FULL, INSULATION_TINY, INSULATION_SMALL, INSULATION_MEDIUM, INSULATION_LARGE, INSULATION_HUGE, CFOAM_FRESH, + , RENDERING_ERROR, PIPE_RESTRICTOR, INSULATION_FULL, INSULATION_TINY, INSULATION_SMALL, INSULATION_MEDIUM, INSULATION_MEDIUM_PLUS, INSULATION_LARGE, INSULATION_HUGE, CFOAM_FRESH, CFOAM_HARDENED, SOLARPANEL, SOLARPANEL_8V, SOLARPANEL_LV, SOLARPANEL_MV, SOLARPANEL_HV, SOLARPANEL_EV, SOLARPANEL_IV, SOLARPANEL_LuV, SOLARPANEL_ZPM, SOLARPANEL_UV, VENT_NORMAL, VENT_ADVANCED, COVER_WOOD_PLATE, ARROW_UP, ARROW_DOWN, ARROW_LEFT, ARROW_RIGHT, AUTOMATION_FILTER, AUTOMATION_TYPEFILTER, AUTOMATION_CHESTBUFFER, AUTOMATION_SUPERBUFFER, AUTOMATION_REGULATOR, CONCRETE_LIGHT_STONE, CONCRETE_LIGHT_COBBLE, CONCRETE_LIGHT_COBBLE_MOSSY, |