Merge branch 'develop' into api-v3
This commit is contained in:
@@ -148,6 +148,12 @@ let back = {
|
||||
mystery: '201510',
|
||||
value: 0,
|
||||
},
|
||||
201602: {
|
||||
text: t('backMystery201602Text'),
|
||||
notes: t('backMystery201602Notes'),
|
||||
mystery: '201602',
|
||||
value: 0,
|
||||
},
|
||||
};
|
||||
|
||||
let eyewear = {
|
||||
@@ -268,6 +274,12 @@ let head = {
|
||||
mystery: '201601',
|
||||
value: 0,
|
||||
},
|
||||
201602: {
|
||||
text: t('headMystery201602Text'),
|
||||
notes: t('headMystery201602Notes'),
|
||||
mystery: '201602',
|
||||
value: 0,
|
||||
},
|
||||
301404: {
|
||||
text: t('headMystery301404Text'),
|
||||
notes: t('headMystery301404Notes'),
|
||||
|
||||
@@ -1036,11 +1036,13 @@ api.specialMounts = {
|
||||
api.timeTravelStable = {
|
||||
pets: {
|
||||
'Mammoth-Base': t('mammoth'),
|
||||
'MantisShrimp-Base': t('mantisShrimp')
|
||||
'MantisShrimp-Base': t('mantisShrimp'),
|
||||
'Phoenix-Base': t('phoenix'),
|
||||
},
|
||||
mounts: {
|
||||
'Mammoth-Base': t('mammoth'),
|
||||
'MantisShrimp-Base': t('mantisShrimp')
|
||||
'MantisShrimp-Base': t('mantisShrimp'),
|
||||
'Phoenix-Base': t('phoenix'),
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1647,7 +1649,7 @@ api.quests = {
|
||||
},
|
||||
evilsanta: {
|
||||
canBuy: (function() {
|
||||
return true;
|
||||
return false;
|
||||
}),
|
||||
text: t('questEvilSantaText'),
|
||||
notes: t('questEvilSantaNotes'),
|
||||
@@ -1673,7 +1675,7 @@ api.quests = {
|
||||
},
|
||||
evilsanta2: {
|
||||
canBuy: (function() {
|
||||
return true;
|
||||
return false;
|
||||
}),
|
||||
text: t('questEvilSanta2Text'),
|
||||
notes: t('questEvilSanta2Notes'),
|
||||
|
||||
@@ -98,6 +98,10 @@ let mysterySets = {
|
||||
start: '2016-01-26',
|
||||
end: '2016-02-02',
|
||||
},
|
||||
201602: {
|
||||
start: '2016-02-24',
|
||||
end: '2016-03-02',
|
||||
},
|
||||
301404: {
|
||||
start: '3014-03-24',
|
||||
end: '3014-04-02',
|
||||
|
||||
Reference in New Issue
Block a user