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

Merge branch 'general-devel'

Browse source
This commit is contained in:
Lucas Nicodemus 2015-03-15 15:24:20 -06:00
commit aa2490dea9
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/Commands.cs
View file

@ -1285,11 +1285,11 @@ namespace TShockAPI
{ {
if (args.Silent) if (args.Silent)
{ {
args.Player.SendInfoMessage("[broken name] was {0}banned for '{1}'.", force ? "force " : "", reason); args.Player.SendInfoMessage("{0} was {1}banned for '{2}'.", user.Name, force ? "force " : "", reason);
} }
else else
{ {
TSPlayer.All.SendInfoMessage("{0} {1}banned [broken name] for '{2}'.", args.Player.Name, force ? "force " : "", reason); TSPlayer.All.SendInfoMessage("{0} {1}banned {2} for '{3}'.", args.Player.Name, force ? "force " : "", user.Name, reason);
} }
} }
} }

4
TShockAPI/Properties/AssemblyInfo.cs
View file

@ -53,5 +53,5 @@ using System.Runtime.InteropServices;
// Also, be sure to release on github with the exact assembly version tag as below // 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) // so that the update manager works correctly (via the Github releases api and mimic)
[assembly: AssemblyVersion("4.2.8")] [assembly: AssemblyVersion("4.2.9")]
[assembly: AssemblyFileVersion("4.2.8")] [assembly: AssemblyFileVersion("4.2.9")]

2
TShockAPI/TShock.cs
View file

@ -44,7 +44,7 @@ namespace TShockAPI
public class TShock : TerrariaPlugin public class TShock : TerrariaPlugin
{ {
public static readonly Version VersionNum = Assembly.GetExecutingAssembly().GetName().Version; public static readonly Version VersionNum = Assembly.GetExecutingAssembly().GetName().Version;
public static readonly string VersionCodename = "2015!!"; public static readonly string VersionCodename = "nicatronTg hotfixes 4.2.8 in less than an hour edition";
public static string SavePath = "tshock"; public static string SavePath = "tshock";
private const string LogFormatDefault = "yyyy-MM-dd_HH-mm-ss"; private const string LogFormatDefault = "yyyy-MM-dd_HH-mm-ss";