Merge pull request #1 from DarkstarProject/master

Pull
Merge pull request #2 from DarkstarProject/master

Pull 2
Correct NPCID's in Inner Horutoto Ruins zona.lua file
Merge pull request #336 from MarkWaldron/master

Correct NPCID's in Inner Horutoto Ruins zona.lua file
CORE: TP updates for June Version Update
Merge branch 'master' of https://github.com/DarkstarProject/darkstar
June Update: Text ID Updates

These changes were automatically generated by the automatic Text Id Update batch job.

This job has worked very well the past 2 updates. Please let me know if anyone encounters any issues related to these.
Merge pull request #337 from starlightknight/june14-textid-updates

June Update: Text ID Updates
June Update: NPC Id Updates

The output of this commit was semi-automatically generated with the
NPC Id Update batch job.

There does not seem to be many changes this time around, and some of
the ones that are look like they could be things from a previous update
that the earlier version of the batch job was not smart enough to detect.

NOTE: This job still struggles a bit due to mass inconsistencies in
our naming convention for some NPCs. I apologize in advance if anything
is incorrect.

Additionally, due to the inconsistencies in naming, this job has to make
use of a mapping file that compares the state of the ids
from before the version update, to after against the state of POLUtils
before/after. As such, for NPCs that must be mapped (ones with non-unique names,
or formatted significantly different than POLUtils) the job is only as good
as the mapping file - any of those NPCs that were broken before the update
will not be fixed by the job and must be fixed manually as they are encountered.
Merge pull request #338 from starlightknight/june14-npcid-updates

June Update: NPC Id Updates
Saber Dance decaying the wrong way
Merge pull request #339 from Jupiter065/patch-1

Saber Dance decaying the wrong way
CORE: CShopItemsPacket update for June Version Update
Merge branch 'master' of https://github.com/DarkstarProject/darkstar
Merge pull request #3 from DarkstarProject/master

Pull 3
Corrected Aftermath Durations and TP levels

Added Aftermath Effect for all relic weapons for all TP's durations per
Blue Gartr Entry.

http://wiki.bluegartr.com/bg/Relic_Aftermath
Fixed the handful of GoV regime checks that weren't properly updated and were calling old function name, which conflicted with the FoV global. Seems the "replace in all open documents" feature of notepad++ is broken...Had to do this manually.
Fix for Corrected Aftermath for July TP Changes.
Merge pull request #343 from TeoTwawki/misc

Fix issue #341
CORE: bunch of TP changes I missed in the last update