various fixes from #issuefication-zone

9 files changed, 74 insertions, 19 deletions

diff --git a/album/empyreal-rhapsody.yaml b/album/empyreal-rhapsody.yaml
index f18ab49d..121717bb 100644
--- a/album/empyreal-rhapsody.yaml
+++ b/album/empyreal-rhapsody.yaml
@@ -12,8 +12,8 @@ Cover Art File Extension: png
 Track Art File Extension: png
 Color: '#EAE8E9'
 Groups:
-- Nasqueron
 - Deconreconstruction
+- Nasqueron
 - Fandom
 ---
 Track: Phantazein
diff --git a/album/homestuck-vol-10.yaml b/album/homestuck-vol-10.yaml
index f5bdc016..e60d5e6a 100644
--- a/album/homestuck-vol-10.yaml
+++ b/album/homestuck-vol-10.yaml
@@ -142,7 +142,40 @@ Commentary: |-
 
     <i>Homestuck:</i> ([Bandcamp credits blurb](https://web.archive.org/web/20160612161939/https://homestuck.bandcamp.com/album/homestuck-vol-10))
 
-    Cover art by [[artist:lexxy|Alexandra "Lexxy" Douglas]]
+    [[artist:seth-peelle|Seth "Beatfox” Peelle]]<br>
+    [[artist:buzinkai|George Buzinkai]]<br>
+    [[artist:tensei]]<br>
+    [[artist:clark-powell]]<br>
+    [[artist:astro-kid]]<br>
+    [[artist:catboss|Yishan Mai]]<br>
+    [[artist:willow-ascenzo]]<br>
+    [[artist:dj]]<br>
+    [[artist:pixelseph]]<br>
+    [[artist:david-dycus|David "Dirtiest" Dycus]]<br>
+    [[artist:malcolm-brown]]<br>
+    [[artist:toby-fox]]<br>
+    [[artist:mark-j-hadley|Mark Hadley]]<br>
+    [[artist:kalibration]]<br>
+    [[artist:thomas-ferkol]]<br>
+    [[artist:andrew-huo]]<br>
+    [[artist:robert-j-lake]]<br>
+    [[artist:david-ellis]]<br>
+    [[artist:curt-blakeslee]]<br>
+    [[artist:marcy-nabors]]<br>
+    [[artist:michael-guy-bowman]]<br>
+    [[artist:erik-scheele]]<br>
+    [[artist:jamie-paige]]<br>
+    [[artist:solatrus]]<br>
+    [[artist:max-wright]]<br>
+    [[artist:alex-rosetti|Alexander Rosetti]]
+
+    Managed by [[artist:robert-j-lake]] with help from [[artist:marcy-nabors]] and [[artist:james-roach]].
+
+    Mastered by [[artist:marcy-nabors]].
+
+    Cover by [[artist:lexxy|Alexandra “Lexxy” Douglass]]. Track art and performer credits on the individual songs!
+
+    Features sheet music for [[Renewed Return|“Renewed Return,”]] plus an exclusive PDF with commentary, making-of images, and more!
 
     <i>Homestuck:</i>
 
@@ -392,7 +425,7 @@ Commentary: |-
 
     The amount of musical fan activity that came out of Homestuck was really quite incredible, and something I've never seen in any fandom before. For all the highs and lows in the Homestuck fandom the way the fandom appreciated fanmusic was special.
 
-    <i>David Dycus</i>: (composer, synths)
+    <i>David Dycus:</i> (composer, synths)
 
     Homestuck gave me a sense of musical purpose I have not experienced before or since.
 
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index 2e839c44..28c35a56 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -409,18 +409,6 @@ Commentary: |-
     <i>Paul Henderson:</i>
     (<a href="https://www.youtube.com/watch?v=jusfjbsO_qY">Original video!</a>)
 ---
-Track: Idle Playthings (Mimis Music) 
-Artists:
-- Rom M
-Duration: '3:13'
-Referenced Tracks:
-- Liquid Negrocity
-Sampled Tracks:
-- Rubber Band
-URLs:
-- https://vasterror.bandcamp.com/track/idle-playthings-mimis-music
-- https://youtu.be/5yXNfLJ-RZw
----
 Track: Jadesprite
 Artists:
 - Toby Fox
@@ -683,6 +671,8 @@ Artists:
 Duration: '2:27'
 URLs:
 - https://www.youtube.com/watch?v=trRCHf5Bs94
+Referenced Tracks:
+- Sunsetter
 Lyrics: |-
     When I was young it seemed like everywhere was easy street
     Playing on my pogo ride, kicking back my feet
@@ -1215,6 +1205,18 @@ Lyrics: |-
     The waters are rippling, a new world is taking it's shape
     And tonight, our Pangaea awaits
 ---
+Track: Idle Playthings (Mimis Music)
+Artists:
+- Rom M
+Duration: '3:13'
+Referenced Tracks:
+- Liquid Negrocity
+Sampled Tracks:
+- Rubber Band
+URLs:
+- https://vasterror.bandcamp.com/track/idle-playthings-mimis-music
+- https://youtu.be/5yXNfLJ-RZw
+---
 Track: It Looks Back
 Artists:
 - Scorpyus
diff --git a/album/p-s.yaml b/album/p-s.yaml
index b68ba8d9..69643113 100644
--- a/album/p-s.yaml
+++ b/album/p-s.yaml
@@ -88,6 +88,7 @@ URLs:
 - https://www.youtube.com/watch?v=8MNfr-CC56E
 Referenced Tracks:
 - Spider's Claw
+- Vriska's Theme
 - Horschestra
 Lyrics: |-
     (Luck can be defined as probability taken personally, and is often described as one's belief in an intangible force, that is able to indirectly enact change in one's environment. The more favorable to one the change is, the luckier one is said to be. In contrast, strength can be defined as the measure of one's ability to directly enact change in one's environment. Therefore, though they approach it differently, luck and strength share a common purpose.)
@@ -303,6 +304,7 @@ Artists:
 Duration: '4:36'
 URLs:
 - https://casualsunday.bandcamp.com/track/a-farewell-to-arms
+- https://www.youtube.com/watch?v=6YT--cfMA4Q
 Referenced Tracks:
 - Skies of Skaia
 - Homestuck Anthem
@@ -323,6 +325,14 @@ Referenced Tracks:
 - Sarabande
 - Ballad of Awakening
 - Upward Movement (Dave Owns)
+Commentary: |-
+    <i>Catboss:</i> ([YouTube](https://www.youtube.com/watch?v=6YT--cfMA4Q))
+
+    P[S] is an album of Homestuck music and remixes from the official music team consisting of tracks that were cut from previous albums - most officially [[album:homestuck-vol-10|Vol. 10]], which was trimmed to 25 tracks because [[flash:4109|meme numbers]]. Get it here: Get P[S] here: [casualsunday.bandcamp.com/album/p-s](https://casualsunday.bandcamp.com/album/p-s)
+
+    Here's my track, A Farewell to Arms, an ode to Homestuck music, and really a thank-you letter to the entire music team itself. I tried to quote something by every member of the team. Might've missed a couple people, but I tried my best. Frankly, without Homestuck music, I wouldn't be making music today. If you liked the music at all, I highly recommend tracking down what music team folks are doing nowadays - many of them could really use the support!
+
+    (Also it's an arms joke.)
 ---
 Track: Moving On
 Artists:
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index a2ab10b8..0244dcf9 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -3800,6 +3800,7 @@ Track: One Hell of a Time
 # Reference:
 #   https://vgmdb.net/album/71570
 Artists:
+- Cuphead
 - Kristofer Maddigan
 Duration: '3:02'
 URLs:
diff --git a/album/the-felt.yaml b/album/the-felt.yaml
index 1934f5af..d05fb959 100644
--- a/album/the-felt.yaml
+++ b/album/the-felt.yaml
@@ -56,7 +56,7 @@ Commentary: |-
     [[artist:toby-fox|Toby "Radiation" Fox]]<br>
     [[artist:mark-j-hadley|Mark Hadley]]<br>
     [[artist:david-ko]]<br>
-    [[artits:solatrus|Jeremy "Solatrus" Iamurri]]<br>
+    [[artist:solatrus|Jeremy "Solatrus" Iamurri]]<br>
     [[artist:robert-j-lake]]<br>
     [[artist:clark-powell|Clark "Plazmataz" Powell]]<br>
     [[artist:alex-rosetti|Alexander Rosetti]]<br>
@@ -367,6 +367,7 @@ Art Tags:
 - HB
 - The Felt
 - Felt Manor
+- 'cw: blood'
 Duration: '6:03'
 URLs:
 - https://homestuck.bandcamp.com/track/variations-2
diff --git a/album/vaporwave-2016.yaml b/album/vaporwave-2016.yaml
index cec34421..8692290c 100644
--- a/album/vaporwave-2016.yaml
+++ b/album/vaporwave-2016.yaml
@@ -11,8 +11,8 @@ Cover Artists:
 - Jamie Paige
 Color: '#fb90b4'
 Groups:
-- Jamie Paige
 - Unofficial MSPA Fans
+- Jamie Paige
 - Fandom
 Art Tags:
 - Dave
diff --git a/artists.yaml b/artists.yaml
index 45f00727..9e1f37c4 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -1742,6 +1742,8 @@ Artist: Cuil
 ---
 Artist: Cullen Lawson
 ---
+Artist: Cuphead
+---
 Artist: Curi Lagann
 URLs:
 - https://twitter.com/HedgeMom
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index b83347e7..38af7dd3 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -45,7 +45,7 @@ Content: |-
     - added Bandcamp commentary/credit blurbs, as well as news and descriptions from whatpumpkin.com, across [[group:official]]
     - added full-size art by [[artist:devin-h-s]] to [[track:awakening]], [[track:wsw-beatdown]] and [[track:sburban-reversal]]
     - added commentary from Tumblr to [[track:the-king-in-red-beta]] (thanks, Lilith!)
-    - added commentary and YouTube links to [[track:blue-blood-group]], [[track:skaianet-20]], and [[track:bane-p-s]] (thanks, Lilith!)
+    - added commentary and YouTube links to [[track:blue-blood-group]], [[track:skaianet-20]], [[track:bane-p-s]], and [[track:a-farewell-to-arms]] (thanks, Lilith!)
     - added commentary to [[track:woman-i-never-met]] and [[track:puzzle-i-never-solved]], as well as track art to the former (thanks, Lilith!)
     - added commentary to [[track:unite-division-beta]] and [[track:heel-girl-beta]] (thanks, Lilith!)
     - added mini-commentary from Bandcamp to [[track:skaian-overdrive]] (thanks, Lilith!)
@@ -56,7 +56,7 @@ Content: |-
     - added lyrics to [[track:best-boyfriend]]
     - added an ascii image of bowsette to [[track:an-ascii-image-of-bowsette]]
     <h3>data fixes</h3>
-    - fixed broken commentary formatting in [[track:verdant-metamorphosis]], [[track:a-very-o-christmas]], [[track:alive]], [[track:death-minute-in-duodecimal-regicide-demonica]], [[track:haunt-andrew-hussie]], [[track:jump-up-super-star]], [[track:cosmic-carousel]]
+    - fixed broken commentary formatting in [[track:verdant-metamorphosis]], [[track:you-killed-my-father-prepare-to-die]], [[track:a-very-o-christmas]], [[track:alive]], [[track:death-minute-in-duodecimal-regicide-demonica]], [[track:haunt-andrew-hussie]], [[track:jump-up-super-star]], [[track:cosmic-carousel]]
     - fixed broken lyrics formatting in [[track:trollcops-radio-play]]
     - fixed outdated names or typos in commentary credits for album and track commentary in [[album:the-baby-is-you]], [[album:shortcuts]], [[album:cool-and-new-homestuck-2]], [[album:cool-and-new-homestuck-3]], [[album:v8lume]], [[album:jpeg]], [[album:cool-and-new-volume-3]]
     - fixed typos and minor tweaks in commentary for more tracks: [[track:stab-stab-stab-lofam5]], [[track:furthest-ringside]] (thanks, Jebb!)
@@ -67,6 +67,8 @@ Content: |-
     - fixed [[track:skaian-overdrive]] not sampling [[track:anubis-septicflesh]]
     - fixed [[track:skaian-happy-flight]] not referencing [[track:bastians-happy-flight]]
     - fixed [[track:breeze]] not referencing [[track:evanescence-maria-schneider]]
+    - fixed [[track:blue-blood-group]] not referencing [[track:vriskas-theme]] (thanks, Lilith!)
+    - fixed [[track:sunsetter-ska]] not referencing [[track:sunsetter]]
     - fixed [[track:ephemeral-muse-final-remix-psycholonials]] not being listed as a re-release of [[track:ephemeral-muse-final-remix]] (thanks, Lilith!)
     - fixed [[track:not-a-creature-was-stirring]] being named "not a creature was stirring" (different capitalization)
     - fixed [[track:phat1]], [[track:phat2]], [[track:phat3]], [[track:phat4]], [[track:phat5]], [[track:phat8]], [[track:phat9]], [[track:phat10]], and [[track:phat11]] not crediting [[artist:bill-bolin]] (for mastering and syncing)
@@ -78,9 +80,13 @@ Content: |-
         - 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
     - added [[artist:fruitytee]] to credits for [[track:predestination-vast-error]] and [[track:nothing-special]]
+    - added [[artist:cuphead]] to credits for [[track:one-hell-of-a-time]] (thanks, Jebb!)
     - added sheet music blueprint for [[track:narrative-command]] as proper sheet music file, instead of just linking from commentary
     - changed [[artist:toby-fox]]'s credit on [[track:fiduspawn-go]] from contributor to co-artist
     - changed [[artist:nick-smalley]]'s credit on [[track:trollcops-radio-play]] from contributor to (lyrical) co-artist
+    - reorganized the group lists of some albums for consistency across site:
+        - moved [[group:unofficial-mspa-fans]] above [[group:jamie-paige]] on [[album:vaporwave-2016]]
+        - moved [[group:deconrecon]] above [[group:nasqueron]] on [[album:empyreal-rhapsody]]
     - divided [[track:revelations-i|Revelations']] [[track:revelations-ii|three]] [[track:revelations-iii|movements]] into their own section in [[album:sburb]], in line with their composer's notes
     - divided [[album:vast-error-vol-4]], [[album:catch-322]], [[album:dead-shufflers-anything-goes]] into main album and bonus track sections