diff --git a/common/locales/en/gear.json b/common/locales/en/gear.json index 39e7f32eb8..4cac2804d0 100644 --- a/common/locales/en/gear.json +++ b/common/locales/en/gear.json @@ -251,7 +251,7 @@ "armorSpecialBirthday2015Notes": "Happy Birthday, Habitica! Wear these Silly Party Robes to celebrate this wonderful day. Confers no benefit.", "armorSpecialGaymerxText": "Rainbow Warrior Armor", - "armorSpecialGaymerxNotes": "In celebration of pride season and GaymerX, this special armor is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGBTQ and gaming and is open to everyone. It takes place at the InterContinental in downtown San Francisco on July 11-13! Confers no benefit.", + "armorSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special armor is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.", "armorSpecialSpringRogueText": "Sleek Cat Suit", "armorSpecialSpringRogueNotes": "Impeccably groomed. Increases Perception by <%= per %>. Limited Edition 2014 Spring Gear.", @@ -505,7 +505,7 @@ "headSpecialFall2015HealerNotes": "This is an extremely serious hat that is worthy of only the most advanced potioners. Increases Intelligence by <%= int %>. Limited Edition 2015 Autumn Gear.", "headSpecialGaymerxText": "Rainbow Warrior Helm", - "headSpecialGaymerxNotes": "In celebration of pride season and GaymerX, this special helmet is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGBTQ and gaming and is open to everyone. It takes place at the InterContinental in downtown San Francisco on July 11-13! Confers no benefit.", + "headSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special helmet is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.", "headMystery201402Text": "Winged Helm", "headMystery201402Notes": "This winged circlet imbues the wearer with the speed of the wind! Confers no benefit. February 2014 Subscriber Item.", diff --git a/common/script/content/constants.js b/common/script/content/constants.js index 9274e9cf32..0c0ee334e0 100644 --- a/common/script/content/constants.js +++ b/common/script/content/constants.js @@ -16,12 +16,12 @@ export const EVENTS = { birthday: { start: '2013-01-30', end: '2014-02-01' }, spring: { start: '2014-03-21', end: '2014-05-01' }, summer: { start: '2014-06-20', end: '2014-08-01' }, - gaymerx: { start: '2014-07-02', end: '2014-08-01' }, fall: { start: '2014-09-21', end: '2014-11-01' }, winter2015: { start: '2014-12-21', end: '2015-02-02' }, spring2015: { start: '2015-03-20', end: '2015-05-02' }, summer2015: { start: '2015-06-20', end: '2015-08-02' }, fall2015: { start: '2015-09-21', end: '2015-11-01' }, + gaymerx: { start: '2015-12-01', end: '2015-12-14' }, }; export const GEAR_TYPES = [