diff --git a/.gitignore b/.gitignore index 52eb9fd..5ac4b6a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,71 @@ +# Sublime Text # +*.sublime-* +releases/ +# Compiled source # +################### +*.com +*.class +*.dll +*.exe +*.o +*.so */bin/* */obj/* +bin/* +obj/* +# 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 + +# Visual Studio # +################################## +*.userprefs *.suo *.sdf *.opensdf *.cache *.pdb -*.csproj.user \ No newline at end of file +*.csproj.user +*/_ReSharper*/* +*.user +.vs/* + +#Template Bat file# +################### +postbuild.bat +/TestResults + +# JetBrains Crap # +################## +*.dotCover +_ReSharper.* + +# GTFO NuGet stuff # +#################### +packages/* + +# Private key files # +scripts/ssh_private_key diff --git a/History/History.csproj b/History/History.csproj index 796ea55..3f9285e 100644 --- a/History/History.csproj +++ b/History/History.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties History History - v4.5 + v4.7.2 512 diff --git a/References/OTAPI.dll b/References/OTAPI.dll index be85074..684b341 100644 Binary files a/References/OTAPI.dll and b/References/OTAPI.dll differ diff --git a/References/TShockAPI.dll b/References/TShockAPI.dll index fe6994c..4928440 100644 Binary files a/References/TShockAPI.dll and b/References/TShockAPI.dll differ diff --git a/References/TerrariaServer.exe b/References/TerrariaServer.exe index 25f63b8..dc19881 100644 Binary files a/References/TerrariaServer.exe and b/References/TerrariaServer.exe differ