Merge branch 'master' of github.com:TShock/TShock

Conflicts:
	TShockAPI/TShock.cs
This commit is contained in:
Lucas Nicodemus 2012-01-26 22:46:50 -07:00
commit a764d24422

View file

@ -41,7 +41,7 @@ namespace TShockAPI
public class TShock : TerrariaPlugin
{
public static readonly Version VersionNum = Assembly.GetExecutingAssembly().GetName().Version;
public static readonly string VersionCodename = "1.1.2 in the house!";
public static readonly string VersionCodename = "Squashing bugs, and adding suggestions";
public static string SavePath = "tshock";