diff options
| author | Technus <daniel112092@gmail.com> | 2017-08-21 08:44:13 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-08-21 08:44:13 +0200 |
| commit | 712d76561585ab35e787d2db2593ed84650a356e (patch) | |
| tree | 088accfe712f0488ae46cb132fde039751b45b6b /src/main/resources | |
| parent | cc4055e984cdfd685738acf003ac02916070559f (diff) | |
| parent | f255a93d8141e51c0406dc497b9e5f68e4b8bcdc (diff) | |
| download | GT5-Unofficial-712d76561585ab35e787d2db2593ed84650a356e.tar.gz GT5-Unofficial-712d76561585ab35e787d2db2593ed84650a356e.tar.bz2 GT5-Unofficial-712d76561585ab35e787d2db2593ed84650a356e.zip | |
Merge branch 'master' into bassAdditions
Diffstat (limited to 'src/main/resources')
| -rw-r--r-- | src/main/resources/assets/tectech/lang/en_US.lang | 2 | ||||
| -rw-r--r-- | src/main/resources/assets/tectech/textures/blocks/blockQuantumStuff.png | bin | 0 -> 228 bytes | |||
| -rw-r--r-- | src/main/resources/assets/tectech/textures/blocks/blockQuantumStuff.png.mcmeta | 5 | ||||
| -rw-r--r-- | src/main/resources/assets/tectech/textures/items/itemDefinitionContainer.png | bin | 0 -> 1588 bytes | |||
| -rw-r--r-- | src/main/resources/assets/tectech/textures/items/itemDefinitionContainer.png.mcmeta | 5 |
5 files changed, 12 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 10aebd7391..5d041a12e9 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -1,6 +1,8 @@ itemGroup.TecTech=TecTech Interdimensional 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.debugBuilder.name=Multiblock Machine Blueprint item.em.parametrizerMemoryCard.name=Parametrizer Memory Card diff --git a/src/main/resources/assets/tectech/textures/blocks/blockQuantumStuff.png b/src/main/resources/assets/tectech/textures/blocks/blockQuantumStuff.png Binary files differnew file mode 100644 index 0000000000..d03659020c --- /dev/null +++ b/src/main/resources/assets/tectech/textures/blocks/blockQuantumStuff.png diff --git a/src/main/resources/assets/tectech/textures/blocks/blockQuantumStuff.png.mcmeta b/src/main/resources/assets/tectech/textures/blocks/blockQuantumStuff.png.mcmeta new file mode 100644 index 0000000000..60af678259 --- /dev/null +++ b/src/main/resources/assets/tectech/textures/blocks/blockQuantumStuff.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":4 + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/tectech/textures/items/itemDefinitionContainer.png b/src/main/resources/assets/tectech/textures/items/itemDefinitionContainer.png Binary files differnew file mode 100644 index 0000000000..173d0c4e6c --- /dev/null +++ b/src/main/resources/assets/tectech/textures/items/itemDefinitionContainer.png diff --git a/src/main/resources/assets/tectech/textures/items/itemDefinitionContainer.png.mcmeta b/src/main/resources/assets/tectech/textures/items/itemDefinitionContainer.png.mcmeta new file mode 100644 index 0000000000..24f863c95e --- /dev/null +++ b/src/main/resources/assets/tectech/textures/items/itemDefinitionContainer.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":3 + } +}
\ No newline at end of file |
