Merge branch 'release' into develop

website/common/script/content/appearance/backgrounds.js

@@ -549,6 +549,20 @@ let backgrounds = {
       notes: t('backgroundSummerFireworksNotes'),
     },
   },
+  backgrounds092017: {
+    beside_well: {
+      text: t('backgroundBesideWellText'),
+      notes: t('backgroundBesideWellNotes'),
+    },
+    garden_shed: {
+      text: t('backgroundGardenShedText'),
+      notes: t('backgroundGardenShedNotes'),
+    },
+    pixelists_workshop: {
+      text: t('backgroundPixelistsWorkshopText'),
+      notes: t('backgroundPixelistsWorkshopNotes'),
+    },
+  },
   incentiveBackgrounds: {
     violet: {
       text: t('backgroundVioletText'),

website/common/script/content/gear/sets/armoire.js

@@ -279,6 +279,16 @@ let armor = {
     set: 'antiProcrastination',
     canOwn: ownsItem('armor_armoire_antiProcrastinationArmor'),
   },
+  farrierOutfit: {
+    text: t('armorArmoireFarrierOutfitText'),
+    notes: t('armorArmoireFarrierOutfitNotes', { attrs: 6 }),
+    value: 100,
+    con: 6,
+    int: 6,
+    per: 6,
+    set: 'farrier',
+    canOwn: ownsItem('armor_armoire_farrierOutfit'),
+  },
 };
 
 let eyewear = {
@@ -746,6 +756,16 @@ let shield = {
     set: 'antiProcrastination',
     canOwn: ownsItem('shield_armoire_antiProcrastinationShield'),
   },
+  horseshoe: {
+    text: t('shieldArmoireHorseshoeText'),
+    notes: t('shieldArmoireHorseshoeNotes', { attrs: 6 }),
+    value: 100,
+    con: 6,
+    per: 6,
+    str: 6,
+    set: 'farrier',
+    canOwn: ownsItem('shield_armoire_horseshoe'),
+  },
 };
 
 let headAccessory = {
@@ -982,6 +1002,16 @@ let weapon = {
     con: 8,
     canOwn: ownsItem('weapon_armoire_battleAxe'),
   },
+  hoofClippers: {
+    text: t('weaponArmoireHoofClippersText'),
+    notes: t('weaponArmoireHoofClippersNotes', { attrs: 6 }),
+    value: 100,
+    con: 6,
+    int: 6,
+    str: 6,
+    set: 'farrier',
+    canOwn: ownsItem('weapon_armoire_hoofClippers'),
+  },
 };
 
 let armoireSet = {