diff options
| author | bspkrs <bspkrs@gmail.com> | 2013-12-14 15:40:37 -0500 |
|---|---|---|
| committer | bspkrs <bspkrs@gmail.com> | 2013-12-14 15:40:37 -0500 |
| commit | b68376d9767368f098666756eba8f53be902ee7a (patch) | |
| tree | e4ce451a13f30df643780132aa3623b14a3dee63 /resources/assets/briefcasespeakers/lang | |
| parent | ef07318ab81c61e2c2637cf473e5d3463f5567af (diff) | |
| parent | 2b3ed819fb92709c70554fe20cf8f7c0c61e76a9 (diff) | |
Merge branch 'master' of https://github.com/sor1n/Modjam-Mod
Conflicts:
resources/assets/briefcasespeakers/lang/en_US.lang
Diffstat (limited to 'resources/assets/briefcasespeakers/lang')
| -rw-r--r-- | resources/assets/briefcasespeakers/lang/en_US.lang | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/resources/assets/briefcasespeakers/lang/en_US.lang b/resources/assets/briefcasespeakers/lang/en_US.lang index d4979a3..4b58514 100644 --- a/resources/assets/briefcasespeakers/lang/en_US.lang +++ b/resources/assets/briefcasespeakers/lang/en_US.lang @@ -2,4 +2,5 @@ block.briefcasespeakers.briefcaseSpeakers.name=Briefcase Speakers item.briefcasespeakers.remote.name=Audio Remote item.briefcasespeakers.speaker.name=Speaker item.briefcasespeakers.thiefGloves.name=Thiefing Gloves -item.briefcasespeakers.ingotShadow.name=Shadow Ingot
\ No newline at end of file +item.briefcasespeakers.ingotShadow.name=Shadow Ingot +block.briefcasespeakers.oreShadow=Shadow Ore
\ No newline at end of file |