Merge branch 'release' into develop

This commit is contained in:
Sabe Jones
2019-02-02 13:11:25 -06:00
4 changed files with 7 additions and 7 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.82.1",
"version": "4.82.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.82.1",
"version": "4.82.2",
"main": "./website/server/index.js",
"dependencies": {
"@slack/client": "^3.8.1",
+1 -1
View File
@@ -13,7 +13,7 @@ import forEach from 'lodash/forEach';
import moment from 'moment';
describe('shared.ops.purchase', () => {
const SEASONAL_FOOD = 'Cake_Base';
const SEASONAL_FOOD = 'Meat';
let user;
let goldPoints = 40;
let analytics = {track () {}};
+4 -4
View File
@@ -356,12 +356,12 @@ api.specialMounts = stable.specialMounts;
api.mountInfo = stable.mountInfo;
// For seasonal events, change these booleans:
let canBuyNormalFood = false;
let canDropNormalFood = false;
let canBuyNormalFood = true;
let canDropNormalFood = true;
let canBuyCandyFood = false;
let canDropCandyFood = false;
let canBuyCakeFood = true;
let canDropCakeFood = true;
let canBuyCakeFood = false;
let canDropCakeFood = false;
api.food = {
Meat: {