aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorLogan Perkins <perkins@github.alestan.publicvm.com>2016-06-24 16:05:20 -0700
committerGitHub <noreply@github.com>2016-06-24 16:05:20 -0700
commit8cd97be0862bbe00e989b3fbdc0bee536f094586 (patch)
tree48c270237f1d4ae1b8eb37885cd7d6ea2025b2ab /src/main/resources
parentf16aeb2d1fdd406d7281d45ce764a485e4b71064 (diff)
parent01b15f4251c7e4a9278748562dc28beed41f545c (diff)
downloadGT5-Unofficial-8cd97be0862bbe00e989b3fbdc0bee536f094586.tar.gz
GT5-Unofficial-8cd97be0862bbe00e989b3fbdc0bee536f094586.tar.bz2
GT5-Unofficial-8cd97be0862bbe00e989b3fbdc0bee536f094586.zip
Merge pull request #1 from Blood-Asp/experimental
Update to latest from official
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.pngbin0 -> 103 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ENGINE_INTAKE.pngbin0 -> 610 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/multimachines/LargeDieselEngine.pngbin0 -> 1870 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/724.pngbin0 -> 878 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/725.pngbin0 -> 738 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/726.pngbin0 -> 561 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/270.pngbin0 -> 278 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/271.pngbin0 -> 278 bytes
8 files changed, 0 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.png
new file mode 100644
index 0000000000..2bd83db3c4
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ENGINE_INTAKE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ENGINE_INTAKE.png
new file mode 100644
index 0000000000..bb2f520e30
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ENGINE_INTAKE.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeDieselEngine.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeDieselEngine.png
new file mode 100644
index 0000000000..b9271e2140
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeDieselEngine.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/724.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/724.png
new file mode 100644
index 0000000000..6b722f6f0d
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/724.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/725.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/725.png
new file mode 100644
index 0000000000..29e7ee26b5
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/725.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/726.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/726.png
new file mode 100644
index 0000000000..bd103513c9
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/726.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/270.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/270.png
new file mode 100644
index 0000000000..a667e1df05
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/270.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/271.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/271.png
new file mode 100644
index 0000000000..a667e1df05
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/271.png
Binary files differ