diff options
| author | Johannes Gäßler <updrn@student.kit.edu> | 2017-05-20 00:02:00 +0200 |
|---|---|---|
| committer | Johannes Gäßler <updrn@student.kit.edu> | 2017-05-20 00:02:00 +0200 |
| commit | 0217101187b04775b41a8c36cc94f9f47cc61371 (patch) | |
| tree | e46c8c23fa3ed0580a5279210d692bfbdc436f0a /src/main/resources/assets/gregtech/textures | |
| parent | 08cd5fe48560f7b8db2252733afe59d160eaf426 (diff) | |
| parent | 724f9a4e09ebb1971bb9561c2dc8373aaf6f1af7 (diff) | |
| download | GT5-Unofficial-0217101187b04775b41a8c36cc94f9f47cc61371.tar.gz GT5-Unofficial-0217101187b04775b41a8c36cc94f9f47cc61371.tar.bz2 GT5-Unofficial-0217101187b04775b41a8c36cc94f9f47cc61371.zip | |
Merge branch 'ChemistryUpdate' into mergeGTNH
Conflicts:
src/main/java/gregtech/GT_Mod.java
src/main/java/gregtech/api/enums/ItemList.java
src/main/java/gregtech/api/enums/Materials.java
src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
src/main/java/gregtech/api/util/GT_Recipe.java
src/main/java/gregtech/common/GT_Proxy.java
src/main/java/gregtech/common/GT_RecipeAdder.java
src/main/java/gregtech/common/blocks/GT_Block_Casings2.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java
src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
Diffstat (limited to 'src/main/resources/assets/gregtech/textures')
| -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 |
