Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into method_casing

# Conflicts:
#	FFXIVClassic Map Server/CommandProcessor.cs
#	FFXIVClassic Map Server/WorldManager.cs
#	FFXIVClassic Map Server/actors/area/Area.cs
#	FFXIVClassic Map Server/actors/area/PrivateArea.cs
#	FFXIVClassic Map Server/actors/area/Zone.cs
#	FFXIVClassic Map Server/actors/chara/npc/Npc.cs
#	FFXIVClassic Map Server/common/Utils.cs
#	FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs
This commit is contained in:
Tahir Akhlaq
2016-06-14 22:54:02 +01:00
521 changed files with 12848 additions and 10394 deletions

View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Cyotek.CircularBuffer" version="1.0.0.0" targetFramework="net45" />
<package id="Dapper" version="1.42" targetFramework="net45" />
<package id="MySql.Data" version="6.9.7" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
<package id="NLog" version="4.3.4" targetFramework="net45" />
<package id="NLog.Config" version="4.3.4" targetFramework="net45" />
<package id="NLog.Schema" version="4.3.4" targetFramework="net45" />
<package id="Cyotek.CircularBuffer" version="1.0.0.0" tarGetFramework="net45" />
<package id="Dapper" version="1.42" tarGetFramework="net45" />
<package id="MySql.Data" version="6.9.7" tarGetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" tarGetFramework="net45" />
<package id="NLog" version="4.3.4" tarGetFramework="net45" />
<package id="NLog.Config" version="4.3.4" tarGetFramework="net45" />
<package id="NLog.Schema" version="4.3.4" tarGetFramework="net45" />
</packages>