diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index 32881120..27e0d6c2 100644
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -50,7 +50,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(2, 0)]
+	[ApiVersion(2, 1)]
 	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 5b6449c0..3a65dff3 160000
--- a/TerrariaServerAPI
+++ b/TerrariaServerAPI
@@ -1 +1 @@
-Subproject commit 5b6449c0ca98d51ca50eb4f29002c40e688c1ff7
+Subproject commit 3a65dff3198854b68d450df02beb07febaf40d66