Merge branch 'develop' into refactor-content

This commit is contained in:
Blade Barringer
2015-09-25 12:22:11 -05:00
40 changed files with 3335 additions and 3210 deletions

View File

@@ -593,8 +593,13 @@ let head = {
text: t('headMystery201508Text'),
notes: t('headMystery201508Notes'),
mystery: '201508',
value: 0,
int: 0
value: 0
},
201509: {
text: t('headMystery201509Text'),
notes: t('headMystery201509Notes'),
mystery:'201509',
value: 0
},
301404: {
text: t('headMystery301404Text'),

View File

@@ -84,8 +84,13 @@ export var armor = {
text: t('armorMystery201508Text'),
notes: t('armorMystery201508Notes'),
mystery: '201508',
value: 0,
int: 0
value: 0
},
201509: {
text: t('armorMystery201509Text'),
notes: t('armorMystery201509Notes'),
mystery: '201509',
value: 0
},
301404: {
text: t('armorMystery301404Text'),

View File

@@ -97,6 +97,11 @@ let mysterySets = {
end: '2015-09-02',
text: 'Cheetah Costume Set'
},
201509: {
start:'2015-09-24',
end:'2015-10-02',
text:'Werewolf Set'
},
301404: {
start: '3014-03-24',
end: '3014-04-02',