misc. fixes

19 files changed, 34 insertions, 7 deletions

diff --git a/album/desynced-vol-1.txt b/album/desynced-vol-1.txt
index d5789574..aa758402 100644
--- a/album/desynced-vol-1.txt
+++ b/album/desynced-vol-1.txt
@@ -5,7 +5,7 @@ Date Added: February 12, 2021
 Color: #adadad
 Groups:
 - Desynced
-- Beyond
+- Fandom
 URLs:
 - https://desynced.bandcamp.com/album/desynced-vol-1
 - https://www.youtube.com/playlist?list=PLAP2Y9dl628mn-qwJlhtZw_Q42oxpA18b
diff --git a/album/desynced-vol-2.txt b/album/desynced-vol-2.txt
index 0d659667..79d54dd3 100644
--- a/album/desynced-vol-2.txt
+++ b/album/desynced-vol-2.txt
@@ -5,7 +5,7 @@ Date Added: February 12, 2021
 Color: #667bd8
 Groups:
 - Desynced
-- Beyond
+- Fandom
 URLs:
 - https://desynced.bandcamp.com/album/desynced-vol-2
 - https://www.youtube.com/playlist?list=PLAP2Y9dl628nyJMzP2s-hwYbnpmqTYVpg
diff --git a/album/election-season.txt b/album/election-season.txt
index 1eda5ce2..5f932a94 100644
--- a/album/election-season.txt
+++ b/album/election-season.txt
@@ -5,7 +5,7 @@ Date Added: February 12, 2021
 Color: #d34b11
 Groups:
 - Desynced
-- Beyond
+- Fandom
 URLs:
 - https://desynced.bandcamp.com/album/election-season
 - https://www.youtube.com/playlist?list=PLAP2Y9dl628ntIo7zpcNDAr5R-7q6Z5_H
diff --git a/album/entertaining-sound.txt b/album/entertaining-sound.txt
index bb9a406e..341f5fcf 100644
--- a/album/entertaining-sound.txt
+++ b/album/entertaining-sound.txt
@@ -286,7 +286,9 @@ Commentary:
 -------------------------------------------------------------------------------
 Track: Malblanka Rozo Verda Stelo
 Duration: 0:35
-References: Black Rose / Green Sun
+References:
+- Black Rose / Green Sun
+- La Espero
 URLs:
 - https://conlangcritic.bandcamp.com/track/malblanka-rozo-verda-stelo
 - https://www.youtube.com/watch?v=L98DwKAd3qE
diff --git a/album/lofam5.txt b/album/lofam5.txt
index 73b0bea3..ef4229ee 100644
--- a/album/lofam5.txt
+++ b/album/lofam5.txt
@@ -1478,7 +1478,7 @@ Commentary:
 -------------------------------------------------------------------------------
 Track: Crystallized Flowers DX
 Artist: salex_r3kt
-Track Art: Awkward
+Track Art: Monckat
 Duration: 4:25
 References:
 - Crystalanthemums
diff --git a/album/perfectly-generic-object.txt b/album/perfectly-generic-object.txt
index 6c0fe451..965f9ba9 100644
--- a/album/perfectly-generic-object.txt
+++ b/album/perfectly-generic-object.txt
@@ -7,7 +7,7 @@ Has Track Art: no
 Color: #59f669
 Groups:
 - Cristata
-- Beyond
+- Fandom
 URLs:
 - https://smoothiefruitee.bandcamp.com/track/perfectly-generic-object
 Commentary:
diff --git a/album/psycholonials-ep-1.txt b/album/psycholonials-ep-1.txt
index 77900fa5..361fd6a9 100644
--- a/album/psycholonials-ep-1.txt
+++ b/album/psycholonials-ep-1.txt
@@ -11,6 +11,7 @@ Color: #f51806
 Listed on Homepage: no
 Groups:
 - Psycholonials
+- Beyond
 URLs:
 - https://psycholonials.bandcamp.com/album/psycholonials-ep-1
 -------------------------------------------------------------------------------
diff --git a/album/psycholonials-ep-2.txt b/album/psycholonials-ep-2.txt
index e083bbcf..eb818050 100644
--- a/album/psycholonials-ep-2.txt
+++ b/album/psycholonials-ep-2.txt
@@ -11,6 +11,7 @@ Color: #f51806
 Listed on Homepage: no
 Groups:
 - Psycholonials
