From 0999c10f2a68769933e498393a8ac4e6e29f10ef Mon Sep 17 00:00:00 2001
From: Debug <49997488+DebugOk@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:43:40 +0100
Subject: [PATCH] Fix changelog order and admin changelog (#957)

* Fix changelog order and admin changelog

* Rename upstream admin file
---
 Resources/Changelog/Admin.yml       | 17 ++++++-----------
 Resources/Changelog/Changelog.yml   |  3 ++-
 Resources/Changelog/DeltaVAdmin.yml |  9 +++++++++
 3 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 Resources/Changelog/DeltaVAdmin.yml

diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index fb31a3204e9..7d755493665 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -1,6 +1,6 @@
-Name: Admin
+Name: Upstream Admin
 AdminOnly: true
-Order: 2
+Order: 3
 Entries:
 - author: DrSmugleaf
   changes:
@@ -36,20 +36,15 @@ Entries:
   - {message: 'Add pop sound effect when using the erase admin verb.', type: Tweak}
   id: 5
   time: '2023-10-14T09:47:00.0000000+00:00'
-- author: DebugOk
-  changes:
-    - {message: 'Add back the loadcharacter and spawncharacter commands.', type: Add}
-  id: 6
-  time: '2023-10-19T00:00:00.0000000+00:00'
 - author: DrSmugleaf
   changes:
   - {message: 'Fixed not being able to sort the F7 players tab by playtime.', type: Fix}
-  id: 7
+  id: 6
   time: '2023-10-14T23:52:00.0000000+00:00'
 - author: DrSmugleaf
   changes:
   - {message: 'Fixed playtime being sorted incorrectly in the F7 players tab.', type: Fix}
-  id: 8
+  id: 7
   time: '2023-10-16T04:23:00.0000000+00:00'
 - author: DrSmugleaf
   changes:
@@ -58,7 +53,7 @@ Entries:
       in whitelist commands.', type: Fix}
   - {message: 'Added a \[player\] completion type hint to whitelist add and remove
       commands.', type: Tweak}
-  id: 9
+  id: 8
   time: '2023-10-21T09:53:00.0000000+00:00'
 - author: DrSmugleaf
   changes:
@@ -90,4 +85,4 @@ Entries:
   changes:
     - {message: 'Fixed AGhosts not being able to drop items past the default range.', type: Fix}
   id: 14
-  time: '2024-1-4T01:30:00.0000000+00:00'
+  time: '2024-1-4T01:30:00.0000000+00:00'
\ No newline at end of file
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 674632f3c2d..036ed1f83ca 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,4 +1,5 @@
-Entries:
+Order: 2
+Entries:
 - author: metalgearsloth
   changes:
   - message: Fix dungeons not spawning on expeditions.
diff --git a/Resources/Changelog/DeltaVAdmin.yml b/Resources/Changelog/DeltaVAdmin.yml
new file mode 100644
index 00000000000..188b1d30281
--- /dev/null
+++ b/Resources/Changelog/DeltaVAdmin.yml
@@ -0,0 +1,9 @@
+Name: Admin
+AdminOnly: true
+Order: 1
+Entries:
+- author: DebugOk
+  changes:
+    - {message: 'Add back the loadcharacter and spawncharacter commands.', type: Add}
+  id: 1
+  time: '2023-10-19T00:00:00.0000000+00:00'