diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-06-17 14:38:20 +0200 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2017-06-17 14:38:20 +0200 |
| commit | edc857c8a95d39d78bf2e4c325bd2f8d21334469 (patch) | |
| tree | a05e9da0dfb6f14e89019fa1c38391b8f8dec949 /src/main/resources/assets/gregtech | |
| parent | 617f057dad27b8d9fc1dde0c669569b09453a0ed (diff) | |
| parent | 909149cd28dad31993837595d60e3df096b19437 (diff) | |
| download | GT5-Unofficial-edc857c8a95d39d78bf2e4c325bd2f8d21334469.tar.gz GT5-Unofficial-edc857c8a95d39d78bf2e4c325bd2f8d21334469.tar.bz2 GT5-Unofficial-edc857c8a95d39d78bf2e4c325bd2f8d21334469.zip | |
Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable
Diffstat (limited to 'src/main/resources/assets/gregtech')
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_OSMIRIDIUM.png | bin | 0 -> 455 bytes |
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ORE_DRILL.png (renamed from src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ADVMINER2.png) | bin | 439 -> 439 bytes |
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ORE_DRILL_ACTIVE.png (renamed from src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ADVMINER2_ACTIVE.png) | bin | 457 -> 457 bytes |
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/gui/multimachines/OreDrillingPlant.png (renamed from src/main/resources/assets/gregtech/textures/gui/multimachines/AdvMiner2.png) | bin | 4364 -> 4364 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_OSMIRIDIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_OSMIRIDIUM.png Binary files differnew file mode 100644 index 0000000000..d0fcc4da96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_OSMIRIDIUM.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ADVMINER2.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ORE_DRILL.png Binary files differindex bc1dd3f5f0..bc1dd3f5f0 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ADVMINER2.png +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ORE_DRILL.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ADVMINER2_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ORE_DRILL_ACTIVE.png Binary files differindex b57178136f..b57178136f 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ADVMINER2_ACTIVE.png +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ORE_DRILL_ACTIVE.png diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/AdvMiner2.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/OreDrillingPlant.png Binary files differindex 7b60ec4de7..7b60ec4de7 100644 --- a/src/main/resources/assets/gregtech/textures/gui/multimachines/AdvMiner2.png +++ b/src/main/resources/assets/gregtech/textures/gui/multimachines/OreDrillingPlant.png |
