From 055d25330c65ba9445aee989029978de9c2bc0af Mon Sep 17 00:00:00 2001
From: Ryozuki <clud6565@gmail.com>
Date: Sat, 9 Dec 2017 17:57:33 +0100
Subject: [PATCH 1/4] update otapi

---
 TShockAPI/TShockAPI.csproj | 9 ++++-----
 TShockAPI/packages.config  | 2 +-
 TerrariaServerAPI          | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/TShockAPI/TShockAPI.csproj b/TShockAPI/TShockAPI.csproj
index 08e9323d..957f805b 100644
--- a/TShockAPI/TShockAPI.csproj
+++ b/TShockAPI/TShockAPI.csproj
@@ -68,9 +68,8 @@
       <HintPath>..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="OTAPI, Version=1.3.4.4, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -206,7 +205,7 @@
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildAction="Both" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_StartDate="2011/6/17" BuildVersion_IncrementBeforeBuild="False" />
+      <UserProperties BuildVersion_IncrementBeforeBuild="False" BuildVersion_StartDate="2011/6/17" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_BuildAction="Both" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -216,4 +215,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/TShockAPI/packages.config b/TShockAPI/packages.config
index cc9c5276..691052d5 100644
--- a/TShockAPI/packages.config
+++ b/TShockAPI/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="BCrypt.Net" version="0.1.0" targetFramework="net45" />
   <package id="MySql.Data" version="6.9.8" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/TerrariaServerAPI b/TerrariaServerAPI
index bc9f7c69..de13bb0c 160000
--- a/TerrariaServerAPI
+++ b/TerrariaServerAPI
@@ -1 +1 @@
-Subproject commit bc9f7c69becb60816fc1e4587bbca15991231317
+Subproject commit de13bb0c5fd7e255e12d7fd1171a071323664b78

From 6d0a729e5a520cc632684f7d2dead6dd5a20ce22 Mon Sep 17 00:00:00 2001
From: Ryozuki <clud6565@gmail.com>
Date: Sat, 9 Dec 2017 18:09:20 +0100
Subject: [PATCH 2/4] checkout submodule

---
 TerrariaServerAPI | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TerrariaServerAPI b/TerrariaServerAPI
index de13bb0c..e76b7d18 160000
--- a/TerrariaServerAPI
+++ b/TerrariaServerAPI
@@ -1 +1 @@
-Subproject commit de13bb0c5fd7e255e12d7fd1171a071323664b78
+Subproject commit e76b7d18175163cc9375361494ca6283113c4389

From b794fae21d10566e7e679a608895fcc73667458f Mon Sep 17 00:00:00 2001
From: Ryozuki <clud6565@gmail.com>
Date: Sat, 9 Dec 2017 18:13:47 +0100
Subject: [PATCH 3/4] update release script

---
 scripts/create_release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/create_release.py b/scripts/create_release.py
index 735c664c..1bc823d6 100755
--- a/scripts/create_release.py
+++ b/scripts/create_release.py
@@ -47,7 +47,7 @@ mysql_bin = os.path.join(cur_wd, "packages", "MySql.Data.6.9.8", "lib", "net45",
 sqlite_dep = os.path.join(cur_wd, "prebuilts", sqlite_dep_name)
 sqlite_bin = os.path.join(cur_wd, "prebuilts", sqlite_bin_name)
 http_bin = os.path.join(cur_wd, "prebuilts", http_bin_name)
-json_bin = os.path.join(cur_wd, "packages", "Newtonsoft.Json.9.0.1", "lib", "net45", json_bin_name)
+json_bin = os.path.join(cur_wd, "packages", "Newtonsoft.Json.10.0.3", "lib", "net45", json_bin_name)
 bcrypt_bin = os.path.join(cur_wd, "packages", "BCrypt.Net.0.1.0", "lib", "net35", bcrypt_bin_name)
 geoip_db = os.path.join(cur_wd, "prebuilts", geoip_db_name)
 release_bin = os.path.join(cur_wd, "TShockAPI", "bin", "Release", tshock_bin_name)

From a146e9bc387c72ae088f777d8107a70b851e6839 Mon Sep 17 00:00:00 2001
From: Ryozuki <clud6565@gmail.com>
Date: Sat, 9 Dec 2017 18:14:42 +0100
Subject: [PATCH 4/4] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2999805e..71d26eb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
 * Default permission sets for new databases are more modern. (@hakusaro)
 * Added the ability to ban by account name instead of just banning a character name assuming its an account name. (@hakusaro)
 * Renamed TShock.DB.User to TShock.DB.UserAccount, including all the related methods, classes and events. (@Ryozuki)
+* Update OTAPI to 2.0.0.31, which also updates Newtonsoft.Json to 10.0.3 (@Ryozuki)
 
 ## TShock 4.3.24
 * Updated OpenTerraria API to 1.3.5.3 (@DeathCradle)