CharonInferar 7fd750a629 Merge remote-tracking branch 'upstream/master'

2014-05-05 00:50:10 +02:00

..

buffs

Merge pull request #584 from Mesagoppinmypants/patch-43

2014-05-04 23:37:53 +01:00

collections

…

commands

Fixed calculatePvpStatus

2014-05-03 15:32:07 +01:00

conversation

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

2014-05-04 18:56:34 +01:00

equipment

Fixed bonus sets equip message

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

expertise

Merge pull request #578 from Mesagoppinmypants/patch-46

2014-05-03 03:08:13 +01: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 pull request #595 from tacef/master

2014-05-04 18:47:46 +01:00

object

Set Breath of Heaven as Consumable

2014-05-03 22:45:34 -04:00

radial

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

2014-05-04 17:38:22 +02:00

roadmap

…

skillMods

Fixed strength_modified.py

2014-05-02 22:52:19 +01:00

starter_clothing

conflict again

2014-05-05 00:49:27 +02:00

static_spawns

Merge pull request #600 from DAK-/master

2014-05-04 22:42:58 +02:00

demo.py

…

gcwzones.py

…

static_map_locations.py

…

static_travel_points.py

…

weather.py

…