Mads Boddum 43e0e9c543 Merge holocore/quality_assurance into quality_assurance ...

Conflicts:
	scripts/commands/generic/cmdPVP.js
	src/network/packets/swg/zone/object_controller/DataTransformWithParent.java
	src/resources/commands/callbacks/QaToolCmdCallback.java
	src/resources/objects/SWGObject.java
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/creature/CreatureObjectSharedNP.java
	src/services/collections/CollectionBadgeManager.java
	src/services/combat/CombatManager.java
	src/services/commands/CommandService.java
	src/services/experience/ExperienceManager.java
	src/services/experience/SkillService.java
	src/services/experience/SkillTemplateService.java
	src/services/galaxy/GameManager.java
	src/services/objects/ObjectAwareness.java
	src/services/player/CharacterCreationService.java
	src/services/player/ZoneManager.java

2016-11-15 14:15:35 +01:00

..

combat_data.sdb

Merge holocore/quality_assurance into quality_assurance

2016-11-15 14:15:35 +01:00

minetypes.sdb

Added minetypes.sdb

2016-10-04 02:56:36 +00:00