Merge branch 'release' into develop

2025-12-17 22:57:21 +01:00 · 2017-03-03 17:36:25 +00:00
parent 8805f81b96 448a953147
commit 3629f7f8a5
101 changed files with 36006 additions and 35761 deletions
--- a/website/common/script/content/appearance/backgrounds.js
+++ b/website/common/script/content/appearance/backgrounds.js
@@ -465,6 +465,20 @@ let backgrounds = {
      notes: t('backgroundWeddingArchNotes'),
    },
  },
+  backgrounds032017: {
+    magic_beanstalk: {
+      text: t('backgroundMagicBeanstalkText'),
+      notes: t('backgroundMagicBeanstalkNotes'),
+    },
+    meandering_cave: {
+      text: t('backgroundMeanderingCaveText'),
+      notes: t('backgroundMeanderingCaveNotes'),
+    },
+    mistiflying_circus: {
+      text: t('backgroundMistiflyingCircusText'),
+      notes: t('backgroundMistiflyingCircusNotes'),
+    },
+  },
  incentiveBackgrounds: {
    blue: {
      text: t('backgroundBlueText'),