Merge branch 'staging' into mediaupdate

11 files changed, 43 insertions, 25 deletions

diff --git a/album/homestuck-vol-10.txt b/album/homestuck-vol-10.txt
index 6e8c8aa..bfb978f 100644
--- a/album/homestuck-vol-10.txt
+++ b/album/homestuck-vol-10.txt
@@ -173,7 +173,7 @@ Contributors:
 - viaSatellite (bass)
 - David Dycus (synths, composition)
 - Ian White (trumpet)
-- Kelly Sadwin (violin)
+- Noel Sadwin (violin)
 References:
 - track:showtime-piano-refrain
 - track:showtime-original-mix
@@ -372,7 +372,7 @@ Duration: 2:06
 References: Skaian Ride, Skaia Voyages
 Art Tags:
 - John
-- Dave
+- AH
 URLs:
 - https://homestuck.bandcamp.com/track/skaian-happy-flight-2
 - https://youtu.be/rozLPCPXopw
@@ -641,7 +641,7 @@ URLs:
 Contributors:
 - Marcy Nabors (composition, bass clarinet)
 - Catboss (flute)
-- Kelly Sadwin (violin & viola)
+- Noel Sadwin (violin & viola)
 - Jamie Paige Stanley (percussion)
 - Kyle G. Jamolin (lyrics & choir direction)
 - Ciaran Cain (choir)
diff --git a/album/homestuck-vol-6.txt b/album/homestuck-vol-6.txt
index 0618c36..a808fb0 100644
--- a/album/homestuck-vol-6.txt
+++ b/album/homestuck-vol-6.txt
@@ -89,6 +89,8 @@ Commentary:
     THE GAMES WILL NEVER STOP
     you know the rest
     (alternatively: where the heck did that horrible dude come from get him out of the way of the album art jesus)
+
+    I just binged on too much <a href="https://www.youtube.com/watch?v=xkreaWxL224">Go Mario Go</a> and <a href="https://www.youtube.com/watch?v=1cez1x1Gei4">The Heat Is On (bust a groove 2)</a> and went out to mow the lawn and came up with it
 Lyrics:
     Alright bros, are you ready?<br>It's time for the one, the only, GameBro!<br>He's coming to your screen straight from the magazine<br>The mix meister of Master Swords and mushrooms<br>Are you sure you're ready for this?<br>Well come on, get ready, get set, and here we go
     The GameBro is here and he's got the games<br>All you other lamebrainers better feel the shame<br>He can bend the rules, he's too cool for school<br>And he's got just a few cheat codes for you<br>There ain't nothing that'll ever hold this bad boy down<br>That hat that he's wearing's like his personal crown<br>He's got every game beat and skills that sweet<br>But if you want in his crew, you gotta be elite
diff --git a/album/homestuck-vol-8.txt b/album/homestuck-vol-8.txt
index 4ed7092..42031cc 100644
--- a/album/homestuck-vol-8.txt
+++ b/album/homestuck-vol-8.txt
@@ -567,7 +567,7 @@ Commentary:
 -------------------------------------------------------------------------------
 Track: Judgment Day
 Artist: Toby Fox
-Contributors: Kelly Sadwin (violin)
+Contributors: Noel Sadwin (violin)
 Track Art: Lazylaz
 Duration: 2:00
 References:
@@ -664,7 +664,7 @@ URLs:
 -------------------------------------------------------------------------------
 Track: Black Hole / Green Sun
 Artist: Malcolm Brown, Toby Fox
-Contributors: Tensei (electric guitar), Kelly Sadwin (violin)
+Contributors: Tensei (electric guitar), Noel Sadwin (violin)
 Track Art: none
 Duration: 2:30
 References:
diff --git a/album/lofam4.txt b/album/lofam4.txt
index 1adff5b..71c8cd2 100644
--- a/album/lofam4.txt
+++ b/album/lofam4.txt
@@ -860,7 +860,7 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/schr-dingers-harbinger
 - https://youtu.be/n39rrqi8XPM
-Credits:
+Commentary:
     <i>Noisemaker:</i>
     Initially from call and new 2: locomotif under the name Excess Express, I wanted Schrödinger's Harbinger to be Jasprose-themed to compensate for the lack of tracks in that category, as well as to make some additions to the original trakc.
     <i><b>WHATISLOSTINTHEMINES:</b></i>
diff --git a/album/one-year-older.txt b/album/one-year-older.txt
index b75dc26..fe8f1d1 100644
--- a/album/one-year-older.txt
+++ b/album/one-year-older.txt
@@ -215,6 +215,11 @@ Track Art: K
 Duration: 2:33
 Art Tags:
 - John
