Merge remote-tracking branch 'upstream/master'

This commit is contained in:
ricky 2011-06-07 15:24:50 +10:00
commit cc92a38e40
2 changed files with 2 additions and 3 deletions

View file

@ -77,7 +77,6 @@ namespace TShockAPI
{ {
return; return;
} }
else
FileTools.CreateFile(FileTools.SaveDir + "config.json"); FileTools.CreateFile(FileTools.SaveDir + "config.json");
ConfigFile cfg = new ConfigFile(); ConfigFile cfg = new ConfigFile();
cfg.InvasionMultiplier = 50; cfg.InvasionMultiplier = 50;

View file

@ -15,7 +15,7 @@ namespace TShockAPI
public static string saveDir = "./tshock/"; public static string saveDir = "./tshock/";
public static Version VersionNum = new Version(1, 8, 0, 2); public static Version VersionNum = new Version(1, 9, 0, 0);
public static string VersionCodename = "SPACEEE"; public static string VersionCodename = "SPACEEE";