mirror of
https://bitbucket.org/projectswg/cucore.git
synced 2026-07-31 00:15:48 -04:00
Conflicts: src/resources/objects/creature/CreatureObject.java src/resources/objects/custom/DefaultAIObject.java src/resources/objects/tangible/TangibleObject.java