Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Paul Coene
2015-01-26 14:30:21 -05:00
578 changed files with 28955 additions and 30355 deletions
@@ -0,0 +1,5 @@
-- 'greater lightstone' light level on 'wisp' race
UPDATE `npc_types` SET `light` = 11 WHERE `race` = 69;
-- 'fire beetle eye' light level on 'beetle' race with name criteria
UPDATE `npc_types` SET `light` = 12 WHERE `race` = 22 AND (`name` LIKE '%fire%' OR `name` LIKE '%lava%');