aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources/assets/gregtech/textures/gui
diff options
context:
space:
mode:
authorBass <tudurap.com@gmail.com>2019-01-24 13:21:54 +0000
committerBass <tudurap.com@gmail.com>2019-01-24 13:21:54 +0000
commit01a7f4d9e5ba8a042b7b019a7b9bb35f9fd3a343 (patch)
treeca6d3cd201ed95820caa9c828ea03c0f25ecd76a /src/main/resources/assets/gregtech/textures/gui
parent1b40750ba5059473a99a064faa7342fc60a2de89 (diff)
parentb24709d41d33f1f76f2e6852323d2b5cd90bb4b0 (diff)
downloadGT5-Unofficial-01a7f4d9e5ba8a042b7b019a7b9bb35f9fd3a343.tar.gz
GT5-Unofficial-01a7f4d9e5ba8a042b7b019a7b9bb35f9fd3a343.tar.bz2
GT5-Unofficial-01a7f4d9e5ba8a042b7b019a7b9bb35f9fd3a343.zip
Merge branch 'master' into bassAdditions
Diffstat (limited to 'src/main/resources/assets/gregtech/textures/gui')
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/dataReader.pngbin0 -> 2543 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/multimachines/EMDisplay.pngbin262931 -> 5044 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/dataReader.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/dataReader.png
new file mode 100644
index 0000000000..57a9b85ce9
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/dataReader.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/EMDisplay.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/EMDisplay.png
index 95aa09beae..e67f96e34e 100644
--- a/src/main/resources/assets/gregtech/textures/gui/multimachines/EMDisplay.png
+++ b/src/main/resources/assets/gregtech/textures/gui/multimachines/EMDisplay.png
Binary files differ