diff options
author | Dream-Master <dream-master@gmx.net> | 2017-06-14 18:33:32 +0200 |
---|---|---|
committer | Dream-Master <dream-master@gmx.net> | 2017-06-14 18:33:32 +0200 |
commit | 39eb5b0b69eeb52db6ca90695bdee851974325e1 (patch) | |
tree | 019193c8f1dd9d4b099294d62f10a97f4c7576f9 /src/main/resources | |
parent | e25a9416d44c1c69ab9434af9f0e2ba643308d38 (diff) | |
parent | fd714b65496fcdd6f610c1b7176c568781e32eb8 (diff) | |
download | GT5-Unofficial-39eb5b0b69eeb52db6ca90695bdee851974325e1.tar.gz GT5-Unofficial-39eb5b0b69eeb52db6ca90695bdee851974325e1.tar.bz2 GT5-Unofficial-39eb5b0b69eeb52db6ca90695bdee851974325e1.zip |
Merge branch 'Oil-Refinery-update' into experimental
Diffstat (limited to 'src/main/resources')
11 files changed, 0 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler.png Binary files differindex 871a39386e..7ab09c5f2e 100644 --- a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler.png +++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler.png diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/DistillationTower.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/DistillationTower.png Binary files differnew file mode 100644 index 0000000000..0fb00229d7 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/DistillationTower.png diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/NineXNine.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/NineXNine.png Binary files differnew file mode 100644 index 0000000000..628d86f05f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/NineXNine.png diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/OilCracker.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/OilCracker.png Binary files differnew file mode 100644 index 0000000000..f72b37ac2f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/OilCracker.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/557.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/557.png Binary files differnew file mode 100644 index 0000000000..8efdced399 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/557.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..4cae7f4118 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..3f366301b9 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.png Binary files differnew file mode 100644 index 0000000000..131fd33c02 --- /dev/null +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.png Binary files differnew file mode 100644 index 0000000000..f54e4f31dd --- /dev/null +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.png Binary files differnew file mode 100644 index 0000000000..e9216ac272 --- /dev/null +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.4.png Binary files differnew file mode 100644 index 0000000000..ee0f0d0a6d --- /dev/null +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.4.png |