mirror of
https://bitbucket.org/projectswg/cucore.git
synced 2026-01-15 22:04:21 -05:00
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