Sabe Jones 9e45017faa Merge branch 'develop' into sabrecat/onboarding-tweaks ... Conflicts: common/dist/sprites/habitrpg-shared.css common/dist/sprites/spritesmith2.css common/dist/sprites/spritesmith2.png common/dist/sprites/spritesmith3.css common/dist/sprites/spritesmith3.png common/dist/sprites/spritesmith4.css common/dist/sprites/spritesmith4.png		2015-08-28 13:24:10 -05:00
..
backgrounds.json	feat(armoire): August additions	2015-08-04 12:45:01 -05: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): August cheetah quest	2015-08-19 16:55:14 -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	Revert change that made death.json executable :/	2015-08-06 08:53:08 -05: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
front.json	Change 2 strings to exclude html character codes	2015-08-16 14:17:26 +05:00
gear.json	feat(mystery): 2015 August items	2015-08-24 17:19:12 -04:00
gear_README.md	Moved folders into common directory	2015-01-21 10:34:04 -06:00
generic.json	Merge branch 'develop' into card_tweaks	2015-08-14 17:29:17 -05:00
groups.json	Update English strings	2015-07-30 21:36:09 -05:00
limited.json	remove text about unlocking Item Shop because it is now available to new players	2015-08-16 13:42:53 +10:00
messages.json	feat(mystery): July 2015 goodies	2015-07-23 12:05:13 -05:00
npc.json	WIP(tutorial): New intro splash	2015-08-27 16:04:59 -04:00
pets.json	Reconstructing pets and mounts progress strings	2015-08-13 20:39:23 +05:00
quests.json	feat(quests): Improve drop notif	2015-07-16 16:22:49 -05:00
questsContent.json	feat(pets): August cheetah quest	2015-08-19 16:55:14 -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	Fix typo	2015-08-09 10:06:00 -04:00
spells.json	feat(event): Summer Splash cont'd	2015-07-01 13:11:53 -05:00
subscriber.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
tasks.json	Update information about max levels for buffs.	2015-08-17 11:34:30 -05:00