diff options
author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-06-17 14:37:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-17 14:37:10 +0200 |
commit | 909149cd28dad31993837595d60e3df096b19437 (patch) | |
tree | b593cc9ef0d48883d36c441316a337e80b138787 /src/main/resources | |
parent | b588e82ef749c1f047182a7b230c157a3965c42e (diff) | |
parent | 541144f4433044a6c0b9612e7cd7f94cf9440095 (diff) | |
download | GT5-Unofficial-909149cd28dad31993837595d60e3df096b19437.tar.gz GT5-Unofficial-909149cd28dad31993837595d60e3df096b19437.tar.bz2 GT5-Unofficial-909149cd28dad31993837595d60e3df096b19437.zip |
Merge pull request #1074 from Techlone/advminer2_improvements
AdvMiner2 renamed; new tiers of OreDrillingPlant
Diffstat (limited to 'src/main/resources')
-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 |