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

Merge branch 'general-devel' of github.com:TShock/TShock into general-devel

Browse source 
Conflicts:
	TShockAPI/Properties/AssemblyInfo.cs
This commit is contained in:
high 2011-08-05 00:40:24 -04:00
commit 7049fd65cd
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/Properties/AssemblyInfo.cs
View file

@ -36,5 +36,5 @@ using System.Runtime.InteropServices;
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.1.4.0805")] [assembly: AssemblyVersion("3.2.0.0804")]
[assembly: AssemblyFileVersion("3.1.4.0805")] [assembly: AssemblyFileVersion("3.2.0.0804")]

2
TShockAPI/TShock.cs
View file

@ -48,7 +48,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 = "Milestone 3"; public static readonly string VersionCodename = "Yes, we're adding Logblock style functionality soon, don't worry.";
public static string SavePath = "tshock"; public static string SavePath = "tshock";