Added Farvoid Theme (new, clean branch) (#9634)

* Added Farvoid Theme

* Updated generic.json and index.js

* fix(merge): address conflicts
This commit is contained in:
Pizilden 2018-01-05 15:34:19 -05:00 committed by Sabe Jones
parent c531239618
commit daa796454c
22 changed files with 3 additions and 2 deletions

View file

@ -1,4 +1,4 @@
{
{
"languageName": "English",
"stringNotFound": "String '<%= string %>' not found.",
"titleIndex": "Habitica | Your Life The Role Playing Game",
@ -142,6 +142,7 @@
"audioTheme_arashiTheme": "Arashi's Theme",
"audioTheme_maflTheme": "MAFL Theme",
"audioTheme_pizildenTheme": "Pizilden's Theme",
"audioTheme_farvoidTheme": "Farvoid Theme",
"askQuestion": "Ask a Question",
"reportBug": "Report a Bug",
"HabiticaWiki": "The Habitica Wiki",

View file

@ -46,7 +46,7 @@ api.gear = gear;
api.spells = spells;
api.subscriptionBlocks = subscriptionBlocks;
api.audioThemes = ['danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme', 'rosstavoTheme', 'dewinTheme', 'airuTheme', 'beatscribeNesTheme', 'arashiTheme', 'pizildenTheme', 'maflTheme'];
api.audioThemes = ['danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme', 'rosstavoTheme', 'dewinTheme', 'airuTheme', 'beatscribeNesTheme', 'arashiTheme', 'maflTheme', 'pizildenTheme', 'farvoidTheme'];
api.mystery = timeTravelers.mystery;
api.timeTravelerStore = timeTravelers.timeTravelerStore;

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.