Merge branch 'release' into develop

This commit is contained in:
Sabe Jones 2021-06-25 07:49:22 -05:00
commit 037d6d9ee4
3 changed files with 4 additions and 2 deletions

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.197.1",
"version": "4.197.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View file

@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.197.1",
"version": "4.197.2",
"main": "./website/server/index.js",
"dependencies": {
"@babel/core": "^7.14.3",

View file

@ -3110,10 +3110,12 @@ const weapon = {
},
summer2018Mage: {
set: 'summer2018LionfishMageSet',
event: EVENTS.summer2021,
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
},
summer2018Healer: {
set: 'summer2018MerfolkMonarchSet',
event: EVENTS.summer2021,
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
},
fall2018Rogue: {