From 0b2c3bf9ef20f0cdf7fb62242a4bacb6be864956 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Wed, 11 Oct 2023 15:12:13 -0300 Subject: koba merge fixes --- album/references-beyond-homestuck.yaml | 128 +-------------------------------- artists.yaml | 2 - 2 files changed, 3 insertions(+), 127 deletions(-) diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml index 90dce35..7e8d59e 100644 --- a/album/references-beyond-homestuck.yaml +++ b/album/references-beyond-homestuck.yaml @@ -549,66 +549,6 @@ Lyrics: |- Ha ha ha, ha ha Deep, deep trouble --- -Track: Discordant -Artists: -- Cecily Renns -Duration: '2:24' -URLs: -- https://johnjrenns.bandcamp.com/track/discordant-2 -Lyrics: |- - Jere we go again - Makin' some music and shit - Just open that FL studio - The easiest thing to do, hey - - Yeah thats right - I'll open that SGM - The piano roll will be my domain - What's so fucking hard 'bout that - - But I do have to admit - This life's not that easy as it sounds - Theres just one little problem - Something about my melody - - It's discordant - Why is it so damn hard to find the right harmony - It's so discordant - Listen to it then you'll see - It's so discordant - - Alright then - I think I've figured it out - There's something wrong about the chord progression - I've just gotta fix that then - But it looks - Like the chord is all fine and nice - Then is it the fucking scale that's off - I dont know cause it's too confusing - - Maybe this life isn't for me - Maybe I should give up and quit composing - No no no I can't say that - Even if it's hard it's so fun - - It's discordant - Look at all these people saying my music sucks but - It's really alright and well - This is the life I've chosen - I'll believe in it - - Piano solo - - Wait - There we go, sorry - - It's discordant - Why is it so damn hard to find the right harmony - It's so discordant - Listen to it then youll see - It's so discordant - It's so discordant ---- Track: Dusk for the Age of Miracles Artists: - Clark Powell @@ -4086,71 +4026,6 @@ Duration: '3:01' URLs: - https://www.youtube.com/watch?v=fKex3QoPc8A --- -Track: September -Artists: -- Earth, Wind & Fire -Duration: '3:35' -URLs: -- https://www.youtube.com/watch?v=Gs069dndIYk -Lyrics: |- - Do you remember - The 21st night of September? - Love was changin' the minds of pretenders - While chasin' the clouds away - - Our hearts were ringin' - In the key that our souls were singin' - As we danced in the night, remember - How the stars stole the night away, oh, yeah - - Hey, hey, hey - Ba-dee-ya, say, do you remember? - Ba-dee-ya, dancin' in September - Ba-dee-ya, never was a cloudy day - - Ba-du-da, ba-du-da, ba-du-da, ba-du - Ba-du-da, ba-du, ba-du-da, ba-du - Ba-du-da, ba-du, ba-du-da - - My thoughts are with you - Holdin' hands with your heart to see you - Only blue talk and love, remember - How we knew love was here to stay - - Now December - Found the love that we shared in September - Only blue talk and love, remember - The true love we share today - - Hey, hey, hey - Ba-dee-ya, say, do you remember? - Ba-dee-ya, dancin' in September - Ba-dee-ya, never was a cloudy day - There was a - Ba-dee-ya (dee-ya, dee-ya), say, do you remember? - Ba-dee-ya (dee-ya, dee-ya), dancin' in September - Ba-dee-ya (dee-ya, dee-ya), golden dreams were shiny days - - The bell was ringin', oh, oh - Our souls were singin' - Do you remember never a cloudy day? Yow - - There was a - Ba-dee-ya (dee-ya, dee-ya), say, do you remember? - Ba-dee-ya (dee-ya, dee-ya), dancin' in September - Ba-dee-ya (dee-ya, dee-ya), never was a cloudy day - And we'll say - Ba-dee-ya (dee-ya, dee-ya), say, do you remember? - Ba-dee-ya (dee-ya, dee-ya), dancin' in September - Ba-dee-ya (dee ya, dee-ya), golden dreams were shiny days - - Ba-dee-ya, dee-ya, dee-ya - Ba-dee-ya, dee-ya, dee-ya - Ba-dee-ya, dee-ya, dee-ya, dee-ya! - Ba-dee-ya, dee-ya, dee-ya - Ba-dee-ya, dee-ya, dee-ya - Ba-dee-ya, dee-ya, dee-ya, dee-ya! ---- Track: September Pumpkin # No official release of the in-game track Artists: @@ -19618,6 +19493,7 @@ Lyrics: |- “this s- uh, this discord is wild, wild, [unintelligble]” “it just got a lot hotter in this room” “god, that’s what it’s like working at there, ‘cause i’m like, “hey, what can i get you?” and the person is like, “can i get a fucking uhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh coffee.” it’s like “okay, what kind of coffee?” “uhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh…” and then they order like five different things in a cup and then im there just like-” +--- Track: Like Herod Artists: - Mogwai @@ -24347,6 +24223,7 @@ Artists: Duration: '3:31' URLs: - https://www.youtube.com/watch?v=knb2HMYJbJQ +--- Track: Temporary Secretary Artists: - Paul McCartney @@ -24778,6 +24655,7 @@ Lyrics: |- Ha-ha I guess there's a Slim Shady in all of us Fuck it, let's all stand up +--- Track: The Prophets Song Artists: - Queen diff --git a/artists.yaml b/artists.yaml index f9e3a64..c7f0eee 100644 --- a/artists.yaml +++ b/artists.yaml @@ -2135,8 +2135,6 @@ Artist: Durandana --- Artist: Dzu --- -Artist: Earth, Wind & Fire ---- Artist: E.N. --- Artist: Earth, Wind & Fire -- cgit 1.3.0-6-gf8a5