From 1f79e14bd7d4296c859b74514f7cd64c445aaaeb Mon Sep 17 00:00:00 2001 From: quake1337 <3310937+bartico6@users.noreply.github.com> Date: Mon, 11 Dec 2017 01:12:27 +0100 Subject: [PATCH 1/2] Make TShock pull OTAPI from the correct folder on build --- TShockAPI/TShockAPI.csproj | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/TShockAPI/TShockAPI.csproj b/TShockAPI/TShockAPI.csproj index 957f805b..a612f444 100644 --- a/TShockAPI/TShockAPI.csproj +++ b/TShockAPI/TShockAPI.csproj @@ -71,11 +71,9 @@ ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - + False - ..\TerrariaServerAPI\TerrariaServerAPI\bin\Debug\OTAPI.dll - ..\TerrariaServerAPI\TerrariaServerAPI\bin\Release\OTAPI.dll - ..\TerrariaServerAPI\TerrariaServerAPI\bin\$(Configuration)\OTAPI.dll + ..\TerrariaServerAPI\TerrariaServerAPI\bin\$(ConfigurationName)\OTAPI.dll From a5e196178e31d9a444ed9b7f2fc542c84f7e7989 Mon Sep 17 00:00:00 2001 From: quake1337 <3310937+bartico6@users.noreply.github.com> Date: Mon, 11 Dec 2017 01:16:10 +0100 Subject: [PATCH 2/2] Add credit --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e50ee4a5..d4eafb1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin * Update OTAPI to 2.0.0.31, which also updates Newtonsoft.Json to 10.0.3 (@Ryozuki) * Fixed DumpItems() from trying to dump older versions of certain items (negative item IDs). (@Zaicon) * Added the `/dump-reference-data` command, which when run, runs Utils.Dump() and outputs Terraria reference data to the server folder. (@hakusaro) +* Fixed builds to not require a specific version of OTAPI and to not fail when in Release mode (@bartico6) ## TShock 4.3.24 * Updated OpenTerraria API to 1.3.5.3 (@DeathCradle)