diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index 65380a523..054e31dfa 100644
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -63,7 +63,7 @@ public class TShock : TerrariaPlugin
 		/// <summary>VersionNum - The version number the TerrariaAPI will return back to the API. We just use the Assembly info.</summary>
 		public static readonly Version VersionNum = Assembly.GetExecutingAssembly().GetName().Version;
 		/// <summary>VersionCodename - The version codename is displayed when the server starts. Inspired by software codenames conventions.</summary>
-		public static readonly string VersionCodename = "Thank you, everyone, for your support of TShock all these years! <3";
+		public static readonly string VersionCodename = "Intensity";
 
 		/// <summary>SavePath - This is the path TShock saves its data in. This path is relative to the TerrariaServer.exe (not in ServerPlugins).</summary>
 		public static string SavePath = "tshock";
diff --git a/TShockAPI/TShockAPI.csproj b/TShockAPI/TShockAPI.csproj
index 7bc42215d..a37317092 100644
--- a/TShockAPI/TShockAPI.csproj
+++ b/TShockAPI/TShockAPI.csproj
@@ -18,11 +18,11 @@
       Also, be sure to release on github with the exact assembly version tag as below
       so that the update manager works correctly (via the Github releases api and mimic)
     -->
-    <Version>5.1.3</Version>
+    <Version>5.2.0</Version>
     <AssemblyTitle>TShock for Terraria</AssemblyTitle>
     <Company>Pryaxis &amp; TShock Contributors</Company>
     <Product>TShockAPI</Product>
-    <Copyright>Copyright © Pryaxis &amp; TShock Contributors 2011-2022</Copyright>
+    <Copyright>Copyright © Pryaxis &amp; TShock Contributors 2011-2023</Copyright>
     <!-- extras for nuget -->
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
diff --git a/TerrariaServerAPI b/TerrariaServerAPI
index e0e2df24d..8a3fffd71 160000
--- a/TerrariaServerAPI
+++ b/TerrariaServerAPI
@@ -1 +1 @@
-Subproject commit e0e2df24dbc618683cc75595c59bf7f88acada08
+Subproject commit 8a3fffd71db401736ea80619122c70c449c10ff3
diff --git a/docs/changelog.md b/docs/changelog.md
index c4a95d142..3f64f3554 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -78,7 +78,10 @@ Use past tense when adding new entries; sign your name off when you add or chang
   * If there is no section called "Upcoming changes" below this line, please add one with `## Upcoming changes` as the first line, and then a bulleted item directly after with the first change. -->
 
 ## Upcoming changes
-* An additional option `pvpwithnoteam` is added at `PvPMode` to enable PVP with no team.(@CelestialAnarchy, #2617, @ATFGK)
+Your changes could be here!
+
+## TShock 5.2
+* An additional option `pvpwithnoteam` is added at `PvPMode` to enable PVP with no team. (@CelestialAnarchy, #2617, @ATFGK)
 * Corrected and updated deserialization of the following packets (@ATFGK):
   * `ProjectileNew`: Read the third `AI` value.
     * Before this change, it was previously possible for the projectile damage limit to falsely trigger, such as when using the Terra Balde and Fire Gauntlet together.