themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'general-devel' of https://github.com/nyxstudios/TShock into general-devel

Browse source
This commit is contained in:
White 2015-07-07 23:18:14 +09:30
commit 4ad083dd0a
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -2,7 +2,7 @@
This is the rolling changelog for TShock for Terraria. Use past tense when adding new entries; sign your name off when you add or change something. This should primarily be things like user changes, not necessarily codebase changes unless it's really relevant or large.
## Unreleased
## TShock 4.3.0.1
* Fixed a bug where /user group failing would output no error. (@nicatronTg)
* Fixed a bug where /user group would fail. @(Enerdy)
@ -12,6 +12,9 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* DisableTombstones now works properly with the new golden gravestones. (@Enerdy)
* REST module now properly catches exceptions during Start(). (@Patrikkk)
* Added /expert command to toggle expert mode. (@WhiteXZ)
* Fixed pirate invasions. (@patrik)
* Fixed worldinfo packet. (@WhiteXZ)
* Fixed server passwords. (@Enerdy)
## TShock 4.3.0.0

4
TShockAPI/Properties/AssemblyInfo.cs
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.0")]
[assembly: AssemblyFileVersion("4.3.0")]
[assembly: AssemblyVersion("4.3.1")]
[assembly: AssemblyFileVersion("4.3.1")]

2
TerrariaServerAPI

@ -1 +1 @@
Subproject commit fa9e1e19757cde7b92c44687224f7435a8193c18
Subproject commit 02625efea2cfc9b530f4c903af8f965d802f3b6e