diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c4d9d20..d08b8527 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,10 +22,12 @@ 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) * `GetDataHandlers.SendTileSquare` hook now sends a `TSPlayer` and a `MemoryStream` of raw data. (@hakusaro) * Added `GetDataHandlers.HealOtherPlayer` hook. (@hakusaro) * Added `GetDataHandlers.PlaceObject` hook. (@hakusaro) + ## TShock 4.3.24 * Updated OpenTerraria API to 1.3.5.3 (@DeathCradle) * Updated Terraria Server API to 1.3.5.3 (@WhiteXZ, @hakusaro) diff --git a/TShockAPI/TShockAPI.csproj b/TShockAPI/TShockAPI.csproj index e61ed3cb..cf21c8b9 100644 --- a/TShockAPI/TShockAPI.csproj +++ b/TShockAPI/TShockAPI.csproj @@ -68,9 +68,8 @@ ..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll True - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll False @@ -207,7 +206,7 @@ - + - + \ 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 @@ - + \ No newline at end of file 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)