diff options
| author | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2013-12-14 23:03:36 +0200 |
|---|---|---|
| committer | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2013-12-14 23:03:36 +0200 |
| commit | 6179c30aa5a053adce80dce2658495af3b142ff1 (patch) | |
| tree | 0e6c2f3dd6a20cdab968c6a2d9e6993676297a64 /resources/assets/briefcasespeakers/lang | |
| parent | 82f70a31ea3845242f464e53d7844c8260d1ff1f (diff) | |
| parent | 0e733050e5822b569e9b4834c7f2224dbe688659 (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 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/resources/assets/briefcasespeakers/lang/en_US.lang b/resources/assets/briefcasespeakers/lang/en_US.lang index 0c23ac9..4101d17 100644 --- a/resources/assets/briefcasespeakers/lang/en_US.lang +++ b/resources/assets/briefcasespeakers/lang/en_US.lang @@ -1,10 +1,10 @@ -item.briefcasespeakers.briefcaseSpeakers=Briefcase Speakers -item.briefcasespeakers.remote=Audio Remote -item.briefcasespeakers.speakers=Speakers -item.briefcasespeakers.thiefGloves=Thiefing Gloves -item.briefcasespeakers.ingotShadow=Shadow Ingot -tile.briefcasespeakers.oreShadow=Shadow Ore -tile.briefcasespeakers.smelter=Smelter -tile.briefcasespeakers.molder=Molder -tile.briefcasespeakers.jewelCraftingTable=Jewelers Crafting Table -itemGroup.shadowspkrs=Jewelcraft/Randomcraft
\ No newline at end of file +item.briefcasespeakers.briefcaseSpeakers.name=Briefcase Speakers +item.briefcasespeakers.remote.name=Audio Remote +item.briefcasespeakers.speakers.name=Speakers +item.briefcasespeakers.thiefGloves.name=Thiefing Gloves +item.briefcasespeakers.ingotShadow.name=Shadow Ingot +tile.briefcasespeakers.oreShadow.name=Shadow Ore +tile.briefcasespeakers.smelter.name=Smelter +tile.briefcasespeakers.molder.name=Molder +tile.briefcasespeakers.jewelCraftingTable.name=Jewelers Crafting Table +itemGroup.shadowspkrs.name=Jewelcraft/Randomcraft |