aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorTechlone <techlone.mc@gmail.com>2016-06-19 21:08:46 +0500
committerTechlone <techlone.mc@gmail.com>2016-06-19 21:08:46 +0500
commit708f59d6e7f46868c06b14aa56de556413973751 (patch)
tree30ec79466de710ec57d8dfa3e643ecdccc151e71 /src/main/resources
parent39292a9626b1bcd2fb7370f191d4ce91def50519 (diff)
parent1ace2c4e35b21da7fc1070f3df24299a5892e498 (diff)
downloadGT5-Unofficial-708f59d6e7f46868c06b14aa56de556413973751.tar.gz
GT5-Unofficial-708f59d6e7f46868c06b14aa56de556413973751.tar.bz2
GT5-Unofficial-708f59d6e7f46868c06b14aa56de556413973751.zip
Merge branch 'experimental' of https://github.com/Blood-Asp/GT5-Unofficial into experimental
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ENGINE_INTAKE.pngbin0 -> 610 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/multimachines/LargeDieselEngine.pngbin0 -> 4437 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ENGINE_INTAKE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ENGINE_INTAKE.png
new file mode 100644
index 0000000000..bb2f520e30
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ENGINE_INTAKE.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeDieselEngine.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeDieselEngine.png
new file mode 100644
index 0000000000..9f0f9d59b2
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeDieselEngine.png
Binary files differ