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

Merge branch 'develop' into HabitRPG-sabrecat/backgrounds-201510

Browse Source
This commit is contained in:
Blade Barringer
2015-10-03 06:40:50 -05:00
parent 56419aee25 928e8478f7
commit 6dbfbeec81
39 changed files with 2599 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/script/src/content/gear/armor.js
View File

@@ -1,6 +1,3 @@
import {translator as t} from '../helpers';
import events from '../events';
import {armor as baseArmor} from './sets/base';
import {armor as warriorArmor} from './sets/warrior';

3
common/script/src/content/gear/back.js
View File

@@ -1,6 +1,3 @@
import {translator as t} from '../helpers';
import events from '../events';
import {back as baseBack} from './sets/base';
import {back as mysteryBack} from './sets/mystery';

3
common/script/src/content/gear/body.js
View File

@@ -1,6 +1,3 @@
import {translator as t} from '../helpers';
import events from '../events';
import {body as baseBody} from './sets/base';
import {body as specialBody} from './sets/special';

3
common/script/src/content/gear/eyewear.js
View File

@@ -1,6 +1,3 @@
import {translator as t} from '../helpers';
import events from '../events';
import {eyewear as baseEyewear} from './sets/base';
import {eyewear as armoireEyewear} from './sets/armoire';

3
common/script/src/content/gear/head-accessory.js
View File

@@ -1,6 +1,3 @@
import {translator as t} from '../helpers';
import events from '../events';
import {headAccessory as baseHeadAccessory} from './sets/base';
import {headAccessory as specialHeadAccessory} from './sets/special';

5
common/script/src/content/gear/head.js
View File

@@ -1,7 +1,4 @@
import {translator as t} from '../helpers';
import events from '../events';
import {base as baseHead} from './sets/base';
import {head as baseHead} from './sets/base';
import {head as healerHead} from './sets/healer';
import {head as rogueHead} from './sets/rogue';

1
common/script/src/content/gear/index.js
View File

@@ -1,4 +1,3 @@
import {translator as t} from '../helpers';
import {each, defaults} from 'lodash';
import moment from 'moment';

4
common/script/src/content/gear/shield.js
View File

@@ -1,8 +1,6 @@
import {translator as t} from '../helpers';
import {cloneDeep} from 'lodash';
import events from '../events';
import {base as baseShield} from './sets/base';
import {shield as baseShield} from './sets/base';
import {shield as healerShield} from './sets/healer';
import {weapon as rogueWeapon} from './sets/rogue';

5
common/script/src/content/gear/weapon.js
View File

@@ -1,7 +1,4 @@
import {translator as t} from '../helpers';
import events from '../events';
import {base as baseWeapon} from './sets/base';
import {weapon as baseWeapon} from './sets/base';
import {weapon as healerWeapon} from './sets/healer';
import {weapon as rogueWeapon} from './sets/rogue';