diff options
| author | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-18 00:17:03 +0200 |
|---|---|---|
| committer | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-18 00:17:03 +0200 |
| commit | 337b6fc66d25361095ad4eddd86992d92668be03 (patch) | |
| tree | 6c7cf46a3730bf37f78f17e8252583267fec675c /src/main/resources | |
| parent | edc857c8a95d39d78bf2e4c325bd2f8d21334469 (diff) | |
| parent | 34474480f73ca5ab1c711d73bdb4bd809673e063 (diff) | |
| download | GT5-Unofficial-337b6fc66d25361095ad4eddd86992d92668be03.tar.gz GT5-Unofficial-337b6fc66d25361095ad4eddd86992d92668be03.tar.bz2 GT5-Unofficial-337b6fc66d25361095ad4eddd86992d92668be03.zip | |
Merge branch 'ChemistryUpdate' into unstable
Conflicts:
src/main/java/gregtech/api/enums/ItemList.java
src/main/java/gregtech/api/enums/Textures.java
src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
Diffstat (limited to 'src/main/resources')
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_CHEMICALLY_INERT.png | bin | 0 -> 336 bytes |
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.png | bin | 0 -> 476 bytes |
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR.png | bin | 0 -> 439 bytes |
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE.png | bin | 0 -> 457 bytes |
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalReactor.png | bin | 3628 -> 3687 bytes |
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/gui/multimachines/LargeChemicalReactor.png | bin | 0 -> 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 Binary files differnew file mode 100644 index 0000000000..65af5abd52 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_CHEMICALLY_INERT.png 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 Binary files differnew file mode 100644 index 0000000000..18006024c9 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.png 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 Binary files differnew file mode 100644 index 0000000000..bc1dd3f5f0 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR.png 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 Binary files differnew file mode 100644 index 0000000000..b57178136f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE.png diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalReactor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalReactor.png Binary files differindex 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 diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeChemicalReactor.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeChemicalReactor.png Binary files differnew file mode 100644 index 0000000000..2d7771a4ef --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeChemicalReactor.png |
