Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into armoire

Browse Source 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith1.css
	common/dist/sprites/spritesmith1.png
	common/dist/sprites/spritesmith2.css
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
	common/dist/sprites/spritesmith5.css
	common/dist/sprites/spritesmith5.png
	common/dist/sprites/spritesmith6.css
	common/dist/sprites/spritesmith6.png
This commit is contained in:
Sabe Jones
2015-06-04 15:49:06 -05:00
parent 20859b83ef 6074774e14
commit 95bb5be22a
32 changed files with 3577 additions and 3395 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/script/content.coffee
+10
View File
@@ -1855,6 +1855,16 @@ api.backgrounds =
pagodas:
text: t('backgroundPagodasText')
notes: t('backgroundPagodasNotes')
backgrounds062015:
drifting_raft:
text: t('backgroundDriftingRaftText')
notes: t('backgroundDriftingRaftNotes')
shimmery_bubbles:
text: t('backgroundShimmeryBubblesText')
notes: t('backgroundShimmeryBubblesNotes')
island_waterfalls:
text: t('backgroundIslandWaterfallsText')
notes: t('backgroundIslandWaterfallsNotes')
api.subscriptionBlocks =
basic_earned: months:1, price:5