Mads Boddum d33499bb0f Merge holocore/quality_assurance into quality_assurance ...

Conflicts:
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/group/GroupObject.java
	src/resources/objects/tangible/TangibleObject.java
	src/services/collections/CollectionBadgeManager.java
	src/services/combat/CombatService.java
	src/services/commands/CommandService.java
	src/services/commands/EntertainmentService.java
	src/services/experience/SkillTemplateService.java
	src/services/group/GroupService.java
	src/services/objects/UniformBoxService.java

2016-09-26 15:45:13 +02:00

..

collection

NGE-418 + NGE-168 - fixed issues from PR code review

2016-09-12 13:00:20 -04:00

object

Profession Starter Clothing: Added UniformBoxService and ItemDatabase, updated radials and CharacterCreationService

2016-03-03 20:59:59 -06:00

terminal

Merge holocore/quality_assurance into quality_assurance

2016-08-07 14:47:53 +02:00