krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-15 21:57:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' into develop

Browse Source
This commit is contained in:
Sabe Jones
2017-08-03 21:46:41 +00:00
parent 75913842bc 9b2b9ef54d
commit ac800a94f9
230 changed files with 34809 additions and 34141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
website/common/script/libs/shops.js
View File

@@ -300,22 +300,9 @@ shops.getTimeTravelersCategories = function getTimeTravelersCategories (user, la
// };
shops.getSeasonalShopCategories = function getSeasonalShopCategories (user, language) {
const AVAILABLE_SETS = {
summerHealer: i18n.t('reefSeahealerSet', language),
summer2015Healer: i18n.t('strappingSailorSet', language),
summer2016Healer: i18n.t('summer2016SeahorseHealerSet', language),
summerMage: i18n.t('emeraldMermageSet', language),
summer2015Mage: i18n.t('shipSoothsayerSet', language),
summer2016Mage: i18n.t('summer2016DolphinMageSet', language),
summerRogue: i18n.t('roguishPirateSet', language),
summer2015Rogue: i18n.t('reefRenegadeSet', language),
summer2016Rogue: i18n.t('summer2016EelSet', language),
summerWarrior: i18n.t('daringSwashbucklerSet', language),
summer2015Warrior: i18n.t('sunfishWarriorSet', language),
summer2016Warrior: i18n.t('summer2016SharkWarriorSet', language),
};
const AVAILABLE_SPELLS = [
'seafoam',
];
const AVAILABLE_QUESTS = [