squash all rebase/jebb changelog changes so far into one

1 files changed, 22 insertions, 4 deletions

diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index abe9c0bb..2a94b88e 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -89,7 +89,7 @@ Content: |-
     - added [[album:tale-of-arpege-clavier-chapter-1-of-92000000]] by [[artist:decon-theed]] and [[artist:repeatedscales]] (thanks, Lilith, Lan!)
     - added [[album:the-heist]] and [[album:thanks-for-listening]] by [[artist:serialsymphony]]! (thanks, Lilith, Lan!)
     - added [[album:adminstuck-volume-1]] and [[album:adminstuck-volume-2]]! (thanks, Lilith, Jackie!)
-    - added [[album:the-mayview-mixtape]] (thanks, Lilith, Lan!)
+    - added [[album:jaderoute]] and [[album:battle-of-the-bottoms-ost]] by [[artist:nyquillionaire]]! (thanks, Jebb, Lan!)
     - added [[album:polymonstrology-act-1-ost]] by [[artist:gomaliel]]! (thanks, Jebb!)
     - added [[album:cognitive-coalescence]] by [[artist:witchs-cadence]]! (thanks, Lilith, Lan!)
     - added [[album:the-homestuck-music-experience]] by [[group:funk-mclovin]]! (thanks, <<Lilith:album data, presentation, research>>, <<Lan:data review, lyrics help, additional research>>!)
@@ -102,6 +102,7 @@ Content: |-
     - added [[album:will-remix-for-food-remixes-vol-i]] by [[artist:riki-tsuji]]! (thanks, <<Lilith:album data, presentation, research>>, <<Lan:data review, additional research>>!)
     - added [[album:feelings-jam]] by [[artist:catboss]]! (thanks, Lilith!)
     - added [[album:make-music-throw-music]]! (thanks, Lilith!)
+    - added [[album:the-mayview-mixtape]] (thanks, Lilith, Lan!)
     - added [[album:those-without-shadows-original-score]] by [[group:clark-powell]]! (thanks, Jebb!)
     - added [[album:solitary-confinement-in-nothing]] by [[artist:jmaa]]! (thanks, Jebb!)
     - added latest release from [[group:unofficial-mspa-fans]]! (thanks, <<ruby:album data, presentation, research>>, plus <<Jebb:album presentation help>>, <<Lilith:URL fix, bonus track artwork data>>, <<Cello:bonus track artwork help>>, <<Makin:URLs & bonus track artwork crediting help>>, <<Monckat:track duration fix>>, <<vriska:lyric fixes>>!)
@@ -126,10 +127,25 @@ Content: |-
     - added releases by [[group:autumnal-equinox]]! (thanks, Lilith, Lan, Tangle!)
         - added [[album:terezi-still-owns]].  [[album:wind-and-shade]], and [[album:beta]]!
         - added [[album:4-pass-olds]], [[album:vigor-and-tundra]], [[album:phantasmal]], [[album:just-leave]], [[album:1-in-322103112018-incognizable]], [[album:stop-smoking-we-care-about-you]], [[album:tangential-acid]], [[album:where-dreams-go-to-die]], and [[album:in-medias-res-autumn-cut]]!
+    - added releases by [[group:dbnet18]]! (thanks, Jebb!)
+        - added [[album:knife-to-meet-you]]!
+        - added [[album:background-noise]]!
+    - added releases by [[group:pascal-van-den-bos]]! (thanks, <<Jebb:album data, presentation, research>>, <<Lan:data review>>!)
+        - added [[album:saturn-mission-to-saturn-single]]!
+        - added [[album:deltarune-remixes-pascal]]!
+        - added [[album:the-divide]]!
+        - added [[album:shes-a-witch-astrid-battle-theme]]!
+        - added [[album:blue-room]]!
+        - added [[album:fallen-down-short-and-sweet-mix]]!
+        - added [[album:battle-rival-hugh-remix-pokemon-bw2]]!
+    - added releases by [[group:rj-lake]]! (thanks, <<Jebb:album data, presentation, research>>, <<Lan:data review, additional data>>, <<Lilith:additional data>>!)
+        - added [[album:omegalodon]]!
+        - added [[album:songs-for-rune]]!
+        - added [[album:muddledash]]!
     - added releases by [[group:svix]]! (thanks, Lilith, Lan!)
         - added [[album:cyberdemon]]!
         - added [[album:fire-forget]], [[album:im-here-for-the-future]], [[album:audacity]], [[album:coastline-in-december]], [[album:the-only-other-thing]], [[album:sun-in-sedona]], and [[album:waiting-for-the-night-svix-mix]]!
