From ff93b34dca06d0450007ec647f0744a6e8d918b0 Mon Sep 17 00:00:00 2001 From: Umcaruje Date: Tue, 24 Nov 2015 23:37:26 +0100 Subject: [PATCH] Merge Demos and CoolSongs. Also fix the case on other project folders --- data/projects/CoolSongs/LICENSES.TXT | 79 ---------------- .../Alf42red-Mauiwowi.mmpz | Bin .../Demos/{ => CapDan}/CapDan-ReggaeTry.mmpz | Bin .../{ => CapDan}/CapDan-ReggaetonTry.mmpz | Bin ...apDan-TwilightArea-OriginalByAlf42red.mmpz | Bin .../CapDan-ZeroSumGame-OriginalByZakarra.mmpz | Bin .../{CoolSongs => Demos}/Farbro-Tectonic.mmpz | Bin ...- Krem Kaakkuja (Second Flight Remix).mmpz | Bin .../{CoolSongs => Demos}/Greippi-ardudar.mmpz | Bin .../{CoolSongs => Demos}/Impulslogik-Zen.mmpz | Bin data/projects/Demos/LICENSES.TXT | 86 +++++++++++++++++- .../{CoolSongs => Demos}/Momo64-esp.mmpz | Bin .../Namitryus-K-Project.mmpz | Bin .../{CoolSongs => Demos}/Oglsdl-Dr8v2.mmpz | Bin .../Popsip-Electric Dancer.mmpz | Bin .../Root84-Initialize.mmpz | Bin .../{CoolSongs => Demos}/Saber-FinalStep.mmpz | Bin .../Settel-InnerRecreation.mmpz | Bin .../Demos/{ => Skiessi}/Skiessi-C64.mmpz | Bin .../Skiessi/Skiessi-Onion.mmpz | Bin .../Skiessi-RandomProjectNumber14253.mmpz | Bin .../Skiessi/Skiessi-TurningPoint.mmpz | Bin .../Socceroos-Progress.mmpz | Bin .../StrictProduction-DearJonDoe.mmp | 0 .../TameAnderson-MakeMe.mmpz | Bin .../Thaledric-Armageddon.mmpz | Bin .../{CoolSongs => Demos}/TobyDox-Psycho.mmpz | Bin .../Zakarra/Zakarra-59_Degrees.mmpz | Bin .../Zakarra/Zakarra-MainstreamMemory.mmpz | Bin .../Zakarra/Zakarra-OneDay.mmpz | Bin .../{CoolSongs => Demos}/unfa-Spoken.mmpz | Bin .../AcousticDrumset.mpt | 0 .../{templates => Templates}/CR8000.mpt | 0 .../{templates => Templates}/ClubMix.mpt | 0 .../{templates => Templates}/Empty.mpt | 0 .../{templates => Templates}/TR808.mpt | 0 .../editing_note_volumes.mmp | 0 37 files changed, 83 insertions(+), 82 deletions(-) delete mode 100644 data/projects/CoolSongs/LICENSES.TXT rename data/projects/{CoolSongs => Demos}/Alf42red-Mauiwowi.mmpz (100%) rename data/projects/Demos/{ => CapDan}/CapDan-ReggaeTry.mmpz (100%) rename data/projects/Demos/{ => CapDan}/CapDan-ReggaetonTry.mmpz (100%) rename data/projects/{CoolSongs => Demos}/CapDan/CapDan-TwilightArea-OriginalByAlf42red.mmpz (100%) rename data/projects/{CoolSongs => Demos}/CapDan/CapDan-ZeroSumGame-OriginalByZakarra.mmpz (100%) rename data/projects/{CoolSongs => Demos}/Farbro-Tectonic.mmpz (100%) rename data/projects/{CoolSongs => Demos}/Greippi - Krem Kaakkuja (Second Flight Remix).mmpz (100%) rename data/projects/{CoolSongs => Demos}/Greippi-ardudar.mmpz (100%) rename data/projects/{CoolSongs => Demos}/Impulslogik-Zen.mmpz (100%) rename data/projects/{CoolSongs => Demos}/Momo64-esp.mmpz (100%) rename data/projects/{CoolSongs => Demos}/Namitryus-K-Project.mmpz (100%) rename data/projects/{CoolSongs => Demos}/Oglsdl-Dr8v2.mmpz (100%) rename data/projects/{CoolSongs => Demos}/Popsip-Electric Dancer.mmpz (100%) rename data/projects/{CoolSongs => Demos}/Root84-Initialize.mmpz (100%) rename data/projects/{CoolSongs => Demos}/Saber-FinalStep.mmpz (100%) rename data/projects/{CoolSongs => Demos}/Settel-InnerRecreation.mmpz (100%) rename data/projects/Demos/{ => Skiessi}/Skiessi-C64.mmpz (100%) rename data/projects/{CoolSongs => Demos}/Skiessi/Skiessi-Onion.mmpz (100%) rename data/projects/{CoolSongs => Demos}/Skiessi/Skiessi-RandomProjectNumber14253.mmpz (100%) rename data/projects/{CoolSongs => Demos}/Skiessi/Skiessi-TurningPoint.mmpz (100%) rename data/projects/{CoolSongs => Demos}/Socceroos-Progress.mmpz (100%) rename data/projects/{CoolSongs => Demos}/StrictProduction-DearJonDoe.mmp (100%) rename data/projects/{CoolSongs => Demos}/TameAnderson-MakeMe.mmpz (100%) rename data/projects/{CoolSongs => Demos}/Thaledric-Armageddon.mmpz (100%) rename data/projects/{CoolSongs => Demos}/TobyDox-Psycho.mmpz (100%) rename data/projects/{CoolSongs => Demos}/Zakarra/Zakarra-59_Degrees.mmpz (100%) rename data/projects/{CoolSongs => Demos}/Zakarra/Zakarra-MainstreamMemory.mmpz (100%) rename data/projects/{CoolSongs => Demos}/Zakarra/Zakarra-OneDay.mmpz (100%) rename data/projects/{CoolSongs => Demos}/unfa-Spoken.mmpz (100%) rename data/projects/{templates => Templates}/AcousticDrumset.mpt (100%) rename data/projects/{templates => Templates}/CR8000.mpt (100%) rename data/projects/{templates => Templates}/ClubMix.mpt (100%) rename data/projects/{templates => Templates}/Empty.mpt (100%) rename data/projects/{templates => Templates}/TR808.mpt (100%) rename data/projects/{tutorials => Tutorials}/editing_note_volumes.mmp (100%) diff --git a/data/projects/CoolSongs/LICENSES.TXT b/data/projects/CoolSongs/LICENSES.TXT deleted file mode 100644 index 513efd613..000000000 --- a/data/projects/CoolSongs/LICENSES.TXT +++ /dev/null @@ -1,79 +0,0 @@ -* Alf42red-Mauiwowi.mmpz - - CC (by-sa) - - http://lmms.io/lsp/index.php?action=show&file=819 - -* CapDan-TwilightArea-OriginalByAlf42red.mmpz - - CC (by-sa) - - http://lmms.io/lsp/index.php?action=show&file=1439 - -* CapDan-ZeroSumGame-OriginalByZakarra.mmpz - - Artistic 2.0 - - http://lmms.io/lsp/index.php?action=show&file=1565 - -* Farbro-Tectonic.mmpz - - CC (by) - - http://lmms.io/lsp/index.php?action=show&file=1327 - -* Greippi - Krem Kaakkuja (Second Flight Remix) - - CC (by) - - http://lmms.io/lsp/index.php?action=show&file=6337 - -* Greippi-ardudar.mmpz - - CC (by-sa) - - http://lmms.io/lsp/index.php?action=show&file=4916 - -* Impulslogik-Zen.mmpz - - Artistic 2.0 - - http://lmms.io/lsp/index.php?action=show&file=581 - -* Momo64-esp.mmpz - - Artistic 2.0 - - http://lmms.io/lsp/index.php?action=show&file=1534 - -* Namitryus-K-Project.mmpz - - CC (by-nc) - - http://lmms.io/lsp/index.php?action=show&file=1138 - -* Oglsdl-Dr8v2.mmpz - - Artistic 2.0 - - http://lmms.io/lsp/index.php?action=show&file=1124 - -* Root84-Initialize.mmpz - - Yellow openmusic - - http://lmms.io/lsp/index.php?action=show&file=628 - -* Saber-FinalStep.mmpz - - BSD - - http://lmms.io/lsp/index.php?action=show&file=721 - -* Settel-InnerRecreation.mmpz - - Artistic 2.0 - - http://lmms.io/lsp/index.php?action=show&file=515 - -* Skiessi-Onion.mmpz - - CC (by-sa) - - http://lmms.io/lsp/index.php?action=show&file=405 - -* Socceroos-Progress.mmpz - - Artistic 2.0 - - http://lmms.io/lsp/index.php?action=show&file=1516 - -* TameAnderson-MakeMe.mmpz - - Artistic 2.0 - - http://lmms.io/lsp/index.php?action=show&file=1060 - -* unfa-Spoken.mmpz - - CC (by-nc) - - http://lmms.io/lsp/index.php?action=show&file=4929 - -* Zakarra-MainstreamMemory.mmpz - - Artistic 2.0 - - http://lmms.io/lsp/index.php?action=show&file=1201 - -* Zakarra-OneDay.mmpz - - Artistic 2.0 - - http://lmms.io/lsp/index.php?action=show&file=1501 - -* Zakarra-59_Degrees.mmpz - - Artistic 2.0 - - http://lmms.io/lsp/index.php?action=show&file=1059 diff --git a/data/projects/CoolSongs/Alf42red-Mauiwowi.mmpz b/data/projects/Demos/Alf42red-Mauiwowi.mmpz similarity index 100% rename from data/projects/CoolSongs/Alf42red-Mauiwowi.mmpz rename to data/projects/Demos/Alf42red-Mauiwowi.mmpz diff --git a/data/projects/Demos/CapDan-ReggaeTry.mmpz b/data/projects/Demos/CapDan/CapDan-ReggaeTry.mmpz similarity index 100% rename from data/projects/Demos/CapDan-ReggaeTry.mmpz rename to data/projects/Demos/CapDan/CapDan-ReggaeTry.mmpz diff --git a/data/projects/Demos/CapDan-ReggaetonTry.mmpz b/data/projects/Demos/CapDan/CapDan-ReggaetonTry.mmpz similarity index 100% rename from data/projects/Demos/CapDan-ReggaetonTry.mmpz rename to data/projects/Demos/CapDan/CapDan-ReggaetonTry.mmpz diff --git a/data/projects/CoolSongs/CapDan/CapDan-TwilightArea-OriginalByAlf42red.mmpz b/data/projects/Demos/CapDan/CapDan-TwilightArea-OriginalByAlf42red.mmpz similarity index 100% rename from data/projects/CoolSongs/CapDan/CapDan-TwilightArea-OriginalByAlf42red.mmpz rename to data/projects/Demos/CapDan/CapDan-TwilightArea-OriginalByAlf42red.mmpz diff --git a/data/projects/CoolSongs/CapDan/CapDan-ZeroSumGame-OriginalByZakarra.mmpz b/data/projects/Demos/CapDan/CapDan-ZeroSumGame-OriginalByZakarra.mmpz similarity index 100% rename from data/projects/CoolSongs/CapDan/CapDan-ZeroSumGame-OriginalByZakarra.mmpz rename to data/projects/Demos/CapDan/CapDan-ZeroSumGame-OriginalByZakarra.mmpz diff --git a/data/projects/CoolSongs/Farbro-Tectonic.mmpz b/data/projects/Demos/Farbro-Tectonic.mmpz similarity index 100% rename from data/projects/CoolSongs/Farbro-Tectonic.mmpz rename to data/projects/Demos/Farbro-Tectonic.mmpz diff --git a/data/projects/CoolSongs/Greippi - Krem Kaakkuja (Second Flight Remix).mmpz b/data/projects/Demos/Greippi - Krem Kaakkuja (Second Flight Remix).mmpz similarity index 100% rename from data/projects/CoolSongs/Greippi - Krem Kaakkuja (Second Flight Remix).mmpz rename to data/projects/Demos/Greippi - Krem Kaakkuja (Second Flight Remix).mmpz diff --git a/data/projects/CoolSongs/Greippi-ardudar.mmpz b/data/projects/Demos/Greippi-ardudar.mmpz similarity index 100% rename from data/projects/CoolSongs/Greippi-ardudar.mmpz rename to data/projects/Demos/Greippi-ardudar.mmpz diff --git a/data/projects/CoolSongs/Impulslogik-Zen.mmpz b/data/projects/Demos/Impulslogik-Zen.mmpz similarity index 100% rename from data/projects/CoolSongs/Impulslogik-Zen.mmpz rename to data/projects/Demos/Impulslogik-Zen.mmpz diff --git a/data/projects/Demos/LICENSES.TXT b/data/projects/Demos/LICENSES.TXT index 34e5720fc..db68441cd 100644 --- a/data/projects/Demos/LICENSES.TXT +++ b/data/projects/Demos/LICENSES.TXT @@ -1,24 +1,104 @@ -* CapDan-ReggaetonTry.mmpz - - Artistic 2.0 - - http://lmms.io/lsp/index.php?action=show&file=1370 +* Alf42red-Mauiwowi.mmpz + - CC (by-sa) + - http://lmms.io/lsp/index.php?action=show&file=819 * CapDan-ReggaeTry.mmpz - Artistic 2.0 - http://lmms.io/lsp/index.php?action=show&file=1369 +* CapDan-ReggaetonTry.mmpz + - Artistic 2.0 + - http://lmms.io/lsp/index.php?action=show&file=1370 + +* CapDan-TwilightArea-OriginalByAlf42red.mmpz + - CC (by-sa) + - http://lmms.io/lsp/index.php?action=show&file=1439 + +* CapDan-ZeroSumGame-OriginalByZakarra.mmpz + - Artistic 2.0 + - http://lmms.io/lsp/index.php?action=show&file=1565 + * EsoXLB-CPU.mmpz - Artistic 2.0 - http://lmms.io/lsp/index.php?action=show&file=723 +* Farbro-Tectonic.mmpz + - CC (by) + - http://lmms.io/lsp/index.php?action=show&file=1327 + +* Greippi - Krem Kaakkuja (Second Flight Remix) + - CC (by) + - http://lmms.io/lsp/index.php?action=show&file=6337 + +* Greippi-ardudar.mmpz + - CC (by-sa) + - http://lmms.io/lsp/index.php?action=show&file=4916 + +* Impulslogik-Zen.mmpz + - Artistic 2.0 + - http://lmms.io/lsp/index.php?action=show&file=581 + +* Momo64-esp.mmpz + - Artistic 2.0 + - http://lmms.io/lsp/index.php?action=show&file=1534 + +* Namitryus-K-Project.mmpz + - CC (by-nc) + - http://lmms.io/lsp/index.php?action=show&file=1138 + +* Oglsdl-Dr8v2.mmpz + - Artistic 2.0 + - http://lmms.io/lsp/index.php?action=show&file=1124 + * Oglsdl-PpTrip.mmpz - Artistic 2.0 - http://lmms.io/lsp/index.php?action=show&file=1156 +* Root84-Initialize.mmpz + - Yellow openmusic + - http://lmms.io/lsp/index.php?action=show&file=628 + +* Saber-FinalStep.mmpz + - BSD + - http://lmms.io/lsp/index.php?action=show&file=721 + +* Settel-InnerRecreation.mmpz + - Artistic 2.0 + - http://lmms.io/lsp/index.php?action=show&file=515 + * Skiessi-C64.mmpz - CC (by sa) - http://lmms.io/lsp/index.php?action=show&file=472 +* Skiessi-Onion.mmpz + - CC (by-sa) + - http://lmms.io/lsp/index.php?action=show&file=405 + +* Socceroos-Progress.mmpz + - Artistic 2.0 + - http://lmms.io/lsp/index.php?action=show&file=1516 + +* TameAnderson-MakeMe.mmpz + - Artistic 2.0 + - http://lmms.io/lsp/index.php?action=show&file=1060 + * Thomasso-AxeFromThe80s.mmpz - Artistic 2.0 - http://lmms.io/lsp/index.php?action=show&file=474 +* unfa-Spoken.mmpz + - CC (by-nc) + - http://lmms.io/lsp/index.php?action=show&file=4929 + +* Zakarra-MainstreamMemory.mmpz + - Artistic 2.0 + - http://lmms.io/lsp/index.php?action=show&file=1201 + +* Zakarra-OneDay.mmpz + - Artistic 2.0 + - http://lmms.io/lsp/index.php?action=show&file=1501 + +* Zakarra-59_Degrees.mmpz + - Artistic 2.0 + - http://lmms.io/lsp/index.php?action=show&file=1059 + diff --git a/data/projects/CoolSongs/Momo64-esp.mmpz b/data/projects/Demos/Momo64-esp.mmpz similarity index 100% rename from data/projects/CoolSongs/Momo64-esp.mmpz rename to data/projects/Demos/Momo64-esp.mmpz diff --git a/data/projects/CoolSongs/Namitryus-K-Project.mmpz b/data/projects/Demos/Namitryus-K-Project.mmpz similarity index 100% rename from data/projects/CoolSongs/Namitryus-K-Project.mmpz rename to data/projects/Demos/Namitryus-K-Project.mmpz diff --git a/data/projects/CoolSongs/Oglsdl-Dr8v2.mmpz b/data/projects/Demos/Oglsdl-Dr8v2.mmpz similarity index 100% rename from data/projects/CoolSongs/Oglsdl-Dr8v2.mmpz rename to data/projects/Demos/Oglsdl-Dr8v2.mmpz diff --git a/data/projects/CoolSongs/Popsip-Electric Dancer.mmpz b/data/projects/Demos/Popsip-Electric Dancer.mmpz similarity index 100% rename from data/projects/CoolSongs/Popsip-Electric Dancer.mmpz rename to data/projects/Demos/Popsip-Electric Dancer.mmpz diff --git a/data/projects/CoolSongs/Root84-Initialize.mmpz b/data/projects/Demos/Root84-Initialize.mmpz similarity index 100% rename from data/projects/CoolSongs/Root84-Initialize.mmpz rename to data/projects/Demos/Root84-Initialize.mmpz diff --git a/data/projects/CoolSongs/Saber-FinalStep.mmpz b/data/projects/Demos/Saber-FinalStep.mmpz similarity index 100% rename from data/projects/CoolSongs/Saber-FinalStep.mmpz rename to data/projects/Demos/Saber-FinalStep.mmpz diff --git a/data/projects/CoolSongs/Settel-InnerRecreation.mmpz b/data/projects/Demos/Settel-InnerRecreation.mmpz similarity index 100% rename from data/projects/CoolSongs/Settel-InnerRecreation.mmpz rename to data/projects/Demos/Settel-InnerRecreation.mmpz diff --git a/data/projects/Demos/Skiessi-C64.mmpz b/data/projects/Demos/Skiessi/Skiessi-C64.mmpz similarity index 100% rename from data/projects/Demos/Skiessi-C64.mmpz rename to data/projects/Demos/Skiessi/Skiessi-C64.mmpz diff --git a/data/projects/CoolSongs/Skiessi/Skiessi-Onion.mmpz b/data/projects/Demos/Skiessi/Skiessi-Onion.mmpz similarity index 100% rename from data/projects/CoolSongs/Skiessi/Skiessi-Onion.mmpz rename to data/projects/Demos/Skiessi/Skiessi-Onion.mmpz diff --git a/data/projects/CoolSongs/Skiessi/Skiessi-RandomProjectNumber14253.mmpz b/data/projects/Demos/Skiessi/Skiessi-RandomProjectNumber14253.mmpz similarity index 100% rename from data/projects/CoolSongs/Skiessi/Skiessi-RandomProjectNumber14253.mmpz rename to data/projects/Demos/Skiessi/Skiessi-RandomProjectNumber14253.mmpz diff --git a/data/projects/CoolSongs/Skiessi/Skiessi-TurningPoint.mmpz b/data/projects/Demos/Skiessi/Skiessi-TurningPoint.mmpz similarity index 100% rename from data/projects/CoolSongs/Skiessi/Skiessi-TurningPoint.mmpz rename to data/projects/Demos/Skiessi/Skiessi-TurningPoint.mmpz diff --git a/data/projects/CoolSongs/Socceroos-Progress.mmpz b/data/projects/Demos/Socceroos-Progress.mmpz similarity index 100% rename from data/projects/CoolSongs/Socceroos-Progress.mmpz rename to data/projects/Demos/Socceroos-Progress.mmpz diff --git a/data/projects/CoolSongs/StrictProduction-DearJonDoe.mmp b/data/projects/Demos/StrictProduction-DearJonDoe.mmp similarity index 100% rename from data/projects/CoolSongs/StrictProduction-DearJonDoe.mmp rename to data/projects/Demos/StrictProduction-DearJonDoe.mmp diff --git a/data/projects/CoolSongs/TameAnderson-MakeMe.mmpz b/data/projects/Demos/TameAnderson-MakeMe.mmpz similarity index 100% rename from data/projects/CoolSongs/TameAnderson-MakeMe.mmpz rename to data/projects/Demos/TameAnderson-MakeMe.mmpz diff --git a/data/projects/CoolSongs/Thaledric-Armageddon.mmpz b/data/projects/Demos/Thaledric-Armageddon.mmpz similarity index 100% rename from data/projects/CoolSongs/Thaledric-Armageddon.mmpz rename to data/projects/Demos/Thaledric-Armageddon.mmpz diff --git a/data/projects/CoolSongs/TobyDox-Psycho.mmpz b/data/projects/Demos/TobyDox-Psycho.mmpz similarity index 100% rename from data/projects/CoolSongs/TobyDox-Psycho.mmpz rename to data/projects/Demos/TobyDox-Psycho.mmpz diff --git a/data/projects/CoolSongs/Zakarra/Zakarra-59_Degrees.mmpz b/data/projects/Demos/Zakarra/Zakarra-59_Degrees.mmpz similarity index 100% rename from data/projects/CoolSongs/Zakarra/Zakarra-59_Degrees.mmpz rename to data/projects/Demos/Zakarra/Zakarra-59_Degrees.mmpz diff --git a/data/projects/CoolSongs/Zakarra/Zakarra-MainstreamMemory.mmpz b/data/projects/Demos/Zakarra/Zakarra-MainstreamMemory.mmpz similarity index 100% rename from data/projects/CoolSongs/Zakarra/Zakarra-MainstreamMemory.mmpz rename to data/projects/Demos/Zakarra/Zakarra-MainstreamMemory.mmpz diff --git a/data/projects/CoolSongs/Zakarra/Zakarra-OneDay.mmpz b/data/projects/Demos/Zakarra/Zakarra-OneDay.mmpz similarity index 100% rename from data/projects/CoolSongs/Zakarra/Zakarra-OneDay.mmpz rename to data/projects/Demos/Zakarra/Zakarra-OneDay.mmpz diff --git a/data/projects/CoolSongs/unfa-Spoken.mmpz b/data/projects/Demos/unfa-Spoken.mmpz similarity index 100% rename from data/projects/CoolSongs/unfa-Spoken.mmpz rename to data/projects/Demos/unfa-Spoken.mmpz diff --git a/data/projects/templates/AcousticDrumset.mpt b/data/projects/Templates/AcousticDrumset.mpt similarity index 100% rename from data/projects/templates/AcousticDrumset.mpt rename to data/projects/Templates/AcousticDrumset.mpt diff --git a/data/projects/templates/CR8000.mpt b/data/projects/Templates/CR8000.mpt similarity index 100% rename from data/projects/templates/CR8000.mpt rename to data/projects/Templates/CR8000.mpt diff --git a/data/projects/templates/ClubMix.mpt b/data/projects/Templates/ClubMix.mpt similarity index 100% rename from data/projects/templates/ClubMix.mpt rename to data/projects/Templates/ClubMix.mpt diff --git a/data/projects/templates/Empty.mpt b/data/projects/Templates/Empty.mpt similarity index 100% rename from data/projects/templates/Empty.mpt rename to data/projects/Templates/Empty.mpt diff --git a/data/projects/templates/TR808.mpt b/data/projects/Templates/TR808.mpt similarity index 100% rename from data/projects/templates/TR808.mpt rename to data/projects/Templates/TR808.mpt diff --git a/data/projects/tutorials/editing_note_volumes.mmp b/data/projects/Tutorials/editing_note_volumes.mmp similarity index 100% rename from data/projects/tutorials/editing_note_volumes.mmp rename to data/projects/Tutorials/editing_note_volumes.mmp