Merge branch 'release' into develop

This commit is contained in:
Sabe Jones
2018-08-21 18:32:52 +00:00
12 changed files with 39 additions and 43 deletions

View File

@@ -3,7 +3,7 @@ import defaults from 'lodash/defaults';
import each from 'lodash/each';
import t from './translation';
const CURRENT_SEASON = '_NONE_';
const CURRENT_SEASON = 'August';
let drops = {
Base: {

View File

@@ -8,12 +8,12 @@ const featuredItems = {
path: 'armoire',
},
{
type: 'food',
path: 'food.Saddle',
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.Ember',
},
{
type: 'food',
path: 'food.Fish',
type: 'eggs',
path: 'eggs.Dragon',
},
{
type: 'card',
@@ -31,7 +31,7 @@ const featuredItems = {
},
{
type: 'quests',
path: 'quests.whale',
path: 'quests.kangaroo',
},
],
seasonal: '',