Tahir Akhlaq c413006a91 Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into logging_and_casing ... # Conflicts: # data/scripts/base/chara/npc/object/TaskBoard.lua # data/scripts/unique/wil0Town01/PopulaceStandard/baterich.lua # data/scripts/unique/wil0Town01/PopulaceStandard/claroise.lua # data/scripts/unique/wil0Town01/PopulaceStandard/flame_lieutenant_somber_meadow.lua # data/scripts/unique/wil0Town01/PopulaceStandard/gunnulf.lua # data/scripts/unique/wil0Town01/PopulaceStandard/heibert.lua # data/scripts/unique/wil0Town01/PopulaceStandard/ipaghlo.lua # data/scripts/unique/wil0Town01/PopulaceStandard/kokobi.lua # data/scripts/unique/wil0Town01/PopulaceStandard/mammet.lua # data/scripts/unique/wil0Town01/PopulaceStandard/roarich.lua # data/scripts/unique/wil0Town01a/PopulaceStandard/dariustel.lua # data/scripts/unique/wil0Town01a/PopulaceStandard/fruhybolg.lua # data/scripts/unique/wil0Town01a/PopulaceStandard/guencen.lua # data/scripts/unique/wil0Town01a/PopulaceStandard/hcidjaa.lua # data/scripts/unique/wil0Town01a/PopulaceStandard/uwilsyng.lua # data/scripts/unique/wil0Town01a/PopulaceStandard/vavaki.lua		2016-06-15 04:41:15 +01:00
..
fst0Battle03	Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into logging_and_casing	2016-06-15 04:41:15 +01:00
fst0Town01/PopulaceStandard	fixed method casing in lua	2016-06-15 03:41:23 +01:00
fst0Town01a/DoorStandard	Added scripts for the inn keepers. Added default event conditions to almost all actors. Updated sql for actorClass, spawnLocations, and new zoneEntrances.	2016-06-12 21:30:47 -04:00
ocn0Battle02/PopulaceStandard	Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into logging_and_casing	2016-06-15 04:41:15 +01:00
sea0Town01/PopulaceStandard	fixed method casing in lua	2016-06-15 03:41:23 +01:00
sea0Town01a	fixed method casing in lua	2016-06-15 03:41:23 +01:00
wil0Battle01	Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into logging_and_casing	2016-06-15 04:41:15 +01:00
wil0Town01	Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into logging_and_casing	2016-06-15 04:41:15 +01:00
wil0Town01a	Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into logging_and_casing	2016-06-15 04:41:15 +01:00