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

Merge branch 'release' into sabrecat/timetrav-bgs

Browse Source
This commit is contained in:
Sabe Jones
2020-01-21 14:58:51 -06:00
parent 0fd3e42fb2 1e005a8bc4
commit ee9eb3f78a
311 changed files with 13085 additions and 5455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/common/script/content/appearance/sets.js
View File

@@ -17,7 +17,7 @@ export default prefill({
setPrice: 5, availableFrom: '2019-10-08', availableUntil: '2019-11-02', text: t('hauntedColors'),
},
winteryHairColors: {
setPrice: 5, availableFrom: '2019-01-08', availableUntil: '2019-02-02', text: t('winteryColors'),
setPrice: 5, availableFrom: '2020-01-10', availableUntil: '2020-02-02', text: t('winteryColors'),
},
rainbowSkins: { setPrice: 5, text: t('rainbowSkins') },
animalSkins: { setPrice: 5, text: t('animalSkins') },
@@ -32,6 +32,6 @@ export default prefill({
setPrice: 5, availableFrom: '2019-07-02', availableUntil: '2019-08-02', text: t('splashySkins'),
},
winterySkins: {
setPrice: 5, availableFrom: '2019-01-08', availableUntil: '2019-02-02', text: t('winterySkins'),
setPrice: 5, availableFrom: '2020-01-10', availableUntil: '2020-02-02', text: t('winterySkins'),
},
});

640
website/common/script/content/loginIncentives.js
View File

File diff suppressed because it is too large Load Diff