Merge remote-tracking branch 'niklink/preview' into preview

13 files changed, 159 insertions, 38 deletions

diff --git a/album/cool-and-new-volume-2.yaml b/album/cool-and-new-volume-2.yaml
index 112ddcf..5fc4f89 100644
--- a/album/cool-and-new-volume-2.yaml
+++ b/album/cool-and-new-volume-2.yaml
@@ -29,7 +29,7 @@ Commentary: |-
     i'ts album fro cool and new web comic................................................agian!?!
     its the 2th one
 
-    <i>Cryptanark:</i>
+    <i>Discfortune:</i>
     sometimes you need to sacrifice meme numbers for bigger and better things
 
     <i>Aris Martinian:</i>
@@ -47,7 +47,7 @@ Commentary: |-
     <i>Ngame:</i>
     (<a href="https://www.youtube.com/watch?v=4GyZeqU-eu0">Community listening stream w/ chat</a>)
 
-    <i>Cryptanark:</i>
+    <i>Discfortune:</i>
     who am i kidding meme numbers are great
 ---
 Track: Autonomonasty Senserational Meridisick Repose
@@ -117,7 +117,7 @@ Referenced Tracks:
 ---
 Track: Tick
 Artists:
-- Cryptanark
+- Discfortune
 Cover Artists:
 - Bambosh
 Duration: '01:00'
@@ -130,7 +130,7 @@ Art Tags:
 - Sweet Bro
 - Swet Bro
 Commentary: |-
-    <i>Cryptanark:</i>
+    <i>Discfortune:</i>
     ([[track:tock]])
 ---
 Track: Tycoonlight Sonata
@@ -417,9 +417,9 @@ Commentary: |-
 ---
 Track: good remix of a homestuck song
 Artists:
-- Cryptanark
+- Discfortune
 Cover Artists:
-- Cryptanark
+- Discfortune
 Cover Art File Extension: jpg
 Duration: '00:02'
 URLs:
@@ -434,7 +434,7 @@ Sampled Tracks:
 ---
 Track: Picture This
 Artists:
-- Cryptanark
+- Discfortune
 Cover Artists:
 - Cloudaria
 Duration: '00:05'
@@ -444,7 +444,7 @@ URLs:
 Lyrics: |-
     (Capital T capital B lowercase p lowercase r capital F capital U lowercase m.)
 Commentary: |-
-    <i>Cryptanark:</i>
+    <i>Discfortune:</i>
     (<i>I followed the imgur link from the song "Picture this" on the CANWC volume 2 album, and got this</i>)
     <img src="media/misc/TBprFUm.png" width="400" height="230">
 ---
@@ -744,7 +744,7 @@ Lyrics: |-
 ---
 Track: Lord Spanish
 Artists:
-- Cryptanark
+- Discfortune
 Cover Artists:
 - yazshu
 Cover Art File Extension: jpg
@@ -1178,7 +1178,7 @@ Referenced Tracks:
 ---
 Track: interducing..... her royal high ness,, jaed hardly
 Artists:
-- Cryptanark
+- Discfortune
 Contributors:
 - Minish (kazoo)
 Cover Artists:
@@ -1207,7 +1207,7 @@ Contributors:
 - Interrobang (percussion)
 - Cerulean (synthpad)
 - Putnam (guitar)
-- Cryptanark (trumpet)
+- Discfortune (trumpet)
 Cover Artists:
 - Cloudaria
 Cover Art File Extension: jpg
@@ -1254,7 +1254,7 @@ Contributors:
 - flamingfusion (vocals)
 - Ngame (vocals)
 - Interrobang (vocals)
-- Cryptanark (vocals)
+- Discfortune (vocals)
 - Cecily Renns (vocals)
 - Bin (vocals)
 - Makin (vocals)
diff --git a/album/cool-and-new-volume-ii.yaml b/album/cool-and-new-volume-ii.yaml
index c6d5ba8..b15cfc3 100644
--- a/album/cool-and-new-volume-ii.yaml
+++ b/album/cool-and-new-volume-ii.yaml
@@ -10,7 +10,7 @@ Cover Artists:
 - Bambosh (Gametez)
 - artist:kobacat (Jaed)
 - BitesizeBird (Equihorse)
