aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-05-20 00:12:58 +0200
committerDream-Master <dream-master@gmx.net>2017-05-20 00:12:58 +0200
commitcec1f3a09a22c7e84119750cc1005a3da267060b (patch)
treee46c8c23fa3ed0580a5279210d692bfbdc436f0a /src/main/resources
parent08cd5fe48560f7b8db2252733afe59d160eaf426 (diff)
parent0217101187b04775b41a8c36cc94f9f47cc61371 (diff)
downloadGT5-Unofficial-cec1f3a09a22c7e84119750cc1005a3da267060b.tar.gz
GT5-Unofficial-cec1f3a09a22c7e84119750cc1005a3da267060b.tar.bz2
GT5-Unofficial-cec1f3a09a22c7e84119750cc1005a3da267060b.zip
Merge remote-tracking branch 'Petrochemy/mergeGTNH' into Test-Chemie
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_CHEMICALLY_INERT.pngbin0 -> 336 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.pngbin0 -> 476 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR.pngbin0 -> 439 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE.pngbin0 -> 457 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalReactor.pngbin3628 -> 3687 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/multimachines/LargeChemicalReactor.pngbin0 -> 2129 bytes
6 files changed, 0 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_CHEMICALLY_INERT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_CHEMICALLY_INERT.png
new file mode 100644
index 0000000000..65af5abd52
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_CHEMICALLY_INERT.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.png
new file mode 100644
index 0000000000..18006024c9
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR.png
new file mode 100644
index 0000000000..bc1dd3f5f0
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE.png
new file mode 100644
index 0000000000..b57178136f
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalReactor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalReactor.png
index 675f623be0..6e3fbbea62 100644
--- a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalReactor.png
+++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalReactor.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeChemicalReactor.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeChemicalReactor.png
new file mode 100644
index 0000000000..2d7771a4ef
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeChemicalReactor.png
Binary files differ