From c073100c0a3238738423d02553fa3422bfc89e75 Mon Sep 17 00:00:00 2001
From: Lucas Nicodemus <shank@shanked.me>
Date: Fri, 7 Aug 2015 07:32:40 -0600
Subject: [PATCH] Update Submodule; Update to API 1.21

---
 TShockAPI/TShock.cs | 2 +-
 TerrariaServerAPI   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index cc1ce200..82716cb4 100755
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -45,7 +45,7 @@ namespace TShockAPI
 	/// This is the TShock main class. TShock is a plugin on the TerrariaServerAPI, so it extends the base TerrariaPlugin.
 	/// TShock also complies with the API versioning system, and defines its required API version here.
 	/// </summary>
-	[ApiVersion(1, 20)]
+	[ApiVersion(1, 21)]
 	public class TShock : TerrariaPlugin
 	{
 		/// <summary>VersionNum - The version number the TerrariaAPI will return back to the API. We just use the Assembly info.</summary>
diff --git a/TerrariaServerAPI b/TerrariaServerAPI
index c7285a26..c5e56424 160000
--- a/TerrariaServerAPI
+++ b/TerrariaServerAPI
@@ -1 +1 @@
-Subproject commit c7285a26806d5c109bd3a0346bc564982f501598
+Subproject commit c5e564249e7e424a3acf08d3be5584af2b0f4032