+- Vriska
+- Dave
+- Jade
+- Rose
+- Karkat
 URLs:
 - https://erikscheele.bandcamp.com/track/respit
 - https://youtu.be/9eSnvqGpzj8
diff --git a/album/strife-2.txt b/album/strife-2.txt
index 60396af..1f56b31 100644
--- a/album/strife-2.txt
+++ b/album/strife-2.txt
@@ -152,4 +152,5 @@ URLs:
 -------------------------------------------------------------------------------
 Track: Duet
 Duration: 2:37
-Has URLs: no
\ No newline at end of file
+URLs:
+- https://www.youtube.com/watch?v=oJHJGgbpeMI
\ No newline at end of file
diff --git a/album/the-baby-is-you.txt b/album/the-baby-is-you.txt
index 1b17aaa..0a3005e 100644
--- a/album/the-baby-is-you.txt
+++ b/album/the-baby-is-you.txt
@@ -2,7 +2,7 @@ Album: The Baby is You
 Artist: Toby Fox
 Cover Art: Astroliner
 Has Track Art: no
-Date: September 27, 2010
+Date: October 13, 2010
 Date Added: January 12, 2021
 Groups:
 - Toby Fox
diff --git a/album/the-wanderers.txt b/album/the-wanderers.txt
index 97f2454..73d1906 100644
--- a/album/the-wanderers.txt
+++ b/album/the-wanderers.txt
@@ -53,7 +53,7 @@ URLs: https://youtu.be/KrimTgZi5uk
 -------------------------------------------------------------------------------
 Track: Endless Expanse
 Artist: Erik Scheele
-Track Art: Guy
+Track Art: Carla Bravo
 Duration: 5:59
 Art Tags:
 - WV
diff --git a/artists.txt b/artists.txt
index c718c38..404cfa5 100644
--- a/artists.txt
+++ b/artists.txt
@@ -1522,6 +1522,7 @@ URLs:
 Artist: Gunsandwwands
 -------------------------------------------------------------------------------
 Artist: Guy
+Alias: Carla Bravo
 -------------------------------------------------------------------------------
 Artist: guzusuru
 Alias: Angela Sham
@@ -1933,6 +1934,7 @@ URLs:
 - https://twitter.com/kebbbbs
 -------------------------------------------------------------------------------
 Artist: Kelly Sadwin
+Alias: Noel Sadwin
 -------------------------------------------------------------------------------
 Artist: Kelsie Urias
 -------------------------------------------------------------------------------
@@ -2238,14 +2240,13 @@ URLs:
 -------------------------------------------------------------------------------
 Artist: M. Aurora Parker
 -------------------------------------------------------------------------------
-Artist: M. Thomas Harding
-Dead URLs:
-- http://www.iwantyoutofeelthepressure.com/
--------------------------------------------------------------------------------
 Artist: M. Schmahl
 URLs:
 - https://brilleg.tumblr.com/
 -------------------------------------------------------------------------------
+Artist: M. Thomas Harding
+Alias: Rebecca Harding
+-------------------------------------------------------------------------------
 Artist: M.O.O.N.
 URLs: https://musicofthemoon.com/
 -------------------------------------------------------------------------------
@@ -2696,6 +2697,8 @@ Artist: njeekyo
 -------------------------------------------------------------------------------
 Artist: Noah Noble
 -------------------------------------------------------------------------------
+Artist: Noel Sadwin
+-------------------------------------------------------------------------------
 Artist: Noelle Stevenson
 URLs:
 - https://twitter.com/Gingerhazing
@@ -3124,6 +3127,12 @@ Alias: Rebecca Peason
 -------------------------------------------------------------------------------
 Artist: Rebecca Black
 -------------------------------------------------------------------------------
+Artist: Rebecca Harding
+URLs:
+- http://www.honey-crab.com/
+Dead URLs:
+- http://www.iwantyoutofeelthepressure.com/
+-------------------------------------------------------------------------------
 Artist: Rebecca Peason
 URLs:
 - https://reasonpeason.tumblr.com/
diff --git a/flashes.txt b/flashes.txt
index dd1c3c2..97698eb 100644
--- a/flashes.txt
+++ b/flashes.txt
@@ -470,7 +470,7 @@ Contributors:
 - Eyes5 (art)
 - Jessica Allison (art)
 - Lexxy (art)
-- M. Thomas Harding (art)
+- Rebecca Harding (art)
 - Nic Carey (art)
 - Paige Turner (art)
 - Richard Gung (art)
@@ -503,7 +503,7 @@ Contributors:
 - FauxMonstur (art)
 - Jessica Allison (art)
 - Lexxy (art)
-- M. Thomas Harding (art)
+- Rebecca Harding (art)
 - myluckyseven (art)
 - Nic Carey (art)
 - Paige Turner (art)