+- Beyond
 URLs:
 - https://psycholonials.bandcamp.com/album/psycholonials-ep-2
 -------------------------------------------------------------------------------
diff --git a/album/psycholonials-ep-3.txt b/album/psycholonials-ep-3.txt
index 17c75971..6a94a13a 100644
--- a/album/psycholonials-ep-3.txt
+++ b/album/psycholonials-ep-3.txt
@@ -11,6 +11,7 @@ Color: #f51806
 Listed on Homepage: no
 Groups:
 - Psycholonials
+- Beyond
 URLs:
 - https://psycholonials.bandcamp.com/album/psycholonials-ep-3
 -------------------------------------------------------------------------------
diff --git a/album/psycholonials-ep-4.txt b/album/psycholonials-ep-4.txt
index 2e574906..7e0dba70 100644
--- a/album/psycholonials-ep-4.txt
+++ b/album/psycholonials-ep-4.txt
@@ -11,6 +11,7 @@ Color: #f51806
 Listed on Homepage: no
 Groups:
 - Psycholonials
+- Beyond
 URLs:
 - https://psycholonials.bandcamp.com/album/psycholonials-ep-4
 -------------------------------------------------------------------------------
diff --git a/album/psycholonials-ep-5.txt b/album/psycholonials-ep-5.txt
index c234ae7b..4017dc97 100644
--- a/album/psycholonials-ep-5.txt
+++ b/album/psycholonials-ep-5.txt
@@ -11,6 +11,7 @@ Color: #f51806
 Listed on Homepage: no
 Groups:
 - Psycholonials
+- Beyond
 URLs:
 - https://psycholonials.bandcamp.com/album/psycholonials-ep-5
 -------------------------------------------------------------------------------
diff --git a/album/psycholonials-ep-6.txt b/album/psycholonials-ep-6.txt
index 61ae1103..3d9ba44d 100644
--- a/album/psycholonials-ep-6.txt
+++ b/album/psycholonials-ep-6.txt
@@ -11,6 +11,7 @@ Color: #f51806
 Listed on Homepage: no
 Groups:
 - Psycholonials
+- Beyond
 URLs:
 - https://psycholonials.bandcamp.com/album/psycholonials-ep-6
 -------------------------------------------------------------------------------
diff --git a/album/psycholonials-ep-7.txt b/album/psycholonials-ep-7.txt
index 80aa6c02..206f77a6 100644
--- a/album/psycholonials-ep-7.txt
+++ b/album/psycholonials-ep-7.txt
@@ -11,6 +11,7 @@ Color: #f51806
 Listed on Homepage: no
 Groups:
 - Psycholonials
+- Beyond
 URLs:
 - https://psycholonials.bandcamp.com/album/psycholonials-ep-7
 -------------------------------------------------------------------------------
diff --git a/album/psycholonials-ep-8.txt b/album/psycholonials-ep-8.txt
index 23b1be82..089a8dfa 100644
--- a/album/psycholonials-ep-8.txt
+++ b/album/psycholonials-ep-8.txt
@@ -11,6 +11,7 @@ Color: #f51806
 Listed on Homepage: no
 Groups:
 - Psycholonials
+- Beyond
 URLs:
 - https://psycholonials.bandcamp.com/album/psycholonials-ep-8
 -------------------------------------------------------------------------------
diff --git a/album/psycholonials-ep-9.txt b/album/psycholonials-ep-9.txt
index 4c390301..a448bb4d 100644
--- a/album/psycholonials-ep-9.txt
+++ b/album/psycholonials-ep-9.txt
@@ -11,6 +11,7 @@ Color: #f51806
 Listed on Homepage: no
 Groups:
 - Psycholonials
+- Beyond
 URLs:
 - https://psycholonials.bandcamp.com/album/psycholonials-ep-9
 -------------------------------------------------------------------------------
diff --git a/album/sburb-ost.txt b/album/sburb-ost.txt
index 893435a1..46d2cd71 100644
--- a/album/sburb-ost.txt
+++ b/album/sburb-ost.txt
@@ -1,4 +1,4 @@
-Album: Sburb OST
+Album: SBURB OST
 Directory: sburb-ost
 Cover Art: melodiousDiscord
 Banner Art: melodiousDiscord
