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/resources/assets | |
| 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/resources/assets')
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png | bin | 938 -> 1147 bytes |
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM_PLUS.png | bin | 0 -> 1147 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png Binary files differindex 72c4f05658..7f896a09f0 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM_PLUS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM_PLUS.png Binary files differnew file mode 100644 index 0000000000..666d51b82f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM_PLUS.png |
