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

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

Browse source
This commit is contained in:
Stargazing Koishi 2022-11-10 02:23:30 -08:00 • committed by GitHub
commit 7a49d61761
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 960 additions and 954 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/TShock.cs
View file

@ -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))
{

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