-- Cryptanark (Germysprite)
+- Discfortune (Germysprite)
 - Cloudaria (Dabe)
 - miraculousAvantgarde (Jhon)
 - Noisemaker (Femorafreack)
@@ -210,7 +210,7 @@ Referenced Tracks:
 ---
 Track: Tock
 Artists:
-- Cryptanark
+- Discfortune
 Cover Artists:
 - Bambosh
 Duration: '01:00'
@@ -221,7 +221,7 @@ Art Tags:
 - Rose
 - Rose's mom
 Commentary: |-
-    <i>Cryptanark:</i>
+    <i>Discfortune:</i>
     ([[track:tick]])
 ---
 Track: Beatdown XD LOL!!!
@@ -498,7 +498,7 @@ Lyrics: |-
 ---
 Track: Vagabone
 Artists:
-- Cryptanark
+- Discfortune
 Cover Artists:
 - yazshu
 Duration: '02:04'
@@ -746,7 +746,7 @@ Referenced Tracks:
 Track: Conflict?
 Directory: conflict-question-mark
 Artists:
-- Cryptanark
+- Discfortune
 Cover Artists:
 - yazshu
 Cover Art File Extension: jpg
@@ -764,9 +764,9 @@ Referenced Tracks:
 ---
 Track: 25x SHOWDOWN COMBO (Memeless)
 Artists:
-- Cryptanark
+- Discfortune
 Cover Artists:
-- Cryptanark    
+- Discfortune    
 Cover Art File Extension: jpg
 Duration: '04:13'
 URLs:
diff --git a/album/cool-and-new-volume-v.yaml b/album/cool-and-new-volume-v.yaml
index 1270e7f..f64dd91 100644
--- a/album/cool-and-new-volume-v.yaml
+++ b/album/cool-and-new-volume-v.yaml
@@ -1510,7 +1510,7 @@ Commentary: |-
 ---
 Track: i need an abumbalnce!!.mp3
 Artists:
-- Cryptanark
+- Discfortune
 Cover Artists:
 - bobthetacocat
 Duration: '02:16'
@@ -1534,7 +1534,7 @@ Sampled Tracks:
 Lyrics: |-
     (Oh my God, I hate Garageband so much.) (i came as fast as i could)
 Commentary: |-
-    <i>Cryptanark:</i>
+    <i>Discfortune:</i>
     I've been meaning to get at something deeper with my music. After much deliberation, I decided to funnel all of my efforts into i need an ambulance!!.mp3 in order to express a statement that I think resonates with all of us—Mortality. I think it's important to recognize that our time here on Earth is very limited and that it can be ripped from us in an instant. As you can see from the eight measure of the song, which clearly references René Magritte's "The Human Condition", I've chosen to greatly emphasize the notion of joy as well. Another thing to keep in mind is the odor of the piece: An earthy aroma paired with a metallic ring. This is very much intentional, as it links the two themes I have mentioned in a sort of harmonic matrimony rarely seen in daily life.
 
     Let's discuss the process of creating this work. Crucial to the progression of the song was deciding how to link the sections before and after the bridge portion (which served as a cheeky allusion to the 50 Shades series). I had tried out several options including a reverse phonograph output drive and a theremin turned upside-down before settling on a much more humble choice. You can hear the results for yourself. However, perhaps the greatest hurdle to overcome was deciding on what colors to use for the instrument tracks. To this day I am uncertain if I have chosen correctly.
diff --git a/album/cool-and-new-voulem1.yaml b/album/cool-and-new-voulem1.yaml
index 1f9633f..78c68df 100644
--- a/album/cool-and-new-voulem1.yaml
+++ b/album/cool-and-new-voulem1.yaml
@@ -566,7 +566,7 @@ Duration: '1:44'
 Artists:
 - flagellumVagueness
 Cover Artists:
