Merge branch 'release' into develop

2025-12-16 22:27:26 +01:00 · 2017-09-12 20:34:03 +00:00
parent e29c393629 cb825106af
commit 5ba3e3ce5b
110 changed files with 6218 additions and 6109 deletions
--- a/website/common/script/content/index.js
+++ b/website/common/script/content/index.js
@@ -92,6 +92,21 @@ api.bundles = {
    class: 'quest_bundle_splashyPals',
    value: 7,
  },
+  farmFriends: {
+    key: 'farmFriends',
+    text: t('farmFriendsText'),
+    notes: t('farmFriendsNotes'),
+    bundleKeys: [
+      'cow',
+      'horse',
+      'sheep',
+    ],
+    canBuy () {
+      return moment().isBetween('2017-09-12', '2017-10-02');
+    },
+    type: 'quests',
+    value: 7,
+  },
 };

 /*