aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-06-24 20:36:08 +0200
committerDream-Master <dream-master@gmx.net>2017-06-24 20:36:08 +0200
commitde5992daf970326153eb713fe7587d044eae2fda (patch)
treebae77aa181a1c955d5bacfb1f8716315d0c9639e /src/main/resources
parente401ef5f788e131114b618a140a562e2633faa2a (diff)
parentc2eaf942e3d2fc62272caa27162a6ad253af153d (diff)
downloadGT5-Unofficial-de5992daf970326153eb713fe7587d044eae2fda.tar.gz
GT5-Unofficial-de5992daf970326153eb713fe7587d044eae2fda.tar.bz2
GT5-Unofficial-de5992daf970326153eb713fe7587d044eae2fda.zip
Merge branch 'BrickedBlastFurnace' into experimental
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_BRICKEDBLASTFURNACE_ACTIVE.pngbin0 -> 705 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_BRICKEDBLASTFURNACE_INACTIVE.pngbin0 -> 645 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_DENSEBRICKS.pngbin0 -> 493 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/BrickedBlastFurnace.pngbin0 -> 2608 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/BronzeBlastFurnace.pngbin4387 -> 2345 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/110.pngbin0 -> 340 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/111.pngbin0 -> 340 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/74.pngbin0 -> 2919 bytes
8 files changed, 0 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_BRICKEDBLASTFURNACE_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_BRICKEDBLASTFURNACE_ACTIVE.png
new file mode 100644
index 0000000000..c3b3523c8d
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_BRICKEDBLASTFURNACE_ACTIVE.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_BRICKEDBLASTFURNACE_INACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_BRICKEDBLASTFURNACE_INACTIVE.png
new file mode 100644
index 0000000000..8a09b069f3
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_BRICKEDBLASTFURNACE_INACTIVE.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_DENSEBRICKS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_DENSEBRICKS.png
new file mode 100644
index 0000000000..a5e7b0e3d1
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_DENSEBRICKS.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/gui/BrickedBlastFurnace.png b/src/main/resources/assets/gregtech/textures/gui/BrickedBlastFurnace.png
new file mode 100644
index 0000000000..558db61062
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/gui/BrickedBlastFurnace.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/gui/BronzeBlastFurnace.png b/src/main/resources/assets/gregtech/textures/gui/BronzeBlastFurnace.png
index bac737bde8..9642624d6e 100644
--- a/src/main/resources/assets/gregtech/textures/gui/BronzeBlastFurnace.png
+++ b/src/main/resources/assets/gregtech/textures/gui/BronzeBlastFurnace.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/110.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/110.png
new file mode 100644
index 0000000000..f834df88be
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/110.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/111.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/111.png
new file mode 100644
index 0000000000..0182e14739
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/111.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/74.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/74.png
new file mode 100644
index 0000000000..8e7cdee46e
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/74.png
Binary files differ