diff --git a/album/unreleased-tracks.txt b/album/unreleased-tracks.txt
index f6c45e35..f12a13f4 100644
--- a/album/unreleased-tracks.txt
+++ b/album/unreleased-tracks.txt
@@ -1948,6 +1948,10 @@ Track: La Cucaracha
 Artist: Lost in History
 URLs: https://www.youtube.com/watch?v=cQLCJsIof8s
 -------------------------------------------------------------------------------
+Track: La Espero
+Artist: L. L. Zamenhof, Félicien Menu de Ménil
+URLs: https://www.youtube.com/watch?v=d97KYGY0_NY
+-------------------------------------------------------------------------------
 Track: Lawnmower
 Directory: lawnmower-lemon-demon
 Artist: Lemon Demon
diff --git a/artists.txt b/artists.txt
index 63cf57dd..36e2ac29 100644
--- a/artists.txt
+++ b/artists.txt
@@ -1276,6 +1276,8 @@ URLs:
 Artist: Feastings
 URLs: https://feastings.tumblr.com/
 -------------------------------------------------------------------------------
+Artist: Félicien Menu de Ménil
+-------------------------------------------------------------------------------
 Artist: felicitousArtisan
 -------------------------------------------------------------------------------
 Artist: Fellow Traveller
@@ -2054,6 +2056,8 @@ URLs:
 -------------------------------------------------------------------------------
 Artist: Kyle G. Jamolin
 -------------------------------------------------------------------------------
+Artist: L. L. Zamenhof
+-------------------------------------------------------------------------------
 Artist: L4Vo5
 URLs:
 - https://www.youtube.com/c/l4vo5
diff --git a/static-pages.txt b/static-pages.txt
index 5b26b11e..3c9389d2 100644
--- a/static-pages.txt
+++ b/static-pages.txt
@@ -94,6 +94,8 @@ Content:
     <h3>data changes</h3>
     - added information for separate 'sampling' reference field to many tracks (mainly in [[group:official]], [[group:homestuck-gaiden]], and [[album:lofam5]]), not visible for now until support is implemented
         - some reference information will have appeared to disappear until then as it has been moved to samples
+    - moved [[group:desynced]] and [[album:perfectly-generic-object]] from [[group:beyond]] to [[group:fandom]]
+    - added the individual [[group:psycholonials]] episode albums to [[group:beyond]]
     - fixed incorrect title for [[track:skaian-dreams-remix]]
     - fixed [[track:contention]] not attributing [[group:toby-fox]]
     - fixed [[track:caramelldansen]] not attributing [[artist:caramell]] (thanks, Leo!)
@@ -108,10 +110,16 @@ Content:
     - fixed [[track:aggrieve-remix]] referencing [[track:aggrieve]] instead of [[track:aggrieve-violin-refrain]]
     - fixed [[track:white-host-green-room]] referencing [[track:the-king-in-red]] instead of [[track:the-king-in-red-beta]] (thanks, Cello!)
     - fixed [[Toby Fox Has Written Hundreds of Unique Original Songs]] referencing [[track:ruins]] (by Erik Scheele) instead of [[track:ruins-undertale]] (by Toby Fox)
+<<<<<<< Updated upstream
     - fixed a number of syntax errors in data files, thanks to improved parsing and data review by Gio (thank you!):
         - fixed transcribed artist commentary not showing up for [[track:frogsong]]
         - fixed YouTube and tumblr links not showing up for artist [[artist:first-turn-fold]]
         - fixed tumblr link not showing up for artist [[artist:thiefofstars]]
+=======
+    - fixed [[La Espero]] not being listed in reference list for [[Malblanka Rozo Verda Stelo]] (thanks, Sgeo!)
+        - added [[La Espero]] and artists [[artist:l-l-zamenhof]] and [[artist:flicien-menu-de-mnil]]
+    - fixed incorrect capitalization for [[album:sburb-ost]]
+>>>>>>> Stashed changes
     - added Bandcamp link to [[album:perfectly-generic-object]] (thanks, Leo!)
     - replaced dead Youtube link to [[track:corridors-of-time]] (thanks, Sgeo!)
     - directory changed for some [[album:jailbreak-vol-1]] content