From 3a77388c067df83ebc6fb11a2ec2f247cf1886af Mon Sep 17 00:00:00 2001
From: Luke <rt.luke.s@gmail.com>
Date: Tue, 6 Sep 2022 20:22:20 +1000
Subject: [PATCH] TSAPI update for OTAPI 3.1.2-alpha

Fix loading from ./modifications (some plugins already use this)
---
 TShockLauncher/TShockLauncher.csproj | 4 ++--
 TerrariaServerAPI                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/TShockLauncher/TShockLauncher.csproj b/TShockLauncher/TShockLauncher.csproj
index 8ccabf33..18540463 100644
--- a/TShockLauncher/TShockLauncher.csproj
+++ b/TShockLauncher/TShockLauncher.csproj
@@ -23,10 +23,10 @@
 		<PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
 		<PackageReference Include="MySql.Data" Version="8.0.30" />
 		<PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.8" />
-		<PackageReference Include="ModFramework" Version="1.1.0-alpha" GeneratePathProperty="true" /> <!-- only used to extract out to ./bin. -->
+		<PackageReference Include="ModFramework" Version="1.1.1-alpha" GeneratePathProperty="true" /> <!-- only used to extract out to ./bin. -->
 
 		<!-- the launcher doesnt need the direct OTAPI reference, but since PackageReference[ExcludeFromSingleFile] doesnt work, exclude the assets and copy manually -->
-		<PackageReference Include="OTAPI.Upcoming" Version="3.1.1-alpha" ExcludeAssets="all" GeneratePathProperty="true" />
+		<PackageReference Include="OTAPI.Upcoming" Version="3.1.2-alpha" ExcludeAssets="all" GeneratePathProperty="true" />
 		<None Include="$(PkgOTAPI_Upcoming)\lib\net6.0\OTAPI.dll">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
diff --git a/TerrariaServerAPI b/TerrariaServerAPI
index 49c7bdf2..0448a84f 160000
--- a/TerrariaServerAPI
+++ b/TerrariaServerAPI
@@ -1 +1 @@
-Subproject commit 49c7bdf227d490d69dcb32dca3499d67d3699cde
+Subproject commit 0448a84f08029a65cf625dafe7970726b6315866