aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources/assets/tectech/textures
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-12-17 07:05:06 +0100
committerTechnus <daniel112092@gmail.com>2017-12-17 07:05:06 +0100
commit4da1b57533dbfcd564c9a216dd2796664e65c36c (patch)
treeb86ebb95297aed5910f6a605c02b082953d61026 /src/main/resources/assets/tectech/textures
parentd1bbc1bba95492a4256b98dbdaedaa178c204b04 (diff)
parentffce854a03b63f1f37f22261536bf98a4f05d030 (diff)
downloadGT5-Unofficial-4da1b57533dbfcd564c9a216dd2796664e65c36c.tar.gz
GT5-Unofficial-4da1b57533dbfcd564c9a216dd2796664e65c36c.tar.bz2
GT5-Unofficial-4da1b57533dbfcd564c9a216dd2796664e65c36c.zip
Merge branch 'master' into bassAdditions
Diffstat (limited to 'src/main/resources/assets/tectech/textures')
-rw-r--r--src/main/resources/assets/tectech/textures/blocks/blockReactorSimulator.pngbin0 -> 1147 bytes
-rw-r--r--src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorage.pngbin0 -> 7526 bytes
-rw-r--r--src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorage.png.mcmeta5
-rw-r--r--src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorageOff.pngbin0 -> 5511 bytes
-rw-r--r--src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorageOff.png.mcmeta5
5 files changed, 10 insertions, 0 deletions
diff --git a/src/main/resources/assets/tectech/textures/blocks/blockReactorSimulator.png b/src/main/resources/assets/tectech/textures/blocks/blockReactorSimulator.png
new file mode 100644
index 0000000000..92c6a3691c
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/blocks/blockReactorSimulator.png
Binary files differ
diff --git a/src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorage.png b/src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorage.png
new file mode 100644
index 0000000000..73c5274ef9
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorage.png
Binary files differ
diff --git a/src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorage.png.mcmeta b/src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorage.png.mcmeta
new file mode 100644
index 0000000000..24f863c95e
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorage.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation":{
+ "frametime":3
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorageOff.png b/src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorageOff.png
new file mode 100644
index 0000000000..006ae1e62f
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorageOff.png
Binary files differ
diff --git a/src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorageOff.png.mcmeta b/src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorageOff.png.mcmeta
new file mode 100644
index 0000000000..24f863c95e
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorageOff.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation":{
+ "frametime":3
+ }
+} \ No newline at end of file