message: CHANGELOG merge fail, oops
diff: @@ -15,7 +15,6 @@ NOTICE: The ABI has changed, please make sure to update your nwnx.nss and recomp
  - Core: Allow passing engine structures to nwnx (Effect/Itemproperty)
  - Core: Added the environment variable `NWNX_CORE_SHUTDOWN_SCRIPT=scriptname` which lets you set a nwscript that runs when the server shuts down
  - Events: New events: SkillEvents, MapEvents, EffectEvents, QuickChatEvents, InventoryEvents, BarterEvents, TrapEvents, TimingBarEvents
  -- Events: New events: SkillEvents, MapEvents, EffectEvents, QuickChatEvents, InventoryEvents, BarterEvents, TrapEvents
  - Events: The following events are now skippable: FeatEvents, ItemEvents, HealersKitEvents, CombatModeEvents, PartyEvents, SkillEvents, MapEvents, PolymorphEvents, DMActionEvents, ClientConnectEvents, SpellEvents, QuickChatEvents, InventoryEvents, BarterEvents (START only), TrapEvents
  - Events: You can now get the current event name with a nwscript function
  - Events: Added On{Listen/Spot}Detection events to StealthEvents
  