krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into api-v3

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-04-19 12:16:22 +02:00
parent 2dd633a471 ea9900d27f
commit f44dbbbd71
24 changed files with 2098 additions and 2024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/script/content/index.js
View File

@@ -418,7 +418,7 @@ api.specialPets = {
'Tiger-Veteran': 'veteranTiger',
'Phoenix-Base': 'phoenix',
'Turkey-Gilded': 'gildedTurkey',
'Bumblebee-Base': 'bumblebee',
'MagicalBee-Base': 'magicalBee',
};
api.specialMounts = {
@@ -431,7 +431,7 @@ api.specialMounts = {
'Gryphon-RoyalPurple': 'royalPurpleGryphon',
'Phoenix-Base': 'phoenix',
'JackOLantern-Base': 'jackolantern',
'Bumblebee-Base': 'bumblebee',
'MagicalBee-Base': 'magicalBee',
};
api.timeTravelStable = {