Merge branch 'release' into develop

This commit is contained in:
Sabe Jones
2017-08-08 20:59:11 +00:00
231 changed files with 8701 additions and 8169 deletions
@@ -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: {
@@ -84,6 +84,12 @@ let premium = {
limited: true,
_season: 'July',
},
Ember: {
value: 2,
text: t('hatchingPotionEmber'),
limited: true,
_season: 'August',
},
Thunderstorm: {
value: 2,
text: t('hatchingPotionThunderstorm'),