-- Cryptanark
+- Discfortune
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/usurp
 - https://www.youtube.com/watch?v=0koQxAoc2Ik
@@ -1380,11 +1380,11 @@ Lyrics: |-
 Track: 25x SHOWDOWN COMBO
 Duration: '4:13'
 Artists:
-- Cryptanark
+- Discfortune
 Contributors:
 - Aris Martinian (Synth)
 Cover Artists:
-- Cryptanark
+- Discfortune
 Cover Art File Extension: jpg
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/25x-showdown-combo
diff --git a/album/homestuck-vol-9.yaml b/album/homestuck-vol-9.yaml
index e71706c..348a2fb 100644
--- a/album/homestuck-vol-9.yaml
+++ b/album/homestuck-vol-9.yaml
@@ -1272,7 +1272,9 @@ Cover Artists:
 - Homestuck
 Referenced Tracks:
 - track:crustacean
+- track:hardlyquin
 Sampled Tracks:
+- track:hardlyquin
 - Snake Eyes
 - Leaving Las Vegas
 Lyrics: |-
diff --git a/album/lofam4.yaml b/album/lofam4.yaml
index b010f03..3667475 100644
--- a/album/lofam4.yaml
+++ b/album/lofam4.yaml
@@ -1337,7 +1337,7 @@ Commentary: |-
 ---
 Track: Ringleader
 Artists:
-- Cryptanark
+- Discfortune
 Contributors:
 - TirantBacon (mastering)
 Duration: '3:07'
@@ -1354,7 +1354,7 @@ Referenced Tracks:
 - Liquid Negrocity
 - Let's All Rock the Heist
 Commentary: |-
