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

..

canon

Merge pull request #540 from Mesagoppinmypants/patch-41

2014-04-27 20:38:42 +01:00

corellia

Added: Durni, Fambaa, Bantha and Dewback

2014-04-22 18:15:07 -05:00

dathomir

Added - Rancor, NS Slave

2014-04-24 00:13:02 +02:00

dynamicgroups

Refactored odb system (read extended), added implementation of Dynamic World Spawns

2014-05-01 20:33:38 +02:00

forage

More Treasure map work

2014-04-21 03:23:07 +02:00

kashyyyk

Added: N-K Necrosis

2014-04-24 20:45:46 -05:00

lairgroups

Added more creatures to mos eisley

2014-04-27 22:16:59 +02:00

lairs

Added more creatures to mos eisley

2014-04-27 22:16:59 +02:00

naboo

Added: Durni, Fambaa, Bantha and Dewback

2014-04-22 18:15:07 -05:00

spawnareas

Added more creatures to mos eisley

2014-04-27 22:16:59 +02:00

tatooine

Updated Creature scripts again

2014-04-28 22:05:00 +02:00