diff options
| author | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-18 17:26:04 +0200 |
|---|---|---|
| committer | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-18 17:26:04 +0200 |
| commit | 668ca431a8039f920414f296e00194a164ce5f4e (patch) | |
| tree | c808e407ae3f0c950bd201e735ce5bb99c34abe3 /src/main/resources | |
| parent | a739167c7f28c65b6f66960150791eb9d1181e29 (diff) | |
| parent | 337b6fc66d25361095ad4eddd86992d92668be03 (diff) | |
| download | GT5-Unofficial-668ca431a8039f920414f296e00194a164ce5f4e.tar.gz GT5-Unofficial-668ca431a8039f920414f296e00194a164ce5f4e.tar.bz2 GT5-Unofficial-668ca431a8039f920414f296e00194a164ce5f4e.zip | |
Merge remote-tracking branch 'origin/unstable' into OilRefining
Conflicts:
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')
9 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_MINING_OSMIRIDIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_OSMIRIDIUM.png Binary files differnew file mode 100644 index 0000000000..d0fcc4da96 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_OSMIRIDIUM.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ADVMINER2.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ORE_DRILL.png Binary files differindex bc1dd3f5f0..bc1dd3f5f0 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ADVMINER2.png +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ORE_DRILL.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ADVMINER2_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ORE_DRILL_ACTIVE.png Binary files differindex b57178136f..b57178136f 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ADVMINER2_ACTIVE.png +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ORE_DRILL_ACTIVE.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 diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/AdvMiner2.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/OreDrillingPlant.png Binary files differindex 7b60ec4de7..7b60ec4de7 100644 --- a/src/main/resources/assets/gregtech/textures/gui/multimachines/AdvMiner2.png +++ b/src/main/resources/assets/gregtech/textures/gui/multimachines/OreDrillingPlant.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png Binary files differindex d6ff394c66..ad7b99d233 100644 --- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.png Binary files differnew file mode 100644 index 0000000000..d6ff394c66 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.png |
