Files
NGECore2/scripts
Light2 d1a7f20177 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/resources/objects/creature/CreatureMessageBuilder.java
	src/resources/objects/creature/CreatureObject.java
	src/services/PlayerService.java
2014-03-25 20:14:16 +01:00
..
2014-03-19 19:43:29 +00:00