Filip Maj 79de4fd1ff Merge branch 'develop' into group_work ... # Conflicts: # FFXIVClassic Map Server/ConfigConstants.cs		2017-01-09 00:19:39 -05:00
..
scripts	Added scripts needed.	2017-01-09 00:17:46 -05:00
lobby_config.ini	added launch args for ip/port and default config loading	2016-12-05 14:26:20 +00:00
map_config.ini	Added all the shop keeper scripts in Ul'dah. Fixed some broken populace scripts. Changed .ini files, wrong default. Fixed a syntax error in CommandProcessor.cs.	2016-07-16 20:12:04 -04:00
world_config.ini	added launch args for ip/port and default config loading	2016-12-05 14:26:20 +00:00