Sabe Jones beb86ea4bd Merge branch 'khipkin/party-badges' into develop ...

Conflicts:
	common/dist/sprites/spritesmith-main-10.png
	common/dist/sprites/spritesmith-main-11.png
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.png

2016-03-15 14:57:38 -04: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): Armoire and BGs 2016-03

2016-03-01 15:59:25 -05:00

challenge.json

Merge branch 'develop' into sabrecat/more-modals

2015-10-28 14:54:55 -04:00

character.json

updated menu names for better description

2016-02-28 16:10:26 -06:00

communityGuidelines.json

#6779 Update community guidelines

2016-02-27 02:47:58 -08:00

content.json

feat(content): snail pet quest WIP

2016-03-09 15:34:57 -05:00

contrib.json

Changed submenu from Hall of Heroes to Hall of Contributors

2016-02-29 20:23:05 -06: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

update help menu and FAQ to jump to Wikia

2016-01-05 12:19:18 -08:00

front.json

Merge pull request #6586 from anowlcalledjosh/front_page_image_alts

2016-02-09 18:15:47 +10:00

gear_README.md

Moved folders into common directory

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

gear.json

feat(content): Armoire and BGs 2016-03

2016-03-01 15:59:25 -05:00

generic.json

feat(event): Habit Birthday 2016

2016-01-28 17:16:01 -05:00

groups.json

add strings for new partyUp and partyOn achievs

2016-03-08 20:45:33 -05:00

limited.json

chore(event): end Winter Wonderland

2016-02-01 17:01:17 -05:00

merch.json

added EU version of t-shirt

2016-01-06 23:15:36 +01:00

messages.json

Fixed template syntax.

2015-12-03 13:33:52 +01:00

noscript.json

Converted noscript text into translatable strings

2015-11-17 22:22:55 -05:00

npc.json

Modifications to settings mixin and misc last changes.

2016-01-12 15:00:07 -05:00

overview.json

fix(overview): Wording and layout tweaks

2015-11-05 14:18:51 -05:00

pets.json

change Beast Master text from insanely to incredibly - partial fix for https://github.com/HabitRPG/habitrpg/issues/6685

2016-02-10 07:45:22 +10:00

quests.json

Merge branch 'develop' into sabrecat/more-modals

2015-10-20 12:50:34 -04:00

questsContent.json

fix(content): Pfeffernusse typo, again

2016-03-10 17:35:36 -06:00

rebirth.json

adjust rebirth description to specify that you must change class to buy class-specific gear

2016-02-09 11:52:07 +10:00

settings.json

fix(subscription): clarify credits wording

2016-01-29 13:09:40 -05:00

spells.json

feat(event): Summer Splash cont'd

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

subscriber.json

feat(subscription): mystery items 201602

2016-02-23 17:00:55 -05:00

tasks.json

remove instructions for Beeminder users to read a warning about deleting completed To-Dos (warning is no longer needed)

2016-01-31 18:25:37 +10:00