CuriousJorge 02fe9e070d Merge remote-tracking branch 'origin/ioncannon/quest_system' into Jorge/quest_system ... # Conflicts: # Data/scripts/commands/EmoteStandardCommand.lua # Data/scripts/quests/man/man0g0.lua # Data/scripts/quests/man/man0g1.lua # Data/scripts/quests/man/man0u0.lua Resolved using Theirs.		2022-03-04 21:04:17 -05:00
..
man0g0.lua	Removed more dead scripts. Exported missing sql files.	2022-03-03 23:33:55 -05:00
man0g1.lua	Removed more dead scripts. Exported missing sql files.	2022-03-03 23:33:55 -05:00
man0l0.lua	Fixed bugs and edited scripts causing the limsa intro to fail.	2022-02-20 22:40:35 -05:00
man0l1.lua	Finished sequences 55, 60, 65 for Treasures of the Main.	2022-03-04 20:33:02 -05:00
man0u0.lua	Merge remote-tracking branch 'origin/ioncannon/quest_system' into Jorge/quest_system	2022-03-04 21:04:17 -05:00
man0u1.lua	Removed more dead scripts. Exported missing sql files.	2022-03-03 23:33:55 -05:00
man2l0.lua	Fixed bugs and edited scripts causing the limsa intro to fail.	2022-02-20 22:40:35 -05:00