From 6804be6e95d00f923c4665592089466c03f40532 Mon Sep 17 00:00:00 2001 From: Ruby Rose Date: Fri, 21 Apr 2017 10:16:16 +0300 Subject: [PATCH 1/2] Initial 2.1 update --- Warpplate.csproj | 12 +++++------- bin/Release/AdvancedWarpplate.dll | Bin 20992 -> 20992 bytes warpplate.cs | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Warpplate.csproj b/Warpplate.csproj index 514aae5..9a9261d 100644 --- a/Warpplate.csproj +++ b/Warpplate.csproj @@ -48,17 +48,15 @@ References\MySql.Data.dll - References\OTAPI.dll + ..\Server\OTAPI.dll - - False - References\TerrariaServer.exe + + ..\Server\TerrariaServer.exe - - False - References\TShockAPI.dll + + ..\Server\ServerPlugins\TShockAPI.dll diff --git a/bin/Release/AdvancedWarpplate.dll b/bin/Release/AdvancedWarpplate.dll index 23659481596797f1a034043f94567578513f0087..b11d1dd2dc05f23426048aa75e0244f503a65a59 100644 GIT binary patch delta 1244 zcmZoz!q~8caY6^P+s2<8yASfz3o)=&i!d;-k8~ z7zuqvm@SiC_!KlicIBr5379B|pAIB6_<-i>h{1#>_wY$sf=m%dvI^p`$ox`}`Z6E^ zQw?OI7&`erpQJj-sv;#0hJqqFAc15Is*#f~@{1~z1JxpX3TzXy+b0O93Sl~DayP#` z#GXgQ*rN_nYsN{wo22v*;Ta;JfjyvcIQF;zDUOxmfQ9a4eL;K1g30-U@<6g*FdRre z2ea9QY=CSRpaQaK~f(`2$(h|pB9pq28SFtod_{$)Bz=QM4+k)CNl~P%fhuw zI$UL7U_dj$P*{!~YQp3&C|d$(af)>njKBZ|0bekKk%5^3D7Kkf<)yrUXy2rXYx|hJ+Cy%9)HI*9V>64(GM0Ln z1_lOTi4pw#oULL)i&Kk= zV^WGujAC3;i?d7e3t|FtO4Bp*Tq{b763Y_P6Z5JPV;ob;67!N%Q*^@=%4L+a?bi`o7lY982EJ3D-Lq*^wibv*`g4CA* z37Bdi6UETU_xU8%K~@zhaWE7V$pHx@V^EEpe34&Np&Y0d+56zYLU#KE0aYPP=S=SA zmxtK%h!}g+A!^My$#;{K9wIzL1T?S*G!Dle7a+y4QXH_*ovbft&zL(oUr-)M_6vps z$>(4;yO0f#?IM&b1&dRWO8`x-7S0m~MKY%#iy*5;JtzucrcM%(N3v9dADFhd z*mM<1!-^5Ar{nxCN{ADk*Uz`Av1;Cc;2^?<&P7nO$V zY7|uiimU*W=S4-~;;%&wf#R}aF+j3P%ne8$6jRUzo8Kr1G`|GoWN_+4^06cmJ3oIi zpE%Hr%?{!xI5m8@Fp-oMiN2(C07)ik#$WXUJr{%sB^0J^_-O4HV}v zF^Wz;tE?{0!oUIyP!RBC1d)sk%s>&A&D<(4$}i+5f)S5S>>+vjteSzMN} zWP+4I0I)=f0I`^WSO%#53^3!K@nB#G3U&#erPpEN%AD%nvu0QJ%HtQjL8d!f#e^28 z78S=tC1xh)=P7t+7UdUbl*YK^Czs}?=9Lu3lmutwCuaxbl%{9q6;I~zyt?^?rvwK8 Dvi14j diff --git a/warpplate.cs b/warpplate.cs index 2421a60..d4b6a71 100644 --- a/warpplate.cs +++ b/warpplate.cs @@ -14,7 +14,7 @@ namespace AdvancedWarpplate { - [ApiVersion(2,0)] + [ApiVersion(2,1)] public class WarpplatePlugin : TerrariaPlugin { #region Plugin Information @@ -174,6 +174,7 @@ private void OnUpdate(EventArgs args) private void WarpplateCommands(CommandArgs args) { + string specifier = args.Silent ? TShock.Config.CommandSilentSpecifier : TShock.Config.CommandSpecifier; TSPlayer player = args.Player; if (args.Parameters.Count < 1 || args.Parameters.Count > 4) @@ -183,7 +184,6 @@ private void WarpplateCommands(CommandArgs args) } string baseCmd = args.Parameters[0].ToLower(); - string specifier = args.Silent ? TShock.Config.CommandSilentSpecifier : TShock.Config.CommandSpecifier; switch (baseCmd) { From d29900175085e0a2c640cc52dfac695698e747b8 Mon Sep 17 00:00:00 2001 From: Ruby Rose Date: Fri, 21 Apr 2017 10:16:33 +0300 Subject: [PATCH 2/2] Gitignore --- .gitignore | 288 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 288 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..940794e --- /dev/null +++ b/.gitignore @@ -0,0 +1,288 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ +**/Properties/launchSettings.json + +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# TODO: Comment the next line if you want to checkin your web deploy settings +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Typescript v1 declaration files +typings/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush +.cr/ + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs