mirror of
https://bitbucket.org/projectswg/cucore.git
synced 2026-10-11 03:13:20 -04:00
Conflicts: src/resources/objects/creature/CreatureObject.java src/resources/objects/custom/DefaultAIObject.java src/resources/objects/tangible/TangibleObject.java