Commit Graph

23 Commits

Author SHA1 Message Date
Daniel Løvbrøtte Olsen 54a0a5ab59 Merge branch 'develop' into 'master'
Develop

See merge request Dandellion/Radio-dodsorfas!4
2018-10-15 17:01:12 +00:00
Daniel Løvbrøtte Olsen 801fb3b391 conservative try 2018-10-15 19:00:03 +02:00
Daniel Løvbrøtte Olsen 22ef55f130 Merge branch 'master' into 'develop'
More content

See merge request Dandellion/Radio-dodsorfas!3
2018-10-15 15:32:42 +00:00
Joakim Pettersvold 0a919ca617 Uncomments Halloween in main.liq for halloween event
The event is real!!!!
2018-10-15 06:26:12 +00:00
Joakim Pettersvold 04c5730c26 Added playlists (and songs), and removed -x protocol on playlists maintained by Joakim
+JoakimRemixes.m3u
+Halloween.m3u
*JoakimDiverse.m3u(Added songs)
*AstridS.m3u(Added songs)

Added JoakimRemixes and Halloween to main.liq (Halloween is commented)
2018-10-13 22:34:30 +02:00
root 7e030fbf4e change all protocols in playlists to the new -x protocol 2018-10-04 18:03:37 +00:00
root a56119d04f Merge branch 'master' of https://git.dodsorf.as/Dandellion/Radio-dodsorfas 2018-10-04 17:59:48 +00:00
root acf358317d Add youtube-dl-x protocol, reduces CPU usage MASSIVELY 2018-10-04 17:57:39 +00:00
Daniel Løvbrøtte Olsen 60455448b7 Update Dan - Edgy Music YT.m3u 2018-09-30 13:37:47 +00:00
root 144cc07189 Add all current playlists to shuffle 2018-09-29 21:08:11 +00:00
root 6b85d15258 remove weeb stream 2018-09-27 22:37:07 +00:00
Daniel Løvbrøtte Olsen 553a746a69 Merge branch 'master' into 'master'
Adds my youtube playlists so far

See merge request Dandellion/Radio-dodsorfas!1
2018-09-27 20:43:07 +00:00
Joakim Pettersvold 236ac682c7 Merge branch 'master' of https://git.dodsorf.as/JoaThePet/Radio-dodsorfas
Pulling into new local repository
2018-09-27 22:23:06 +02:00
Joakim Pettersvold 223c29f37f Added playlists
+Musicals.m3u
+Soundtracks.m3u
+Joakim/AlternativeJoa.m3u
+Joakim/JoakimDiverse.m3u
+artists/ArianaGrande.m3u
+artists/AstridS.m3u
+artists/Coldplay.m3u
+artists/DemiLovato.m3u
+artists/KatyPerry.m3u
+artists/SelenaGomez.m3u
+artists/ShawnMendes.m3u
+artists/TaylorSwift.m3u
+artists/ZaraLarsson.m3u
2018-09-27 22:14:54 +02:00
Daniel Løvbrøtte Olsen 178253d547 Delete yt-m3u 2018-09-27 22:13:49 +02:00
Daniel Løvbrøtte Olsen 70aba820b5 Delete yt-m3u 2018-09-27 14:19:20 +00:00
Daniel Løvbrøtte Olsen 59c840c31d Fix playlists 2018-09-27 12:48:54 +00:00
Daniel Løvbrøtte Olsen 423d2c18b9 Fix playlist 2018-09-27 12:47:04 +00:00
Daniel Løvbrøtte Olsen 01757e7519 Add youtube to m3u script 2018-09-27 12:29:28 +00:00
Daniel Løvbrøtte Olsen 3d411bc358 Delete Dan - Nightcoreoranime.m3u 2018-09-27 12:23:13 +00:00
Daniel Løvbrøtte Olsen f2e41409f8 Delete Dan - electronicrealmusic.txt 2018-09-27 12:22:06 +00:00
root a8391df583 Woops 2018-09-27 12:21:07 +00:00
root 90ae291395 Initial commit 2018-09-27 12:18:03 +00:00