Skip to content

Commit c425ff0

Browse files
authored
Merge branch 'general-devel' into general-devel
2 parents 04b67a6 + c8cb747 commit c425ff0

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

TShockAPI/TShockAPI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
Also, be sure to release on github with the exact assembly version tag as below
1919
so that the update manager works correctly (via the Github releases api and mimic)
2020
-->
21-
<Version>5.1.1</Version>
21+
<Version>5.1.2</Version>
2222
<AssemblyTitle>TShock for Terraria</AssemblyTitle>
2323
<Company>Pryaxis &amp; TShock Contributors</Company>
2424
<Product>TShockAPI</Product>

TShockLauncher/TShockLauncher.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<PackageReference Include="GetText.NET" Version="1.7.14" /> <!-- only used to extract out to ./bin. -->
3636

3737
<!-- the launcher doesnt need the direct OTAPI reference, but since PackageReference[ExcludeFromSingleFile] doesnt work, exclude the assets and copy manually -->
38-
<PackageReference Include="OTAPI.Upcoming" Version="3.1.18" ExcludeAssets="all" GeneratePathProperty="true" />
38+
<PackageReference Include="OTAPI.Upcoming" Version="3.1.19" ExcludeAssets="all" GeneratePathProperty="true" />
3939
<None Include="$(PkgOTAPI_Upcoming)\lib\net6.0\OTAPI.dll">
4040
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
4141
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>

TerrariaServerAPI

docs/changelog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ Use past tense when adding new entries; sign your name off when you add or chang
8080
## Upcoming changes
8181
* Your changes could be here!
8282

83+
## TShock 5.1.2
84+
* Added support for Terraria 1.4.4.8.1 via OTAPI 3.1.19. (@SignatureBeef)
85+
8386
## TShock 5.1.1
8487
* Fixed item giving potentially dropping too many items. (@PotatoCider, @punchready)
8588
* Excluded GeoIP.dat from release bundle. (@SignatureBeef)

0 commit comments

Comments
 (0)