aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources/assets
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-06-14 18:33:32 +0200
committerDream-Master <dream-master@gmx.net>2017-06-14 18:33:32 +0200
commit39eb5b0b69eeb52db6ca90695bdee851974325e1 (patch)
tree019193c8f1dd9d4b099294d62f10a97f4c7576f9 /src/main/resources/assets
parente25a9416d44c1c69ab9434af9f0e2ba643308d38 (diff)
parentfd714b65496fcdd6f610c1b7176c568781e32eb8 (diff)
downloadGT5-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/assets')
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler.pngbin2387 -> 3124 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/DistillationTower.pngbin0 -> 2788 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/NineXNine.pngbin0 -> 2631 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/OilCracker.pngbin0 -> 4782 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/557.pngbin0 -> 621 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.pngbin364 -> 3262 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.pngbin0 -> 3023 bytes
-rw-r--r--src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.pngbin0 -> 3115 bytes
-rw-r--r--src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.pngbin0 -> 3171 bytes
-rw-r--r--src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.pngbin0 -> 3302 bytes
-rw-r--r--src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.4.pngbin0 -> 705 bytes
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
index 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
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/DistillationTower.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/DistillationTower.png
new file mode 100644
index 0000000000..0fb00229d7
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/DistillationTower.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/NineXNine.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/NineXNine.png
new file mode 100644
index 0000000000..628d86f05f
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/NineXNine.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/OilCracker.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/OilCracker.png
new file mode 100644
index 0000000000..f72b37ac2f
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/OilCracker.png
Binary files differ
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
new file mode 100644
index 0000000000..8efdced399
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/557.png
Binary files differ
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
index 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
Binary files differ
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
new file mode 100644
index 0000000000..3f366301b9
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.png
Binary files differ
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
new file mode 100644
index 0000000000..131fd33c02
--- /dev/null
+++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.png
Binary files differ
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
new file mode 100644
index 0000000000..f54e4f31dd
--- /dev/null
+++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.png
Binary files differ
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
new file mode 100644
index 0000000000..e9216ac272
--- /dev/null
+++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.png
Binary files differ
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
new file mode 100644
index 0000000000..ee0f0d0a6d
--- /dev/null
+++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.4.png
Binary files differ