-    <i>Cryptanark:</i>
+    <i>Discfortune:</i>
     AKA The One Time I Sold Out to LOFAM, Ringleader is a Crowbar song I had a lot of fun throwing together. I tried incorporating aspects of jazz and rock solbos, in addition to experimenting with a 7/8 time signature. I'm pleasantly surprised at how it turned out, considering how obtuse the concept felt to me when I was first planning out the track. Blah blah blah check out [[group:canmt|cool and new webcomic]] please
     <i>nights:</i>
     Crypt's songs are always a delight to listen to, I'm so happy I got the chance to do art for one of them. (Plus it's a Crowbar track! Objectively the best Felt member. This is fact not opinion.)
diff --git a/album/lofam5.yaml b/album/lofam5.yaml
index f4a5ad3..f7424e0 100644
--- a/album/lofam5.yaml
+++ b/album/lofam5.yaml
@@ -69,7 +69,7 @@ Commentary: |-
 ---
 Track: Spacetime Starstriker
 Artists:
-- Cryptanark
+- Discfortune
 Duration: '2:19'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/spacetime-starstriker
@@ -103,7 +103,7 @@ Lyrics: |-
 
     D-D-D-D-DO IT!
 Commentary: |-
-    <i>Cryptanark:</i>
+    <i>Discfortune:</i>
     I made this track in 2017, during high school. Now I’m about to graduate from college. Isn’t that surprising? Time flies.
     Spacetime Starstriker was also the second track of its original release platform. It was first published through a different music team (am I allowed to name CANMT here?). At the time, I think I was mainly excited about the track’s aggressive time signature changes.
     Over the years, I’ve assembled a laundry list of things I’d change in the piece if I were to start again from scratch. But I’m still proud of the original product, and grateful for the reception thus far. I feel content with this being my last major contribution to the HS fanmusic space. For the time being.
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index 06074a9..2e9177f 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -1677,7 +1677,7 @@ Lyrics: |-
 ---
 Track: Moshi Moshi?
 Artists:
-- Cryptanark
+- Discfortune
 Duration: '2:21'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/moshi-moshi
@@ -1806,7 +1806,7 @@ Referenced Tracks:
 ---
 Track: Unintentional Touhou
 Artists:
-- Cryptanark
+- Discfortune
 Duration: '3:04'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/unintentional-touhou
diff --git a/album/paths.yaml b/album/paths.yaml
index f910a7f..eaccb31 100644
--- a/album/paths.yaml
+++ b/album/paths.yaml
@@ -112,12 +112,12 @@ URLs:
 ---
 Track: Bane
 Directory: bane-paths
-Originally Released As: track:bane-old
+Originally Released As: track:bane
 Duration: '6:05'
-Referenced Tracks:
-- track:bane-old
 URLs:
 - https://parsecproductions.bandcamp.com/track/bane
+Referenced Tracks:
+- track:bane-old
 ---
 Track: Final Stand
 Directory: final-stand-paths
diff --git a/album/retcon-2018.yaml b/album/retcon-2018.yaml
new file mode 100644
index 0000000..f45cba3
--- /dev/null
+++ b/album/retcon-2018.yaml
@@ -0,0 +1,94 @@
+Album: Retcon (2018)
+Artists:
+- The Cat Herd
+Date: April 13, 2018
+Date Added: March 1, 2023
+URLs:
+- https://8-bitshit.bandcamp.com/album/retcon-2018
+- https://www.youtube.com/watch?v=vpqow2yIfqM
+Color: '#2ab24b'
+Cover Artists:
+- The Cat Herd
+Banner Artists:
+- The Cat Herd
+Banner Dimensions: 1100x203
+Cover Art File Extension: png
+Banner File Extension: png
+Groups:
+- Fandom
+Commentary:
+    <i>The Cat Herd:</i>
+
+    413 is here, folks and fellows! And with it, Retcon (2018)!
+
+    A few years ago, <a href="https://www.youtube.com/watch?v=EQ-rusvmsEs">I arranged these tracks</a> much like I have today. I expected to be leaving the Homestuck community when the comic ended, yet I'm still here. I'm still here because the tight-knit fandom keeps creating new and wonderful content that keeps me coming back for more.
+
+    So, I took this remnant from my past and gave it life again. I hope you enjoy this album as much as I enjoyed making it. :)
+Additional Files:
+- Title: Bandcamp Banner
+  Files:
+  - banner.png
+---
+Track: Time
+Duration: '03:38'
+URLs:
+- https://8-bitshit.bandcamp.com/track/time
+Referenced Tracks:
+- track:sburban-jungle
+---
+Track: '-'
+Directory: descend-retcon
+Duration: '00:19'
+URLs:
+- https://8-bitshit.bandcamp.com/track/-
+Referenced Tracks:
+- track:descend
+---
+Track: Space
+Duration: '03:37'
+URLs:
+- https://8-bitshit.bandcamp.com/track/space
+Referenced Tracks:
+- Umbral Ultimatum
+---
+Track: Interlude I
+Duration: '01:12'
+URLs:
+- https://8-bitshit.bandcamp.com/track/interlude-i
+Referenced Tracks:
+- track:explore
+---
+Track: Regicide
+Duration: '06:45'
+URLs:
+- https://8-bitshit.bandcamp.com/track/regicide
+Referenced Tracks:
+- Rex Duodecim Angelus
+---
+Track: Fight and Flight
+Duration: '12:59'
+URLs:
+- https://8-bitshit.bandcamp.com/track/fight-and-flight
+Referenced Tracks:
+- Cascade
+---
+Track: Interlude II
+Duration: '01:13'
+URLs:
+- https://8-bitshit.bandcamp.com/track/interlude-ii
+Referenced Tracks:
+- Another Jungle
+---
+Track: Ophiuchus' Auto-Cannibalistic Conflict
+Duration: '08:24'
+URLs:
+- https://8-bitshit.bandcamp.com/track/ophiuchus-auto-cannibalistic-conflict
+Referenced Tracks:
+- Eternity Served Cold
+---
+Track: Closure...?
+Duration: '03:42'
+URLs:
+- https://8-bitshit.bandcamp.com/track/closure
+Referenced Tracks:
+- English
\ No newline at end of file
diff --git a/artists.yaml b/artists.yaml
index 96c6532..1703fb8 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -1006,11 +1006,6 @@ URLs:
 ---
 Artist: Cryoshell
 ---
