restore flare (green sun remix)

5 files changed, 35 insertions, 25 deletions

diff --git a/album/9.yaml b/album/9.yaml
index 27a04684..48dfa4a1 100644
--- a/album/9.yaml
+++ b/album/9.yaml
@@ -887,7 +887,7 @@ Referenced Tracks:
 - RollerCoaster Tycoon Theme
 - Battle Theme for the Lost at Heart
 - Good Grievous Bodily Harm
-- 'Flare: Insurrection Remix'
+- Flare (Green Sun Remix)
 - Apexhalation
 - licord nacrasty
 - track:midnight-suffer
diff --git a/album/intermishin.yaml b/album/intermishin.yaml
index 67fcf724..e29512a8 100644
--- a/album/intermishin.yaml
+++ b/album/intermishin.yaml
@@ -492,7 +492,7 @@ Referenced Tracks:
 - Three in the Medley
 - track:flare
 - Flare (Cascade)
-- 'Flare: Insurrection Remix'
+- Flare (Green Sun Remix)
 - Ye Flarey Gentlemen
 - My Grand Dad is the Green Sun
 - Solar Voyage
@@ -521,7 +521,7 @@ Sampled Tracks:
 - Three in the Medley
 - track:flare
 - Flare (Cascade)
-- 'Flare: Insurrection Remix'
+- Flare (Green Sun Remix)
 - Ye Flarey Gentlemen
 - My Grand Dad is the Green Sun
 - Solar Voyage
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index 7d4273ee..54a39916 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -451,6 +451,36 @@ Commentary: |-
 
     Flare was a pretty big hit in its own right, so there's always the pressure coming from the responsibility to handle this properly. I hope you enjoy it!
 ---
+Track: Flare (Green Sun Remix)
+Date First Released: February 18, 2014
+Duration: '4:08'
+Artists:
+- Clark Powell
+Cover Artists:
+- Andarix
+Cover Art File Extension: png
+Art Tags:
+- Green Sun
+- Derse
+URLs:
+- https://soundcloud.com/plazmataz/flare-green-sun-remix
+Commentary: |-
+    <i>Clark Powell:</i> ([Tumblr](https://plazmataz.tumblr.com/post/77117466480/its-been-a-long-time-since-cascade-homestuck), 2/18/2014)
+
+    It's been a long time since [[Cascade]], Homestuck. But now that this is finally finished, it's time to release the new [[Flare]] remix!
+
+    This song has almost every musical element of the original Flare sampled and used in a new way, along with lots of new additions and a gritty EDM style of production. I wrote the original song a long time ago, and since then I've grown dissatisfied with it in some ways. How better to improve on it than with a remix?
+
+    For track art I talked to my girlfriend [[artist:andarix]], who has been doing crest design commission lately. She made one for me featuring the Green Sun and the chain of Derse for me, and I don't think it could have turned out more awesomely!
+
+    I'm afraid you can't buy or download this song yet, but it will definitely be available on the next official Homestuck album release.
+
+    And I want to give a special thanks to my patrons on [Patreon](http://www.patreon.com/plazmataz). Without you guys, I would have never have had the resources to make this remix!
+
+    <i>Quasar Nebula:</i> (wiki editor)
+
+    This track was released about halfway through the period between [[album:homestuck-vol-9]] and [[album:homestuck-vol-10|Vol. 10]] - the 'next official Homestuck album release', which did not include this track. Though, back in 2012, Clark Powell contributed to [[track:solar-voyage]], which did show on Vol. 10 and also arranges Flare.
+---
 Track: Flight of the White Wolf
 Artists:
 - Malcolm Brown
diff --git a/album/psycholonials-ep-8.yaml b/album/psycholonials-ep-8.yaml
index 335b3414..1f3d6316 100644
--- a/album/psycholonials-ep-8.yaml
+++ b/album/psycholonials-ep-8.yaml
@@ -42,32 +42,12 @@ URLs:
 - https://open.spotify.com/track/3ILu9zH2LuB9e3CP6SfxTZ
 ---
 Track: 'Flare: Insurrection Remix'
-Additional Names:
-- Name: >-
-    Flare (Green Sun Remix)
-  Annotation: >-
-    [SoundCloud](https://soundcloud.com/plazmataz/flare-green-sun-remix)
+Originally Released As: track:flare-green-sun-remix
 Duration: '4:08'
 URLs:
 - https://psycholonials.bandcamp.com/track/flare-insurrection-remix-2
 - https://www.youtube.com/watch?v=70Fn7AMT-WY
 - https://open.spotify.com/track/3fPWLONmFI8UBJgZUyqONb
-Commentary: |-
-    <i>Clark Powell:</i> ([Tumblr](https://plazmataz.tumblr.com/post/77117466480/its-been-a-long-time-since-cascade-homestuck), 2/18/2014)
-    
-    It's been a long time since [[Cascade]], Homestuck. But now that this is finally finished, it's time to release the new [[Flare]] remix!
-
-    This song has almost every musical element of the original Flare sampled and used in a new way, along with lots of new additions and a gritty EDM style of production. I wrote the original song a long time ago, and since then I've grown dissatisfied with it in some ways. How better to improve on it than with a remix?
-
-    For track art I talked to my girlfriend [[artist:andarix]], who has been doing crest design commission lately. She made one for me featuring the Green Sun and the chain of Derse for me, and I don't think it could have turned out more awesomely!
-
-    I'm afraid you can't buy or download this song yet, but it will definitely be available on the next official Homestuck album release.
-
-    And I want to give a special thanks to my patrons on [Patreon](http://www.patreon.com/plazmataz). Without you guys, I would have never have had the resources to make this remix!
-
-    <i>Andarix:</i> (track artwork, ([SoundCloud](https://soundcloud.com/plazmataz/flare-green-sun-remix))
-
-    <img src="media/misc/flare-green-sun-remix.png" width="350">
 ---
 Track: 'Summer That Never Was: Firebrand Remix'
 Duration: '3:55'
diff --git a/album/psycholonials.yaml b/album/psycholonials.yaml
index 0265373f..6fe970d1 100644
--- a/album/psycholonials.yaml
+++ b/album/psycholonials.yaml
@@ -294,7 +294,7 @@ URLs:
 - https://music.apple.com/album/in-the-loop/1573061072?i=1573061772
 ---
 Track: 'Flare: Insurrection Remix'
-Originally Released As: track:flare-insurrection-remix
+Originally Released As: track:flare-green-sun-remix
 Duration: '4:08'
 URLs:
 - https://psycholonials.bandcamp.com/track/flare-insurrection-remix-2