diff options
author | Technus <daniel112092@gmail.com> | 2017-07-23 20:46:31 +0200 |
---|---|---|
committer | Technus <daniel112092@gmail.com> | 2017-07-23 20:46:31 +0200 |
commit | 5fd8f681689686591b3bf6d4b84ab093ffe69077 (patch) | |
tree | 8fa1c98983252c4cdab8fd99c98f65d0cc8eddc0 /src/main/resources/assets | |
parent | 8ff87e5a4c306c80c44b4a18e20b44b3195b5f91 (diff) | |
parent | 5045ee4c216159fe23347d67f3cf27c420c9e1ca (diff) | |
download | GT5-Unofficial-5fd8f681689686591b3bf6d4b84ab093ffe69077.tar.gz GT5-Unofficial-5fd8f681689686591b3bf6d4b84ab093ffe69077.tar.bz2 GT5-Unofficial-5fd8f681689686591b3bf6d4b84ab093ffe69077.zip |
Merge branch 'master' of https://github.com/Technus/TecTech
Diffstat (limited to 'src/main/resources/assets')
-rw-r--r-- | src/main/resources/assets/tectech/lang/en_US.lang | 3 | ||||
-rw-r--r-- | src/main/resources/assets/tectech/sounds.json | 7 | ||||
-rw-r--r-- | src/main/resources/assets/tectech/sounds/microwave_ding.ogg | bin | 0 -> 48584 bytes |
3 files changed, 10 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 691a8e5bff..6d76b761f7 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -2,3 +2,6 @@ itemGroup.TecTech=TecTech Interdimensional tile.quantumGlass.name=Quantum Glass item.em.debugContainer.name=Debug EM Container item.em.debugBuilder.name=Debug Builder + +death.attack.microwaving=%1$s was dehydrated by radiation. +death.attack.microwaving.player=%1$s was was dehydrated by radiation while fighting %2$s. diff --git a/src/main/resources/assets/tectech/sounds.json b/src/main/resources/assets/tectech/sounds.json new file mode 100644 index 0000000000..73c9e62808 --- /dev/null +++ b/src/main/resources/assets/tectech/sounds.json @@ -0,0 +1,7 @@ +{ + "microwave_ding": { + "category": "block", + "subtitle": "tectech.subtitle.microwave_ding", + "sounds": [{"name": "microwave_ding","stream": false}] + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/tectech/sounds/microwave_ding.ogg b/src/main/resources/assets/tectech/sounds/microwave_ding.ogg Binary files differnew file mode 100644 index 0000000000..489c3749d7 --- /dev/null +++ b/src/main/resources/assets/tectech/sounds/microwave_ding.ogg |