-    - added releases by [[group:thomas-ferkol]]! (thanks, Jebb!)
+    - added releases by [[group:thomas-ferkol]]! (thanks, Jebb, Lan!)
         - added [[album:dance-of-dregs]], [[album:felsite]], and [[album:the-descent-of-stone]]!
         - added [[album:the-earthen-scar]], [[album:the-liminal-descent]], [[album:the-divine-deception]], and [[album:the-earthen-scar-revisited]]!
         - added [[album:vespers]] and [[album:grigori]]!
@@ -307,9 +323,10 @@ Content: |-
         - moved [[track:mad-mew-mew]] to single release
     - moved [[track:bad-apple-lovelight]] (feat. [[artist:nomico]]) from "Music from video games" to "Other music originating outside Homestuck" (thanks, Lan, bit!)
     <!-- track section/placement changes (not fixes) -->
-    - moved [[track:lets-read-a-webcomic]] from [[album:references-beyond-homestuck]] to [[album:more-homestuck-fandom]] (thanks, Lan!)
     - moved [[track:the-respect-you-rightfully-deserve-single]] from [[album:more-homestuck-fandom]] to [[album:the-respect-you-rightfully-deserve|single release]] (thanks, Lilith!)
+    - moved [[track:scientific-method]] from [[album:references-beyond-homestuck]] to [[album:omegalodon]] (thanks, Jebb, Lan!)
     - moved [[track:noun-astro-kids-pronoun-remix]] from [[album:references-beyond-homestuck]] to [[album:will-remix-for-food-remixes-vol-i]] (thanks, Lilith!)
+    - moved [[track:lets-read-a-webcomic]] from [[album:references-beyond-homestuck]] to [[album:more-homestuck-fandom]] (thanks, Lan!)
     <!-- general removals -->
     - removed [[album:references-beyond-homestuck]] track "Settings (Wii Fit)" since it's part of [[track:main-menu-wii-fit]] (thanks, ruby!)
     - removed "(…) - Single" additional names automatically enforced on Apple Music and iTunes platforms, affecting [[track:black-richaadeb]], [[track:heir-of-grief-richaadeb]], [[track:dance-of-thorns-richaadeb]], [[track:oppa-toby-style]] (all [[artist:richaadeb]]), and [[album:dreamers-diarchy]] (thanks, Whisper, ruby!)
@@ -589,6 +606,7 @@ Content: |-
     - changed directory of [[track:frost-and-frogs-lofam5a2]] from `frost-and-frogs` to `frost-and-frogs-lofam5a2`
     - changed directory of [[track:fire-forget-induction]] from `fire-forget` to `fire-forget-induction`
     - changed directory of [[track:audacity]] from `audacity-svix` to `audacity`
+    - changed directory of [[track:scientific-method]] from `scientific-method-omegalodon` to `scientific-method`
     - changed directories of all tracks across [[album:deltarune-ch1-ost]] and [[album:deltarune-ch2-ost]] to be suffixed `-ch1` and `-ch2` respectively; previous directories now used across [[album:deltarune-soundtrack]]
     - changed directory of [[track:do-the-homestuck-demo]] from `do-the-homestuck` to `do-the-homestuck-demo`
     - changed directory of [[track:boutique-pokemon-sword-shield]] from `boutique` to `boutique-pokemon-sword-shield`
@@ -2507,7 +2525,7 @@ Content: |-
     - fixed [[track:made-in-heaven-canwave-3]] referencing [[track:the-show-must-go-on-friendsymphony]] ([[album:friendsymphony]]) instead of [[track:the-show-must-go-on-queen]] ([[artist:queen]])
     - fixed [[track:doctoral-replicollision-final-exam]] referencing tracks it only samples (thanks, Rosetta Leijonde!)
     - fixed [[track:miasmatic-chacon]] not sampling [[track:phat1]] (thanks indirectly, Rosetta Leijonde!)
-    - fixed [[track:a-heaven-broad-and-ochre]] not sampling [[track:scientific-method-omegalodon]] (thanks, Lilith!)
+    - fixed [[track:a-heaven-broad-and-ochre]] not sampling [[track:scientific-method]] (thanks, Lilith!)
     - various fixes for [[album:someday]] and [[album:psycholonials]]:
         - fixed [[track:woman-i-never-met]] not referencing [[track:serenade-vol8]]
         - fixed [[track:day-that-never-came]] not referencing [[track:westminster-quarters]]