diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-06-07 09:37:13 +0200 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2017-06-07 09:37:13 +0200 |
| commit | 1296755b27831fcdfed59cbf92d9468e088c5cb8 (patch) | |
| tree | 2bf8e7ba442a32155ead191b39a18c5ddab96d25 /src/main/java/gregtech/api/enums | |
| parent | 3b1f55fcb95110311f68f2bb4b0b9247ce2e074f (diff) | |
| parent | e4b28e6208da4559852b716763518a25b781da39 (diff) | |
| download | GT5-Unofficial-1296755b27831fcdfed59cbf92d9468e088c5cb8.tar.gz GT5-Unofficial-1296755b27831fcdfed59cbf92d9468e088c5cb8.tar.bz2 GT5-Unofficial-1296755b27831fcdfed59cbf92d9468e088c5cb8.zip | |
Merge branch 'refs/heads/pr/1077' into unstable
# Conflicts:
# src/main/java/gregtech/api/metatileentity/MetaPipeEntity.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 d2894ad7bd..87089a33b8 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, |