diff options
| author | Technus <daniel112092@gmail.com> | 2017-12-17 07:05:06 +0100 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-12-17 07:05:06 +0100 |
| commit | 4da1b57533dbfcd564c9a216dd2796664e65c36c (patch) | |
| tree | b86ebb95297aed5910f6a605c02b082953d61026 /src/main/resources/assets/tectech | |
| parent | d1bbc1bba95492a4256b98dbdaedaa178c204b04 (diff) | |
| parent | ffce854a03b63f1f37f22261536bf98a4f05d030 (diff) | |
| download | GT5-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')
| -rw-r--r-- | src/main/resources/assets/tectech/lang/en_US.lang | 1 | ||||
| -rw-r--r-- | src/main/resources/assets/tectech/textures/blocks/blockReactorSimulator.png | bin | 0 -> 1147 bytes | |||
| -rw-r--r-- | src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorage.png | bin | 0 -> 7526 bytes | |||
| -rw-r--r-- | src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorage.png.mcmeta | 5 | ||||
| -rw-r--r-- | src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorageOff.png | bin | 0 -> 5511 bytes | |||
| -rw-r--r-- | src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorageOff.png.mcmeta | 5 |
6 files changed, 11 insertions, 0 deletions
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index 5d041a12e9..20160069e4 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -3,6 +3,7 @@ tile.quantumGlass.name=Quantum Glass tile.quantumStuff.name=Quantum Stuff item.em.debugContainer.name=Debug EM Container item.em.definitionContainer.name=EM Recipe Hint +item.em.definitionScanStorage.name=EM Scan Storage item.em.debugBuilder.name=Multiblock Machine Blueprint item.em.parametrizerMemoryCard.name=Parametrizer Memory Card diff --git a/src/main/resources/assets/tectech/textures/blocks/blockReactorSimulator.png b/src/main/resources/assets/tectech/textures/blocks/blockReactorSimulator.png Binary files differnew file mode 100644 index 0000000000..92c6a3691c --- /dev/null +++ b/src/main/resources/assets/tectech/textures/blocks/blockReactorSimulator.png diff --git a/src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorage.png b/src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorage.png Binary files differnew file mode 100644 index 0000000000..73c5274ef9 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorage.png 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 Binary files differnew file mode 100644 index 0000000000..006ae1e62f --- /dev/null +++ b/src/main/resources/assets/tectech/textures/items/itemDefinitionScanStorageOff.png 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 |