-Artist: Cryptanark
-URLs:
-- https://cryptanark.bandcamp.com/
-- https://twitter.com/cryptanark
----
 Artist: Crystalrina
 URLs:
 - https://crystalrina.tumblr.com/
@@ -1259,6 +1254,17 @@ Artist: Dinosaur Adventure
 ---
 Artist: Dirtyphonics
 ---
+Artist: Discfortune
+Aliases:
+- Cryptanark
+URLs:
+- https://discfortune.bandcamp.com/
+- https://soundcloud.com/discfortune
+- https://twitter.com/Discfortune
+Dead URLs:
+- https://cryptanark.bandcamp.com/
+- https://twitter.com/cryptanark
+---
 Artist: Dizzims
 Aliases:
 - Dizzy
@@ -4708,6 +4714,21 @@ Context Notes: |-
 ---
 Artist: Tha Trademarc
 ---
+Artist: The Cat Herd
+Aliases:
+- 8-Bit Shit
+- Sven Bucholtz
+- dragongendered
+- The Cat Herd &
+- thecatherd
+URLs:
+- https://8-bitshit.bandcamp.com/
+- https://twitter.com/TheCatHerd/
+- https://dragongendered.tumblr.com/
+- https://thecatherd.carrd.co/
+Dead URLs:
+- https://8-bitshit.tumblr.com/
+---
 Artist: The D
 ---
 Artist: The D.O.C.
diff --git a/homepage.yaml b/homepage.yaml
index 2b065d3..b942da7 100644
--- a/homepage.yaml
+++ b/homepage.yaml
@@ -51,3 +51,4 @@ Albums:
 - album:the-raddest
 
 - album:dialed-to-11
+- album:retcon-2018
\ No newline at end of file
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index b1d8fba..75b71e1 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -46,6 +46,7 @@ Content: |-
         - added [[album:cool-and-new-volume-v]]!
         - added [[album:a-shade-of-blue]] by [[artist:cerulean]]!
     - added [[album:dialed-to-11]] by [[artist:ludicrousfalcon]]!
+    - added [[album:retcon-2018]] by [[artist:the-cat-herd]]!
     <h3>other additions</h3>
     - added additional files to [[album:lofam]], [[album:lofam2]], [[album:lofam3]], [[album:lofam4]], [[album:lofam5]], [[album:jailbreak-vol-1]], [[album:sburb-ost]], [[album:beforus]], [[album:bee-forus-seatbelt-safebee]], [[album:weird-puzzle-tunes]], [[album:ancestral]], [[album:xenoplanetarium]], [[album:gristmas-carols]], [[album:cosmic-caretakers]], [[album:moons-of-theseus]], [[album:friendsymphony]], [[album:the-baby-is-you]], [[album:cool-and-new-volume-2]], [[album:cool-and-new-volume-ii]], and [[album:team-paradox]]
     - added backgrounds to [[album:homestuck-vol-1]], [[album:homestuck-vol-2]], [[album:homestuck-vol-3]], [[album:homestuck-vol-4]], and [[album:homestuck-vol-1-4]]
@@ -53,7 +54,9 @@ Content: |-
     - added commentary to the [[album:friendsymphony]] album page
     <h3>data changes</h3>
     - [[track:outrun]] moved out of [[album:more-homestuck-fandom]] (now in [[album:a-shade-of-blue]])
+    <h3>data fixes</h3>
     - fixed typos in commentary citation for [[track:pumpkin-tide-tvs-i-can-barely-sleep-i-have-to-quickly-finish-this-rock-cover]] and [[track:lapis-lazuli-extended]], making these listed properly on their artists' wiki pages
+    - fixed [[track:frustracean]] not referencing [[track:hardlyquin]] (thanks, OneOfTheChips!)
 
     <h2 id="04-feb-2023"><a href="#04-feb-2023">[[date:04 February 2023]] - Feferi's Theme</a></h2>
     <h3>site changes</h3>