Merge branch 'upcoming' into upcoming-nuget-release

Author: SignatureBeef

OTAPI.Common/ClientHelpers.cs

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 using System;
-using System.IO;
+using System.IO;
 using System.Linq;
 
 namespace OTAPI.Common;
@@ -71,6 +71,20 @@ public static ClientInstallPath<ITarget> DetermineClientInstallPath<ITarget>(ITa
             else Console.Error.WriteLine("Invalid option, expected a number.");
         }
 
+        // prompt for path
+        Console.Write("Please enter the path to your Terraria installation: ");
+        var inputPath = Console.ReadLine();
+        if (inputPath != null)
+        {
+            foreach (var discover in discoverers)
+            {
+                if (discover.IsValidInstallPath(inputPath))
+                {
+                    return new ClientInstallPath<ITarget> { Path = inputPath, Target = (ITarget)discover };
+                }
+            }
+        }
+
         throw new DirectoryNotFoundException();
     }
 

OTAPI.Patcher/OTAPI.Patcher.csproj

@@ -3,11 +3,11 @@
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>3.3.3</Version>
+		<Version>3.3.4</Version>
 		<PreserveCompilationContext>true</PreserveCompilationContext>
 		<RuntimeIdentifiers>win;osx;linux;</RuntimeIdentifiers>
 		<Nullable>enable</Nullable>
-		<PackageReleaseNotes>Terraria 1.4.5.2 on .NET9</PackageReleaseNotes>
+		<PackageReleaseNotes>Terraria 1.4.5.3 on .NET9</PackageReleaseNotes>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.15" />
@@ -19,6 +19,7 @@
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="System.Private.Uri" Version="4.3.2" />
 		<PackageReference Include="System.Security.Permissions" Version="9.0.2" />
+		<PackageReference Include="System.Drawing.Common" Version="9.0.2" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\FNA\FNA.Core.csproj" />

OTAPI.Patcher/Resolvers/PCFileResolver.cs

@@ -28,7 +28,7 @@ public class PCFileResolver : IFileResolver
 {
     public const String TerrariaWebsite = "https://terraria.org";
 
-    public virtual string SupportedDownloadUrl { get; } = $"{TerrariaWebsite}/api/download/pc-dedicated-server/terraria-server-1452.zip";
+    public virtual string SupportedDownloadUrl { get; } = $"{TerrariaWebsite}/api/download/pc-dedicated-server/terraria-server-1453.zip";
 
     public virtual string GetUrlFromHttpResponse(string content)
     {