@@ -567,7 +567,7 @@ Contributors:
 - Brett Muller (art)
 - Eyes5 (art)
 - Jessica Allison (art)
-- M. Thomas Harding (art)
+- Rebecca Harding (art)
 - Paige Turner (art)
 - Richard Gung (art)
 - Hanni Brosh (art)
@@ -590,7 +590,7 @@ Contributors:
 - Brett Muller (art)
 - Eyes5 (art)
 - Jessica Allison (art)
-- M. Thomas Harding (art)
+- Rebecca Harding (art)
 - Paige Turner (art)
 - Richard Gung (art)
 - Hanni Brosh (art)
@@ -610,7 +610,7 @@ Contributors:
 - Brett Muller (art)
 - Eyes5 (art)
 - Lexxy (art)
-- M. Thomas Harding (art)
+- Rebecca Harding (art)
 - Nic Carey (art)
 - Richard Gung (art)
 - Hanni Brosh (art)
@@ -645,7 +645,7 @@ URLs:
 Contributors:
 - Eyes5 (art)
 - Lexxy (art)
-- M. Thomas Harding (art)
+- Rebecca Harding (art)
 - Nic Carey (art)
 - Richard Gung (art)
 - Hanni Brosh (art)
@@ -688,7 +688,7 @@ Contributors:
 - Eyes5 (art)
 - Jessica Allison (art)
 - Lexxy (art)
-- M. Thomas Harding (art)
+- Rebecca Harding (art)
 - Paige Turner (art)
 - Richard Gung (art)
 - Hanni Brosh (art)
@@ -711,7 +711,7 @@ Contributors:
 - Eyes5 (art)
 - Jessica Allison (art)
 - Lexxy (art)
-- M. Thomas Harding (art)
+- Rebecca Harding (art)
 - Paige Turner (art)
 - Richard Gung (art)
 - Hanni Brosh (art)
@@ -752,7 +752,7 @@ URLs:
 Contributors:
 - Eyes5 (art)
 - Lexxy (art)
-- M. Thomas Harding (art)
+- Rebecca Harding (art)
 - Paige Turner (art)
 - Hanni Brosh (art)
 - Lauren Ross (art)
@@ -800,7 +800,7 @@ URLs:
 Contributors:
 - clorinspats (art)
 - Eyes5 (art)
-- M. Thomas Harding (art)
+- Rebecca Harding (art)
 - myluckyseven (art)
 - Nic Carey (art)
 - Paige Turner (art)
@@ -848,7 +848,7 @@ Contributors:
 - Lazylaz (art)
 - Leppu (art)
 - Lexxy (art)
-- M. Thomas Harding (art)
+- Rebecca Harding (art)
 - myluckyseven (art)
 - Nic Carey (art)
 - Paige Turner (art)
diff --git a/static-pages.txt b/static-pages.txt
index a1b4cb0..d10311e 100644
--- a/static-pages.txt
+++ b/static-pages.txt
@@ -114,7 +114,7 @@ Content:
     - fixed [[track:white-host-green-room]] referencing [[track:the-king-in-red]] instead of [[track:the-king-in-red-beta]] (thanks, Cello!)
     - fixed [[Toby Fox Has Written Hundreds of Unique Original Songs]] referencing [[track:ruins]] (by Erik Scheele) instead of [[track:ruins-undertale]] (by Toby Fox)
     - fixed a number of syntax errors in data files, thanks to improved parsing and data review by Gio (thank you!):
-        - fixed transcribed artist commentary not showing up for [[track:frogsong]]
+        - fixed transcribed artist commentary not showing up for [[track:frogsong]] and [[track:schrodingers-harbinger]]
         - fixed YouTube and tumblr links not showing up for artist [[artist:first-turn-fold]]
         - fixed tumblr link not showing up for artist [[artist:thiefofstars]]
     - fixed [[La Espero]] not being listed in reference list for [[Malblanka Rozo Verda Stelo]] (thanks, Sgeo!)
@@ -124,6 +124,7 @@ Content:
     - replaced dead Youtube link to [[track:corridors-of-time]] and removed dead Youtube link from [[track:planetarium]] (thanks, Sgeo!)
     - directory changed for some [[album:jailbreak-vol-1]] content
     - art tags for [[album:strife]] and [[album:act-7]]'s covers
+    - fixed art tags for [[track:skaian-happy-flight]] and [[track:respit]] (thanks, Celeste!)
     - added art tags for some Hiveswap characters (unused except for [[tag:jude]])
 
     <h2 id="1-sep-2021"><a href="#1-sep-2021">[[date:1 September 2021]]</a></h2>