Commit Graph

34 Commits

Author SHA1 Message Date
Blade Barringer 3f941c3534 chore(i18n): update locales 2015-08-12 22:37:52 -05:00
Blade Barringer 2ec7e631e9 Update locales 2015-08-10 07:52:07 -05:00
Blade Barringer 4bdb2a8b84 chore(i18n): update locales 2015-08-06 08:50:06 -05:00
Blade Barringer b565b04a69 chore(i18n): update locales 2015-07-31 08:48:30 -05:00
Blade Barringer a7de79a496 chore(i18n): update locales 2015-07-31 08:28:21 -05:00
Blade Barringer a888a120d9 chore(i18n): update locales 2015-07-30 23:25:04 -05:00
Blade Barringer 25fc92d59e chore(i18n): update locales 2015-07-30 22:49:22 -05:00
Blade Barringer 668a8bb6f6 chore(i18n): update locales 2015-07-16 12:04:10 -05:00
Matteo Pagliazzi 38ac664284 chore(i18n): update locales 2015-07-15 13:17:57 +02:00
Matteo Pagliazzi 1618534785 chore(i18n): update locales 2015-07-05 20:51:08 +02:00
Matteo Pagliazzi f6480faf22 chore(i18n): update locales 2015-07-03 10:49:35 +02:00
Matteo Pagliazzi cca3e8bfdf chore(i18n): update locales 2015-06-30 17:59:11 +02:00
Matteo Pagliazzi 782ae4f81c chore(i18n): update locales 2015-06-23 10:43:29 +02:00
Matteo Pagliazzi 995721e0da chore(i18n): update locales 2015-05-31 15:36:54 +02:00
Matteo Pagliazzi 047ce0141f chore(i18n): update locales 2015-05-24 11:27:17 +02:00
Matteo Pagliazzi d6547682be chore(i18n): update locales 2015-05-17 15:54:18 +02:00
Matteo Pagliazzi b639896ae6 chore(i18n): update locales 2015-05-13 19:47:59 +02:00
Matteo Pagliazzi 72f8c60ccf chore(i18n): update locales 2015-05-02 11:43:38 +02:00
Matteo Pagliazzi 8dcbf75300 chore(i18n): update locales 2015-04-27 21:05:45 +02:00
Matteo Pagliazzi ca3ac96d6d chore(i18n): update locales 2015-04-23 20:49:53 +02:00
Matteo Pagliazzi c699fcde49 chore(i18n): update locales 2015-04-22 16:22:11 +02:00
Matteo Pagliazzi 662c8cd529 chore(i18n): update locales 2015-04-19 13:28:21 +02:00
Matteo Pagliazzi 9b19bd5076 chore(i18n): update locales 2015-04-11 14:53:33 +02:00
Matteo Pagliazzi 820909dd9b chore(i18n): update locales 2015-04-08 19:15:03 +02:00
Matteo Pagliazzi fa2c44a9c7 chore(i18n): update locales 2015-03-20 17:13:53 +01:00
Matteo Pagliazzi 4c3e7f897e chore(i18n): update locales 2015-03-19 20:21:04 +01:00
Matteo Pagliazzi f243617ccf chore(i18n): update locales 2015-03-18 20:01:29 +01:00
Matteo Pagliazzi 8bc5ed83cb chore(i18n): update locales 2015-03-12 16:26:45 +01:00
Blade Barringer 9ddb5e35fb Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
	common/dist/scripts/habitrpg-shared.js
	common/dist/sprites/habitrpg-shared.css
	common/img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_10_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_11_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_12_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_13_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_14_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_9_TRUred.png
2015-02-12 13:42:11 -06:00
Blade Barringer 45d1fb4c6e Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
	common/dist/scripts/habitrpg-shared.js
2015-02-09 22:18:22 -06:00
Blade Barringer 6f4fbfeaeb Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
	common/img/sprites/spritesmith/npcs/npc_ian.png
	common/img/sprites/spritesmith/npcs/seasonalshop_winter2015.png
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png
2015-02-03 19:26:14 -06:00
Blade Barringer 88be8f3274 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
	common/img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png
	common/img/sprites/spritesmith/npcs/npc_bailey_broken.png
	common/img/sprites/spritesmith/npcs/npc_justin_broken.png
	common/img/sprites/spritesmith/npcs/npc_matt_broken.png
	img/sprites/spritesmith/gear/events/birthday/broad_armor_special_birthday2015.png
	img/sprites/spritesmith/gear/events/birthday/shop_armor_special_birthday2015.png
	img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png
	img/sprites/spritesmith/npcs/npc_bailey_broken.png
	img/sprites/spritesmith/npcs/npc_justin_broken.png
	img/sprites/spritesmith/quests/inventory_quest_scroll_penguin.png
2015-02-01 14:07:18 -06:00
Blade Barringer 4588be29ee Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-01-23 15:29:56 -06:00
Blade Barringer c91b0cd34a Moved folders into common directory 2015-01-21 10:34:04 -06:00