Merge branch 'general-devel' into fragments

This commit is contained in:
Lucas Nicodemus 2017-12-12 03:19:34 -07:00
commit 30c9f74ad3
3 changed files with 4 additions and 3 deletions

View file

@ -32,6 +32,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* Removed `/restart` command. (@hakusaro)
* Removed `Permissions.updateplugins` permission. (@hakusaro)
* Removed REST `/v3/server/restart/` route and `/server/restart/` route. (@hakusaro)
* Fixed a critical exploit in the Terraria protocol that could cause massive unpreventable world corruption as well as a number of other problems. Thanks to @bartico6 for reporting. Fixed by the efforts of @QuiCM, @hakusaro, and tips in the right directioon from @bartico6.

View file

@ -53,5 +53,5 @@ using System.Runtime.InteropServices;
// 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)
[assembly: AssemblyVersion("4.3.24")]
[assembly: AssemblyFileVersion("4.3.24")]
[assembly: AssemblyVersion("4.3.25")]
[assembly: AssemblyFileVersion("4.3.25")]

@ -1 +1 @@
Subproject commit faa3b95697bbf675503b2823c5f59593cf825bb3
Subproject commit 2c25bb68fde0e2c40a32d639ff79d614d3fb1580