diff options
| author | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-17 01:02:38 +0200 |
|---|---|---|
| committer | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-17 01:02:38 +0200 |
| commit | de42d1da4264bc0dd339020374b45138d8ddb691 (patch) | |
| tree | da598e6f87b136199542263f5c471934f9f2649b /src/main/resources/assets/gregtech/textures/blocks | |
| parent | fcaefe2d2853651f05d83105ee1c7deba104bb9c (diff) | |
| parent | 34474480f73ca5ab1c711d73bdb4bd809673e063 (diff) | |
| download | GT5-Unofficial-de42d1da4264bc0dd339020374b45138d8ddb691.tar.gz GT5-Unofficial-de42d1da4264bc0dd339020374b45138d8ddb691.tar.bz2 GT5-Unofficial-de42d1da4264bc0dd339020374b45138d8ddb691.zip | |
Merge remote-tracking branch 'GT5-Unofficial-Fork/ChemistryUpdate' into
BrickedBlastFurnace
Conflicts:
src/main/java/gregtech/api/enums/Materials.java
src/main/java/gregtech/api/enums/Textures.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
Diffstat (limited to 'src/main/resources/assets/gregtech/textures/blocks')
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png | bin | 938 -> 1147 bytes |
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM_PLUS.png | bin | 0 -> 1147 bytes |
| -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 |
6 files changed, 0 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png Binary files differindex 72c4f05658..7f896a09f0 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM_PLUS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM_PLUS.png Binary files differnew file mode 100644 index 0000000000..666d51b82f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM_PLUS.png 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 |
