Filip Maj 3864bf6d85 Merge branch 'proxy_server' into develop ... # Conflicts: # FFXIVClassic Common Class Lib/packages.config		2016-12-03 14:03:13 -05:00
..
ActorClass.cs	Added property flags for actors. Cleaned up NPC constructor.	2016-07-24 10:21:45 -04:00
Npc.cs	Merge branch 'proxy_server' into develop	2016-12-03 14:03:13 -05:00
NpcWork.cs	servers now log (almost) everything to file	2016-06-09 19:48:06 +01:00