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

..

buffs

Fix of skill/stats in heroic sets

2014-04-19 20:44:51 +02:00

collections

…

commands

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

2014-04-30 15:57:30 -04:00

conversation

merge conflict resolve

2014-04-30 19:45:12 +02:00

equipment

Fixed bonus sets equip message

2014-04-24 16:31:52 +02:00

expertise

Bounty Hunter - Fixed Fumble expertise

2014-04-26 19:23:55 +02:00

faction

…

houses

Reconstruction of classes

2014-04-30 21:48:07 +02:00

instances

…

loot

Fixed Loot Item

2014-04-26 23:05:07 -04:00

mobiles

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

2014-05-01 21:08:20 +02:00

object

Update landspeeder_tantive4_deed.py

2014-04-30 22:20:34 -05:00

radial

merge conflict

2014-04-30 19:58:18 +02:00

roadmap

Added Commando roadmap rewards

2014-04-15 18:10:46 +02:00

skillMods

Fixed minor agility_modified.py error

2014-04-27 01:06:57 +01:00

static_spawns

Added Subfolders for Planetary Statics

2014-05-01 07:42:55 -04:00

demo.py

…

gcwzones.py

…

static_map_locations.py

…

static_travel_points.py

…

weather.py

…