Merge branch 'preview' into refs-beyond-fixes-merge

4 files changed, 15 insertions, 34 deletions

diff --git a/album/brostuck.yaml b/album/brostuck.yaml
index 7ebd2ee..0c6c55f 100644
--- a/album/brostuck.yaml
+++ b/album/brostuck.yaml
@@ -25,7 +25,7 @@ Duration: '3:22'
 URLs:
 - https://brostuck.bandcamp.com/track/brostuck
 Cover Artists:
-- mingmingfurby
+- Grim Harlequin
 Sampled Tracks:
 - Homestuck Anthem
 - GameBro (Original 1990 Mix)
@@ -2210,7 +2210,7 @@ Lyrics: |-
 Track: Witching GLouR (aka Fuschia GRuLer)
 Duration: '4:01'
 Cover Artists:
-- mingmingfurby
+- Grim Harlequin
 Art Tags:
 - Toby Fox
 - Karkat
@@ -2726,7 +2726,7 @@ Lyrics: |-
 Track: Air for Broclectic Games (aka Olive Brogue)
 Duration: '4:57'
 Cover Artists:
-- mingmingfurby
+- Grim Harlequin
 Art Tags:
 - Toby Fox
 - Karkat
diff --git a/album/repiton.yaml b/album/repiton.yaml
index 435efdd..8897f0d 100644
--- a/album/repiton.yaml
+++ b/album/repiton.yaml
@@ -141,7 +141,7 @@ URLs:
 ---
 Track: Nailed It
 Cover Artists:
-- Dronema
+- AnonEi
 Duration: '3:22'
 URLs:
 - https://vasterror.bandcamp.com/track/nailed-it
diff --git a/artists.yaml b/artists.yaml
index ba1bd54..137d674 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -480,6 +480,7 @@ Aliases:
 - aei-sb
 - anonei_art
 - anonei_24
+- Dronema
 URLs:
 - https://twitter.com/anonei_24
 - https://aei-sb.tumblr.com/
@@ -1862,11 +1863,10 @@ URLs:
 - https://cristata.bandcamp.com/
 ---
 Artist: Cozy Skeleton
-Aliases:
-- Octo
 URLs:
-- https://twitter.com/Cozy_Skeleton
 - https://www.deviantart.com/cozy-skeleton
+Dead URLs:
+- https://twitter.com/Cozy_Skeleton  # Not dead but 18+ and protected account
 ---
 Artist: Cratmang
 URLs:
@@ -3494,8 +3494,15 @@ Artist: Griffington
 Artist: Grim Harlequin
 Aliases:
 - Mingmingfurb
+- mingmingfurby
 URLs:
 - https://grimharlequin.tumblr.com/
+- https://furbyfridays.tumblr.com/
+Dead URLs:
+- https://www.deviantart.com/mingmingfurb/posts
+- https://www.deviantart.com/ribbonista-hime
+- https://mingmingfurby.tumblr.com/
+- https://mingmingfurb.tumblr.com/
 ---
 Artist: Grimlock495
 Aliases:
@@ -5861,17 +5868,6 @@ Artist: Mila Kunis
 ---
 Artist: Mildred Hill
 ---
-Artist: mingmingfurby
-Aliases:
-- Mingmingfurb
-URLs:
-- https://furbyfridays.tumblr.com/
-Dead URLs:
-- https://www.deviantart.com/mingmingfurb/posts
-- https://www.deviantart.com/ribbonista-hime
-- https://mingmingfurby.tumblr.com/
-- https://mingmingfurb.tumblr.com/
----
 Artist: Minish
 Aliases:
 - minishLAN
@@ -7585,8 +7581,6 @@ URLs:
 ---
 Artist: Russell Shaw
 ---
-Artist: Rutares
----
 Artist: Ruth White
 ---
 Artist: RWBY
@@ -7614,8 +7608,6 @@ Artist: Ryuji Sasai
 ---
 Artist: SK
 ---
-Artist: Skip
----
 Artist: Sabina Kim
 ---
 Artist: Sadochist
@@ -10127,16 +10119,6 @@ URLs:
 ---
 Artist: dromswell
 ---
-Artist: Dronema
-Aliases:
-- aei-sb
-URLs:
-- https://dronema.carrd.co/
-- https://twitter.com/Dronema3D
-- https://twitter.com/BarelyNSFW
-- https://bsky.app/profile/dronema.bsky.social
-- https://aei-sb.tumblr.com/
----
 Artist: ehlsea
 URLs:
 - https://ehlsea.tumblr.com/
@@ -10294,8 +10276,6 @@ URLs:
 ---
 Artist: greenTetrahedron
 ---
-Artist: Guy
----
 Artist: Hajime Wakai
 ---
 Artist: diz
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index 9cd3099..3bf1036 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -334,6 +334,7 @@ Content: |-
         - added [[track:flare-cascade-cut]] to reference lists of [[track:flare]], and [[track:flare-cascade]] (replacing [[track:flare]]), and [[track:cascade]] (replacing [[track:flare-cascade]])
         - moved [[track:flare-cascade]] out of [[album:unreleased-tracks]] and into [[album:more-homestuck-fandom]]
         - listed referenced tracks in [[track:cascade]] also as sampled tracks
+    - fixed [[artist:anonei]] having some credits under another name
     - fixed [[artist:raizor]] having some credits under another name
     - added [[artist:buoyant]] to credits for [[track:switchback]] (thanks, Lilith!)
     - added [[album:hiveswap-act-1-ost]] and [[album:hiveswap-act-2-ost]] to [[group:toby-fox]] group (as well as new [[group:james-roach]] group)