diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index e9e820a4b8..e55b3502e7 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1,4 +1,4 @@ -text.about=Created by [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[]\nOriginally an entry in the [orange]GDL[] Metal Monstrosity Jam.\n\nCredits:\n- SFX made with [YELLOW]bfxr[]\n- Music made by [GREEN]a drop a day[]\n\nSpecial thanks to:\n- [coral]MitchellFJN[]: extensive playtesting and feedback\n- [sky]Luxray5474[]: wiki work, code contributions\n- [lime]Epowerj[]: code build system, icon\n- All the beta testers on itch.io and Google Play\n +text.about=Created by [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[]\nOriginally an entry in the [orange]GDL[] Metal Monstrosity Jam.\n\nCredits:\n- SFX made with [YELLOW]bfxr[]\n- Music made by [GREEN]Roccow[]\n\nSpecial thanks to:\n- [coral]MitchellFJN[]: extensive playtesting and feedback\n- [sky]Luxray5474[]: wiki work, code contributions\n- [lime]Epowerj[]: code build system, icon\n- All the beta testers on itch.io and Google Play\n text.credits=Credits text.discord=Join the mindustry discord! text.changes=[SCARLET]Attention!\n[]Some important game mechanics have been changed.\n\n- [accent]Teleporters[] now use power.\n- [accent]Smelteries[] and [accent]crucibles[] now have a maximum item capacity.\n- [accent]Crucibles[] now require coal as fuel. diff --git a/core/assets/music/1.mp3 b/core/assets/music/1.mp3 index cdbb366b48..642338935e 100644 Binary files a/core/assets/music/1.mp3 and b/core/assets/music/1.mp3 differ diff --git a/core/assets/music/2.mp3 b/core/assets/music/2.mp3 index cab7d699eb..8a40164ad5 100644 Binary files a/core/assets/music/2.mp3 and b/core/assets/music/2.mp3 differ diff --git a/core/assets/music/3.mp3 b/core/assets/music/3.mp3 index f03d72bbcc..1586984c2d 100644 Binary files a/core/assets/music/3.mp3 and b/core/assets/music/3.mp3 differ diff --git a/core/assets/music/4.mp3 b/core/assets/music/4.mp3 index 48c4ff24fc..8f1998b9c8 100644 Binary files a/core/assets/music/4.mp3 and b/core/assets/music/4.mp3 differ diff --git a/core/assets/music/5.mp3 b/core/assets/music/5.mp3 deleted file mode 100644 index 65a5034fbf..0000000000 Binary files a/core/assets/music/5.mp3 and /dev/null differ diff --git a/core/assets/music/6.mp3 b/core/assets/music/6.mp3 deleted file mode 100644 index 88f04f33a8..0000000000 Binary files a/core/assets/music/6.mp3 and /dev/null differ diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index af9b1f7e2a..c991873609 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -102,7 +102,7 @@ public class Control extends Module{ Sounds.setFalloff(9000f); - Musics.load("1.mp3", "2.mp3", "3.mp3", "4.mp3", "5.mp3", "6.mp3"); + Musics.load("1.mp3", "2.mp3", "3.mp3", "4.mp3"); DefaultKeybinds.load();