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/resources/assets | |
| 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/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 |
