diff --git a/CREDITS.md b/CREDITS.md index 416e88f19..c1307a3bc 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -204,6 +204,7 @@ * wsor for working tirelessly in the shadows for the good of all of us, particularly helping with solving contentDB and copyright issues. * The workaholics who spent way too much time writing for the Minecraft Wiki. It's an invaluable resource for creating this game * Notch and Jeb for being the major forces behind Minecraft -* Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/ +* Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube) and Traitor (horizonchris96), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/ * Jester for helping to finely tune MineClone2 (https://www.youtube.com/@Jester-8-bit). Songs: Hailing Forest, Gift, 0dd BL0ck, Flock of One (License CC BY-SA 4.0) -* Exhale & Tim Unwin for some new wonderful MineClone2 tracks (https://www.youtube.com/channel/UClFo_JDWoG4NGrPQY0JPD_g). Songs: Valley of Ghosts, Lonely Blossom (License CC BY-SA 4.0) +* Exhale & Tim Unwin for some wonderful MineClone2 tracks (https://www.youtube.com/channel/UClFo_JDWoG4NGrPQY0JPD_g). Songs: Valley of Ghosts, Lonely Blossom, Farmer (License CC BY-SA 4.0) +* Diminixed for 3 fantastic tracks and remastering and leveling volumes. Songs: Afternoon Lullaby (pianowtune02), Spooled (ambientwip02), Never Grow Up (License CC BY-SA 4.0) diff --git a/mods/PLAYER/mcl_music/init.lua b/mods/PLAYER/mcl_music/init.lua index 5987d2140..0d2f9c52e 100644 --- a/mods/PLAYER/mcl_music/init.lua +++ b/mods/PLAYER/mcl_music/init.lua @@ -3,8 +3,9 @@ local modpath = minetest.get_modpath(modname) local music_enabled = minetest.settings:get_bool("mcl_game_music", true) -local pianowtune = "diminixed-pianowtune01" -local end_tune = "diminixed-ambientwip" +local pianowtune = "diminixed-pianowtune02" +local end_tune = "diminixed-ambientwip02" +local never_grow_up = "diminixed-nevergrowup04" local nether_tune = "horizonchris96-traitor" local odd_block = "Jester-0dd-BL0ck" local flock_of_one = "Jester-Flock-of-One" @@ -12,9 +13,10 @@ local gift = "Jester-Gift" local hailing_forest = "Jester-Hailing_Forest" local lonely_blossom = "exhale_and_tim_unwin-lonely_blossom" local valley_of_ghosts = "exhale_and_tim_unwin-valley_of_ghosts" +local farmer = "exhale_and_tim_unwin-farmer" local dimension_to_base_track = { - ["overworld"] = {pianowtune, flock_of_one, gift, hailing_forest, lonely_blossom}, + ["overworld"] = {pianowtune, never_grow_up, flock_of_one, gift, hailing_forest, lonely_blossom, farmer}, ["nether"] = {nether_tune, valley_of_ghosts}, ["end"] = {end_tune}, ["mining"] = {odd_block}, diff --git a/mods/PLAYER/mcl_music/sounds/Jester-0dd-BL0ck.ogg b/mods/PLAYER/mcl_music/sounds/Jester-0dd-BL0ck.ogg index 0207c5165..9e4c25fec 100644 Binary files a/mods/PLAYER/mcl_music/sounds/Jester-0dd-BL0ck.ogg and b/mods/PLAYER/mcl_music/sounds/Jester-0dd-BL0ck.ogg differ diff --git a/mods/PLAYER/mcl_music/sounds/Jester-Flock-of-One.ogg b/mods/PLAYER/mcl_music/sounds/Jester-Flock-of-One.ogg index bc666a4c4..5835fbfd4 100644 Binary files a/mods/PLAYER/mcl_music/sounds/Jester-Flock-of-One.ogg and b/mods/PLAYER/mcl_music/sounds/Jester-Flock-of-One.ogg differ diff --git a/mods/PLAYER/mcl_music/sounds/Jester-Gift.ogg b/mods/PLAYER/mcl_music/sounds/Jester-Gift.ogg index 574f667a3..69b9ec675 100644 Binary files a/mods/PLAYER/mcl_music/sounds/Jester-Gift.ogg and b/mods/PLAYER/mcl_music/sounds/Jester-Gift.ogg differ diff --git a/mods/PLAYER/mcl_music/sounds/Jester-Hailing_Forest.ogg b/mods/PLAYER/mcl_music/sounds/Jester-Hailing_Forest.ogg index 2b78be546..70fcab2f9 100644 Binary files a/mods/PLAYER/mcl_music/sounds/Jester-Hailing_Forest.ogg and b/mods/PLAYER/mcl_music/sounds/Jester-Hailing_Forest.ogg differ diff --git a/mods/PLAYER/mcl_music/sounds/diminixed-ambientwip.ogg b/mods/PLAYER/mcl_music/sounds/diminixed-ambientwip.ogg deleted file mode 100644 index c02e8540a..000000000 Binary files a/mods/PLAYER/mcl_music/sounds/diminixed-ambientwip.ogg and /dev/null differ diff --git a/mods/PLAYER/mcl_music/sounds/diminixed-ambientwip02.ogg b/mods/PLAYER/mcl_music/sounds/diminixed-ambientwip02.ogg new file mode 100644 index 000000000..d484d92d2 Binary files /dev/null and b/mods/PLAYER/mcl_music/sounds/diminixed-ambientwip02.ogg differ diff --git a/mods/PLAYER/mcl_music/sounds/diminixed-nevergrowup04.ogg b/mods/PLAYER/mcl_music/sounds/diminixed-nevergrowup04.ogg new file mode 100644 index 000000000..c6f2ccabd Binary files /dev/null and b/mods/PLAYER/mcl_music/sounds/diminixed-nevergrowup04.ogg differ diff --git a/mods/PLAYER/mcl_music/sounds/diminixed-pianowtune01.ogg b/mods/PLAYER/mcl_music/sounds/diminixed-pianowtune01.ogg deleted file mode 100644 index 38df66cb6..000000000 Binary files a/mods/PLAYER/mcl_music/sounds/diminixed-pianowtune01.ogg and /dev/null differ diff --git a/mods/PLAYER/mcl_music/sounds/diminixed-pianowtune02.ogg b/mods/PLAYER/mcl_music/sounds/diminixed-pianowtune02.ogg new file mode 100644 index 000000000..cc9492e70 Binary files /dev/null and b/mods/PLAYER/mcl_music/sounds/diminixed-pianowtune02.ogg differ diff --git a/mods/PLAYER/mcl_music/sounds/exhale_and_tim_unwin-farmer.ogg b/mods/PLAYER/mcl_music/sounds/exhale_and_tim_unwin-farmer.ogg new file mode 100644 index 000000000..d919a5bf3 Binary files /dev/null and b/mods/PLAYER/mcl_music/sounds/exhale_and_tim_unwin-farmer.ogg differ diff --git a/mods/PLAYER/mcl_music/sounds/exhale_and_tim_unwin-lonely_blossom.ogg b/mods/PLAYER/mcl_music/sounds/exhale_and_tim_unwin-lonely_blossom.ogg index 0b76e57c5..53c32178a 100644 Binary files a/mods/PLAYER/mcl_music/sounds/exhale_and_tim_unwin-lonely_blossom.ogg and b/mods/PLAYER/mcl_music/sounds/exhale_and_tim_unwin-lonely_blossom.ogg differ diff --git a/mods/PLAYER/mcl_music/sounds/exhale_and_tim_unwin-valley_of_ghosts.ogg b/mods/PLAYER/mcl_music/sounds/exhale_and_tim_unwin-valley_of_ghosts.ogg index 180b695e0..7430a516e 100644 Binary files a/mods/PLAYER/mcl_music/sounds/exhale_and_tim_unwin-valley_of_ghosts.ogg and b/mods/PLAYER/mcl_music/sounds/exhale_and_tim_unwin-valley_of_ghosts.ogg differ diff --git a/mods/PLAYER/mcl_music/sounds/horizonchris96-traitor.ogg b/mods/PLAYER/mcl_music/sounds/horizonchris96-traitor.ogg index d21386712..c7eb103bc 100644 Binary files a/mods/PLAYER/mcl_music/sounds/horizonchris96-traitor.ogg and b/mods/PLAYER/mcl_music/sounds/horizonchris96-traitor.ogg differ