From 9ba106ed199a995242e38913ad9b10584fd08bc8 Mon Sep 17 00:00:00 2001
From: White <WhiteXZ@users.noreply.github.com>
Date: Wed, 15 Jun 2016 00:45:09 +0930
Subject: [PATCH] Changelog update

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c4ffc56..0914bfe1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
 
 ## Upcoming Changes
 
+* Updated superadmin behaviour to conform to expected behaviour (@WhiteXZ)
+* Fixed a crash involving teleporters and dressers (@WhiteXZ)
+* Fixed pressure plates (@Enerdy @Patrikk)
+* Fixed a deadlock in wiring (@Wolfje)
+* Fixed a crash in wiring (@Patrikk)
+
 ## TShock 4.3.16
 
 * Terraria 1.3.1 wiring bugfixes