diff options
| author | Tec <daniel112092@gmail.com> | 2019-07-15 06:17:38 +0200 |
|---|---|---|
| committer | Tec <daniel112092@gmail.com> | 2019-07-15 06:17:38 +0200 |
| commit | e739e0df9802d2d139c1b3241746af80eef0f4b4 (patch) | |
| tree | cda2615fc57c8d41ff149d57fc304c4db31c4a87 /src/main/resources/assets | |
| parent | 41e8623f77b750efc531d7c545094991f6ade55a (diff) | |
| parent | c3388bf4fb0acad4ebdda64d178453edcc3cfeb8 (diff) | |
| download | GT5-Unofficial-e739e0df9802d2d139c1b3241746af80eef0f4b4.tar.gz GT5-Unofficial-e739e0df9802d2d139c1b3241746af80eef0f4b4.tar.bz2 GT5-Unofficial-e739e0df9802d2d139c1b3241746af80eef0f4b4.zip | |
Merge branch 'betterParametrizers' into BassAddons
# Conflicts:
# src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java
# src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
Diffstat (limited to 'src/main/resources/assets')
| -rw-r--r-- | src/main/resources/assets/tectech/lang/en_US.lang | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index ac36e32772..e097c612ba 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -16,4 +16,7 @@ death.attack.microwaving=%1$s was dehydrated by radiation. death.attack.microwaving.player=%1$s was dehydrated by radiation while fighting %2$s. death.attack.elementalPollution=%1$s was vaping from the wrong hole. -death.attack.elementalPollution.player=%1$s was vaping from the wrong hole while fighting %2$s.
\ No newline at end of file +death.attack.elementalPollution.player=%1$s was vaping from the wrong hole while fighting %2$s. + +death.attack.subspace=%1$s was N-th dimensionally displeased. +death.attack.subspace.player=%1$s N-th dimensionally displeased while fighting %2$s.
\ No newline at end of file |