Sabe Jones fc46023561 feat(armoire): October content ...

(cherry picked from commit 2b2a85838dbc4539d41e6e2d508374b0960238d6)

Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith-main-3.png
	common/dist/sprites/spritesmith-main-4.css
	common/dist/sprites/spritesmith-main-4.png
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.css
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.css
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.css
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.css
	common/dist/sprites/spritesmith-main-9.png

2015-10-01 14:21:01 -05:00

..

_README_FIRST.md

swap README files for en and zk. What WAS I thinking?

2015-09-27 06:52:23 +10:00

backgrounds.json

feat(content): September content adds

2015-08-31 18:16:54 -04:00

challenge.json

Wording: Proper English it was not

2015-08-20 16:55:05 +02:00

character.json

Update English strings

2015-07-30 21:36:09 -05:00

communityGuidelines.json

HabitRPG -> Habitica where missed

2015-07-31 09:20:20 +02:00

content.json

feat(pets): Improve egg canBuy logic

2015-09-24 17:33:58 -04:00

contrib.json

remove mention of ads from locale strings, delete ads strings that are no longer used - fixes https://github.com/HabitRPG/habitrpg/issues/5765

2015-08-13 16:46:02 +10:00

death.json

feat(warning): Revised low health modal

2015-09-02 16:31:56 -04:00

defaultTasks.json

remove commented-out default task code and unused default task locale strings - fixes https://github.com/HabitRPG/habitrpg/issues/5631#issuecomment-130619901 (comment by GitHubSphinx)

2015-08-15 13:23:42 +10:00

faq.json

Fix markdown bug in faq. Fixes #5920

2015-09-13 18:36:36 -05:00

front.json

fix(social): Localize Tweet button

2015-09-10 18:51:19 -04:00

gear_README.md

Moved folders into common directory

2015-01-21 10:34:04 -06:00

gear.json

feat(armoire): October content

2015-10-01 14:21:01 -05:00

generic.json

add new audi theme from LuneFox, moved themes to alphabetical order, adjusted file permissions for Watts Theme

2015-09-12 11:05:31 +10:00

groups.json

Rename translation key

2015-09-19 10:41:21 -05:00

limited.json

feat(magic-potions): Final tweaks

2015-09-28 14:58:46 -04:00

messages.json

feat(pets): Improve egg canBuy logic

2015-09-24 17:33:58 -04:00

npc.json

WIP(tutorial): New intro splash

2015-08-27 16:04:59 -04:00

pets.json

Put magic pets on their own row

2015-10-01 13:21:15 -05:00

quests.json

Revert "feat(modals): Simplified scroll drop"

2015-09-10 18:08:51 -04:00

questsContent.json

feat(quests): Horse quest

2015-09-01 13:26:41 -04:00

rebirth.json

remove "as if you had created a new account" from Orb of Rebirth description

2015-08-23 17:43:33 +10:00

settings.json

Tweak wording of custom day start warning

2015-09-06 10:11:28 -05:00

spells.json

feat(event): Summer Splash cont'd

2015-07-01 13:11:53 -05:00

subscriber.json

fix(misc): Tweaks

2015-09-21 13:59:00 -04:00

tasks.json

Update information about max levels for buffs.

2015-08-17 11:34:30 -05:00