Commit Graph
3 Commits
Author SHA1 Message Date
Treeku 7fd08bc7ad Baseline changes, cleaned some things 2014-05-11 09:54:50 +01:00
Light2 536b51d953 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	.gitignore
	src/main/NGECore.java
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/mission/MissionObject.java
	src/resources/objects/tangible/TangibleObject.java
	src/services/chat/Mail.java
	src/services/mission/MissionObjective.java
	src/services/object/ObjectService.java
	src/services/playercities/PlayerCity.java
2014-05-01 21:08:20 +02:00
Treeku 985cd6b779 Moved buff and skillmod objects 2014-04-29 03:56:52 +01:00