Merge branch 'upcoming' into upcoming-nuget-release

SignatureBeef · Jan 2, 2025 · f95c270 · f95c270
2 parents 80915e9 + 0d14774
commit f95c270
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/OTAPI.Client.Launcher/OTAPI.Client.Launcher.csproj b/OTAPI.Client.Launcher/OTAPI.Client.Launcher.csproj
@@ -53,9 +53,9 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="ImGui.NET" Version="1.91.0.1" GeneratePathProperty="true" />
-		<PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.12" GeneratePathProperty="true" />
-		<PackageReference Include="ModFramework.Modules.CSharp" Version="1.1.12" GeneratePathProperty="true" />
-		<PackageReference Include="ModFramework.Modules.Lua" Version="1.1.12" GeneratePathProperty="true" />
+		<PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.13" GeneratePathProperty="true" />
+		<PackageReference Include="ModFramework.Modules.CSharp" Version="1.1.13" GeneratePathProperty="true" />
+		<PackageReference Include="ModFramework.Modules.Lua" Version="1.1.13" GeneratePathProperty="true" />
 		<PackageReference Include="SharpZipLib" Version="1.4.2" />
 		<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
 		<PackageReference Include="MonoMod.RuntimeDetour.HookGen" Version="22.7.31.1" />

diff --git a/OTAPI.Patcher/OTAPI.Patcher.csproj b/OTAPI.Patcher/OTAPI.Patcher.csproj
@@ -3,16 +3,16 @@
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>3.2.1</Version>
+		<Version>3.2.2</Version>
 		<PreserveCompilationContext>true</PreserveCompilationContext>
 		<RuntimeIdentifiers>win;osx;linux;</RuntimeIdentifiers>
 		<Nullable>enable</Nullable>
 		<PackageReleaseNotes>Terraria 1.4.4.9 on .NET9</PackageReleaseNotes>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.12" />
-		<PackageReference Include="ModFramework.Modules.CSharp" Version="1.1.12" />
-		<PackageReference Include="ModFramework.Modules.Lua" Version="1.1.12" />
+		<PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.13" />
+		<PackageReference Include="ModFramework.Modules.CSharp" Version="1.1.13" />
+		<PackageReference Include="ModFramework.Modules.Lua" Version="1.1.13" />
 		<PackageReference Include="Steamworks.NET" Version="2024.8.0" />
 		<PackageReference Include="MonoMod.RuntimeDetour.HookGen" Version="22.7.31.1" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

diff --git a/OTAPI.Scripts/OTAPI.Scripts.csproj b/OTAPI.Scripts/OTAPI.Scripts.csproj
@@ -32,7 +32,7 @@
 	<ItemGroup>
 		<ProjectReference Include="..\FNA\FNA.Core.csproj" />
 		<PackageReference Include="Steamworks.NET" Version="2024.8.0" />
-		<PackageReference Include="ModFramework" Version="1.1.12" />
+		<PackageReference Include="ModFramework" Version="1.1.13" />
 		<PackageReference Include="MonoMod" Version="22.7.31.1" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	</ItemGroup>

diff --git a/OTAPI.Server.Launcher/OTAPI.Server.Launcher.csproj b/OTAPI.Server.Launcher/OTAPI.Server.Launcher.csproj
@@ -12,12 +12,12 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ModFramework" Version="1.1.12">
+		<PackageReference Include="ModFramework" Version="1.1.13">
 			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
 		</PackageReference>
-		<PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.12" />
-		<PackageReference Include="ModFramework.Modules.CSharp" Version="1.1.12" />
-		<PackageReference Include="ModFramework.Modules.Lua" Version="1.1.12" />
+		<PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.13" />
+		<PackageReference Include="ModFramework.Modules.CSharp" Version="1.1.13" />
+		<PackageReference Include="ModFramework.Modules.Lua" Version="1.1.13" />
 		<PackageReference Include="Steamworks.NET" Version="2024.8.0" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Open Terraria API [![GitHub Workflow](https://img.shields.io/github/workflow/status/SignatureBeef/Open-Terraria-API/CI?logo=GitHub)](https://github.com/SignatureBeef/Open-Terraria-API/actions) [![AppVeyor branch](https://img.shields.io/appveyor/build/DeathCradle/Open-Terraria-API/upcoming?label=build&logo=appveyor)](https://ci.appveyor.com/project/DeathCradle/open-terraria-api) [![Nuget (with prereleases)](https://img.shields.io/nuget/vpre/OTAPI.Upcoming)](https://nuget.org/packages/OTAPI.Upcoming) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Wiki](https://img.shields.io/static/v1?label=docs&message=wiki&color=blueviolet)](https://github.com/SignatureBeef/Open-Terraria-API/wiki/%5Bupcoming%5D-1.-About)
+# Open Terraria API [![GitHub Workflow](https://img.shields.io/github/actions/workflow/status/SignatureBeef/Open-Terraria-API/ci.yml?logo=GitHub)](https://github.com/SignatureBeef/Open-Terraria-API/actions) [![AppVeyor branch](https://img.shields.io/appveyor/build/DeathCradle/Open-Terraria-API/upcoming?label=build&logo=appveyor)](https://ci.appveyor.com/project/DeathCradle/open-terraria-api) [![Nuget (with prereleases)](https://img.shields.io/nuget/vpre/OTAPI.Upcoming)](https://nuget.org/packages/OTAPI.Upcoming) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Wiki](https://img.shields.io/static/v1?label=docs&message=wiki&color=blueviolet)](https://github.com/SignatureBeef/Open-Terraria-API/wiki/%5Bupcoming%5D-1.-About)
 The Open Terraria API, known as OTAPI, is a low-level API for Terraria that rewrites and hooks into the official binaries for others to use.
 
 It is primarily a server modification for the PC edition of Terraria, however v3 has seen additional support for the PC client assemblies, and the mobile windows server assembly too.

diff --git a/examples/RuntimeExample.Client/RuntimeExample.Client.csproj b/examples/RuntimeExample.Client/RuntimeExample.Client.csproj
@@ -11,7 +11,7 @@
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="ModFramework" Version="1.1.12" />
+		<PackageReference Include="ModFramework" Version="1.1.13" />
 	</ItemGroup>
 	<ItemGroup>
 		<Reference Include="OTAPI.Runtime">

diff --git a/examples/RuntimeExample.Server/RuntimeExample.Server.csproj b/examples/RuntimeExample.Server/RuntimeExample.Server.csproj
@@ -7,7 +7,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ModFramework" Version="1.1.12" />
+		<PackageReference Include="ModFramework" Version="1.1.13" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	</ItemGroup>