Merge branch 'jebb/rebase' into koba

(This commit includes VARIOUS VERY MINOR FIXES additionally!)

1 files changed, 26 insertions, 91 deletions

diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index 8f64e98..aa43175 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -944,6 +944,22 @@ Commentary: |-
 ---
 Section: Other fanmusic
 ---
+Track: Ascend (Famitracker 8-Bit Cover)
+Artists:
+- cookiefonster
+Duration: '6:10'
+URLs:
+- https://youtu.be/A8gyA2tcdHo
+Referenced Tracks:
+- Ascend
+Commentary: |-
+    <i>cookiefonster:</i>
+    An 8-bit cover of the song titled Ascend from the new music album, Homestuck Volume 10. As far as I'm aware I'm the first person on YouTube to post an 8-bit cover of a song from Volume 10 so that's a pretty cool acomplishment.
+
+    Edit: And now I'm the first to 8-bit cover the ending credits song in Homestuck. How cool is that???
+
+    Original song by [[artist:tensei|Tensei]]. He has heard this cover.
+---
 Track: Calming Quartz (Beta)
 Artists:
 - PoisonedElite
@@ -1131,14 +1147,6 @@ URLs:
 - https://redditstuckmusic.bandcamp.com/track/gnade
 - https://www.youtube.com/watch?v=TAbeJMimk90
 ---
-Track: Eclipse
-Directory: eclipse-svert
-Artists:
-- Gryotharian
-Duration: '3:07'
-URLs:
-- https://svertofficialsoundtrack.bandcamp.com/track/eclipse
----
 Track: Eridan's United States of Wwhatevver
 Artists:
 - Octopimp
@@ -1284,80 +1292,6 @@ URLs:
 Referenced Tracks:
 - Skies of Skaia
 ---
-Track: I Am An Island
-Artists:
-- PhemieC
-Duration: '4:49'
-URLs:
-- https://phemiec.bandcamp.com/track/i-am-an-island
-- https://www.youtube.com/watch?v=LGZnTC9kTLw
-Lyrics: |-
-    I am an island, no man is an island but me
-    I reach out my leaves, and skillfully touch them to sea
-    I ship out a boat made of hope on the waves and watch as it slips below
-    I am an island, a island that nobody knows
-    (...I am an island, I am an island, I am an island)
-
-    I am an island, no man is an island but I'm not a man
-    (I am an island, I am an island, I am an island, I am an island)
-    I was raised by an ocean of creatures and brands
-    (I am an island, I am an island, I am an island, I am an island)
-    I give what I can of, the fruits and flowers that bloom on my skin
-    (I am an island, I am an island, I am an island, I am an island)
-    But when loneliness knocks, she lets herself in
-    (I am an island, I am an island, I am an island)
-
-    Islands don't sink, the water just rises around us
-    Just think, someone out there is watching the stars
-    But they're not the same as ours, some say they're already dead
-    And the light's only on in your head
-
-    I am an island, no man is an island but me
-    (I am an island, I am an island, I am an island, I am an island)
-    I warm all my sands by the pyre of my family tree
-    (I am an island, I am an island, I am an island, I am an island)
-    I took to the tundra, I climb every mountain and fight every monster I can
-    (I am an island, I am an island, I am an island, I am an island, I am an island)
-    To run from that long burning fire, my friend
-    (I am an island, I am an island, I am an island, I am an island)
-
-    I am an island, no man is an island but I'm not a man
-    (I am an island, I am an island, I am an island, I am an island, I am an island)
-    And messages in bottles feel like battering rams
-    (I am an island, I am an island, I am an island, I am an island)
-    In my head I'm a beacon (In my head I'm a beacon), a pinprick of potential birthed out of nothing but blue
-    (I am an island, I am an island, I am an island, I am an island, I am an island)
-    And the light that I signal, it's shining for you
-    (I am an island, I am an island, oh, oh, oh)
-
-    Islands of love, we just want somebody to touch us
-    Just 'cause we are distant doesn't mean we are lost
-    We are where we are, and whenever a visitor docks
-    And is stranded, it means we are not
-
-    You and I have something in common, I will try to share my island (You and I are islands)
-    You and I are sinking in tandem, miles apart in every direction (You and I are islands)
-    You and I are treading this current, both of us are doomed for certain (You and I are islands)
-    You and I are our own now, maybe we'll wash up on solid ground (You and I are islands)
-    You and I are islands
-    You and I are islands
-    You and I are islands
-    You and I are islands
-
-    Islands of fate, lately I feel the tides shifting
-    They're bringing us closer together to stay
-    The waters are rippling, a new world is taking it's shape
-    And tonight, our Pangaea awaits
----
-Track: It Looks Back
-Artists:
-- Scorpyus
-Duration: '4:57'
-URLs:
-- https://svertofficialsoundtrack.bandcamp.com/track/it-looks-back
-Referenced Tracks:
-- Revnan's Theme
----
 Track: Karkalicious
 Artists:
 - Superspecks!
@@ -1611,15 +1545,6 @@ Sampled Tracks:
 URLs:
 - https://soundcloud.com/omega_morris/penumbra-phantasm
 ---
-Track: Revnan's Theme
-Artists:
-- Gryotharian
-Duration: '2:26'
-URLs:
-- https://svertofficialsoundtrack.bandcamp.com/track/revnans-theme
-Referenced Tracks:
-- Your Fear Is On My Mind (Instrumental)
----
 Track: Shimmerserene
 Artists:
 - Monckat
@@ -2496,3 +2421,13 @@ URLs:
 Commentary: |-
     <i>WarxTron:</i>
     And so finally, Ophiuchus is finished. I've been working on it since march, and now this 28 minute long prog rock homestuck epic is done. I had a lot of fun writing all this parts, although it's been quite hard sometimes. You can expect more prog rock songs like these in the future. Thank you all for listening.
+---
+Section: Other audio-based fanworks
+---
+Track: Andrew Hussie Interviews Himself
+Artists:
+- Andrew Hussie
+- vizmedia
+Duration: '2:19'
+URLs:
+- https://youtu.be/U9diFXyyjqI