diff --git a/.gitignore b/.gitignore index 0cc65b96..d99475b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,40 @@ -/bin/* -/Content/* -/Fonts/* -/Images/* -/Sounds/* \ No newline at end of file +./bin/* +./Content/* +./Fonts/* +./Images/* +./Sounds/* +./obj/* +# Compiled source # +################### +*.com +*.class +*.dll +*.exe +*.o +*.so + +# Packages # +############ +# it's better to unpack these files and commit the raw source +# git has its own built in compression methods +*.7z +*.dmg +*.gz +*.iso +*.jar +*.rar +*.tar +*.zip + +# Logs and databases # +###################### +*.log +*.sql +*.sqlite + +# OS generated files # +###################### +.DS_Store? +ehthumbs.db +Icon? +Thumbs.db \ No newline at end of file diff --git a/Terraria/ShankShock.cs b/Terraria/ShankShock.cs index bde79068..f1a1cb41 100644 --- a/Terraria/ShankShock.cs +++ b/Terraria/ShankShock.cs @@ -49,9 +49,6 @@ namespace Terraria string updateVersion = client.DownloadString("http://shankshock.com/tshock.txt"); string[] changes = updateVersion.Split(','); float[] color = { 255, 255, 000 }; - Console.WriteLine(changes.Length); - Console.WriteLine(changes[0]); - Console.WriteLine(changes[1]); if (Convert.ToDouble(changes[0]) > version) { sendMessage(ply, "This server is out of date. Version " + changes[0] + " is out.", color); diff --git a/bin/Debug/Terraria.exe b/bin/Debug/Terraria.exe index 52d6bfef..e5605233 100644 Binary files a/bin/Debug/Terraria.exe and b/bin/Debug/Terraria.exe differ diff --git a/bin/Debug/Terraria.pdb b/bin/Debug/Terraria.pdb index 80275fcb..305fbb59 100644 Binary files a/bin/Debug/Terraria.pdb and b/bin/Debug/Terraria.pdb differ diff --git a/obj/x86/Debug/Terraria.exe b/obj/x86/Debug/Terraria.exe index 52d6bfef..e5605233 100644 Binary files a/obj/x86/Debug/Terraria.exe and b/obj/x86/Debug/Terraria.exe differ diff --git a/obj/x86/Debug/Terraria.pdb b/obj/x86/Debug/Terraria.pdb index 80275fcb..305fbb59 100644 Binary files a/obj/x86/Debug/Terraria.pdb and b/obj/x86/Debug/Terraria.pdb differ