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

TShockAPI/TShock.cs

@@ -1382,7 +1382,7 @@ namespace TShockAPI
 			{
 				if (!tsplr.SilentKickInProgress && tsplr.State >= 3)
 					Utils.Broadcast(GetString("{0} has left.", tsplr.Name), Color.Yellow);
-				Log.Info(GetString("{0} disconnected."), tsplr.Name);
+				Log.Info(GetString("{0} disconnected.", tsplr.Name));
 
 				if (tsplr.IsLoggedIn && !tsplr.IsDisabledPendingTrashRemoval && Main.ServerSideCharacter && (!tsplr.Dead || tsplr.TPlayer.difficulty != 2))
 				{

TShockAPI/TShockAPI.csproj

@@ -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.0</Version>
+    <Version>5.1.1</Version>
     <AssemblyTitle>TShock for Terraria</AssemblyTitle>
     <Company>Pryaxis &amp; TShock Contributors</Company>
     <Product>TShockAPI</Product>

TerrariaServerAPI

@@ -1 +1 @@
-Subproject commit c9ca021a09f6dbbcddf3edb7f40806675683959f
+Subproject commit d2a57019ac702675f6fcd715171d7fc4a55eca1c

docs/changelog.md

@@ -80,7 +80,7 @@ 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.0
+## TShock 5.1.1
 * Fixed item giving potentially dropping too many items. (@PotatoCider, @punchready)
 * Excluded GeoIP.dat from release bundle. (@SignatureBeef)
 * Added `TownSlimeRed` to `FishableNpcIDs` list, allowing it to be fished up. (@drunderscore)
@@ -125,6 +125,10 @@ The following translators contributed changes from November 1, 2022 to November
 |Marotheit | Pirate English | 7|
 |ATFGK | Chinese Simplified | 4|
 
+## TShock 5.1.0
+
+This release was scrubbed. All changes have been re-allocated to the 5.1.1 release. We consider a verison "final" after the tick and do not apply more changes. Thus, we were unable to simply release 5.0.0 as-is, as a late-breaking bug was discovered and fixed after the tick.
+
 ## TShock 5.0.0
 * Reduced load/save console spam. (@SignatureBeef, @YehnBeep)
 * Replaced SQLite library with Microsoft.Data.Sqlite for arm64 support. (@SignatureBeef)