From 2b64c04b7f96069387ff21241e96a724fc0f4904 Mon Sep 17 00:00:00 2001
From: 0x3fcf1bbd <81617230+0x3fcf1bbd@users.noreply.github.com>
Date: Sun, 23 Jan 2022 16:10:43 +0100
Subject: [PATCH] Fixed CHANGELOG.md

Also merged the two "Upcoming changes" headers.
---
 CHANGELOG.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37fc3328..792052f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,10 +14,8 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
 ## Upcoming changes
 * Added hook `GetDataHandlers.OnReleaseNpc` to handling ReleaseNPC packet and a bouncer to stops unregistered and logged out players on SSC servers from releasing critters NPC. The bouncer has additional filter to stops players who tried to release different critter using crafted packet, e.g. using bunny item to release golden bunny. (@tru321)
 * Added filter in `GetDataHandlers.HandleCatchNpc` that stops unregistered and logged out players on SSC servers to catch critters. (@tru321)
-* Added the lanterns night event to the `/worldmode` command. (@0x3fcf1bbd)
-
-## Upcoming changes
 * Fixed rejection check inside of `HandlePaintTile` to account for the Paint Sprayer (or Architect Gizmo Pack) being inside your inventory, rather than on an accessory slot. (@drunderscore)
+* Added the lanterns night event to the `/worldevent` command. (@0x3fcf1bbd)
 
 ## TShock 4.5.12
 * Fixed the ability to spawn Zenith projectile with non-original items. (@AgaSpace)