themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'general-devel' into patch-buffnpc-i18nconsistency

Browse source
This commit is contained in:
Stargazing Koishi 2022-11-11 18:58:00 -08:00 • committed by GitHub
commit d236653559
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/TShockAPI.csproj
View file

@ -18,7 +18,7 @@
Also, be sure to release on github with the exact assembly version tag as below
so that the update manager works correctly (via the Github releases api and mimic)
-->
<Version>5.1.1</Version>
<Version>5.1.2</Version>
<AssemblyTitle>TShock for Terraria</AssemblyTitle>
<Company>Pryaxis &amp; TShock Contributors</Company>
<Product>TShockAPI</Product>

2
TShockLauncher/TShockLauncher.csproj
View file

@ -35,7 +35,7 @@
<PackageReference Include="GetText.NET" Version="1.7.14" /> <!-- 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.18" ExcludeAssets="all" GeneratePathProperty="true" />
<PackageReference Include="OTAPI.Upcoming" Version="3.1.19" ExcludeAssets="all" GeneratePathProperty="true" />
<None Include="$(PkgOTAPI_Upcoming)\lib\net6.0\OTAPI.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>

2
TerrariaServerAPI

@ -1 +1 @@
Subproject commit d2a57019ac702675f6fcd715171d7fc4a55eca1c
Subproject commit 5ed35f3791e07b87a6e15320cd9e50803c5d50dd

3
docs/changelog.md
View file

@ -80,6 +80,9 @@ Use past tense when adding new entries; sign your name off when you add or chang
## Upcoming changes
* Updated the Utils.FindByIdOrName to follow same logic. Now fuzzy match fallback to `StartsWith` and then `Contains`. (@sgkoishi)
## TShock 5.1.2
* Added support for Terraria 1.4.4.8.1 via OTAPI 3.1.19. (@SignatureBeef)
## TShock 5.1.1
* Fixed item giving potentially dropping too many items. (@PotatoCider, @punchready)
* Excluded GeoIP.dat from release bundle. (@SignatureBeef)