diff --git a/biomes/surface/bog.biome b/biomes/surface/bog.biome index 3a70b69180d..23393e913c1 100644 --- a/biomes/surface/bog.biome +++ b/biomes/surface/bog.biome @@ -179,7 +179,7 @@ "tracks" : [ "/music/forsaken-grotto.ogg", "/music/hymn-to-the-stars.ogg", "/music/procyon.ogg", "/music/vast-immortal-suns.ogg", "/music/drosera.ogg", "/music/mira.ogg", "/music/europa.ogg", "/music/haiku.ogg", "/music/horsehead-nebula.ogg", "/music/on-the-beach-at-night.ogg" ] }, "night" : { - "tracks" : [ "/music/jupiter.ogg", "/music/arctic-constellation1.ogg", "/music/arctic-constellation2.ogg", "/music/crystal-exploration2.ogg", "/music/mira.ogg", "/music/procyon.ogg", "/music/tranquility-base.ogg", "/music/accretion-disc.ogg", "/music/horsehead-nebula.ogg", "/music/large-magellanic-cloud.ogg" ] + "tracks" : [ "/music/devilstritone.ogg", "/music/jupiter.ogg", "/music/arctic-constellation1.ogg", "/music/arctic-constellation2.ogg", "/music/crystal-exploration2.ogg", "/music/mira.ogg", "/music/procyon.ogg", "/music/tranquility-base.ogg", "/music/accretion-disc.ogg", "/music/horsehead-nebula.ogg", "/music/large-magellanic-cloud.ogg" ] } }, diff --git a/biomes/surface/fungus.biome b/biomes/surface/fungus.biome index 7bceb6c08f7..2c363eb698d 100644 --- a/biomes/surface/fungus.biome +++ b/biomes/surface/fungus.biome @@ -231,7 +231,7 @@ "tracks" : [ "/music/crystal-exploration1.ogg", "/music/drosera.ogg", "/music/inviolate-loop.ogg", "/music/lava-exploration1.ogg", "/music/ultramarine.ogg", "/music/arctic-constellation1.ogg", "/music/body-electric-loop.ogg", "/music/mercury.ogg", "/music/nomads.ogg", "/music/psyche.ogg" ] }, "night" : { - "tracks" : [ "/music/crystal-exploration2.ogg", "/music/desert-exploration2.ogg", "/music/lava-exploration2.ogg", "/music/mira.ogg", "/music/tranquility-base.ogg", "/music/arctic-constellation1.ogg", "/music/body-electric-loop.ogg", "/music/mercury.ogg", "/music/nomads.ogg", "/music/casiopeia.ogg" ] + "tracks" : [ "/music/devilstritone.ogg", "/music/crystal-exploration2.ogg", "/music/desert-exploration2.ogg", "/music/lava-exploration2.ogg", "/music/mira.ogg", "/music/tranquility-base.ogg", "/music/arctic-constellation1.ogg", "/music/body-electric-loop.ogg", "/music/mercury.ogg", "/music/nomads.ogg", "/music/casiopeia.ogg" ] } }, diff --git a/biomes/surface/lightless.biome b/biomes/surface/lightless.biome index 7bc85dad880..37fe79c8ebd 100644 --- a/biomes/surface/lightless.biome +++ b/biomes/surface/lightless.biome @@ -104,7 +104,7 @@ "musicTrack" : { "day" : { - "tracks" : [ "/music/darkambient2a.ogg","/music/lava-exploration1.ogg", "/music/crystal-exploration1.ogg", "/music/crystal-exploration2.ogg", "/music/accretion-disc.ogg", "/music/arctic-exploration1.ogg", "/music/error-0xbfaf000.ogg", "/music/casiopeia.ogg", "/music/nomads.ogg", "/music/forsaken-grotto.ogg", "/music/accretion-disc.ogg", "/music/tranquility-base.ogg" ] + "tracks" : [ "/music/devilstritone.ogg", "/music/darkambient2a.ogg","/music/lava-exploration1.ogg", "/music/crystal-exploration1.ogg", "/music/crystal-exploration2.ogg", "/music/accretion-disc.ogg", "/music/arctic-exploration1.ogg", "/music/error-0xbfaf000.ogg", "/music/casiopeia.ogg", "/music/nomads.ogg", "/music/forsaken-grotto.ogg", "/music/accretion-disc.ogg", "/music/tranquility-base.ogg" ] }, "night" : { "tracks" : [ "/music/lava-exploration1.ogg", "/music/crystal-exploration1.ogg", "/music/crystal-exploration2.ogg", "/music/accretion-disc.ogg", "/music/arctic-exploration1.ogg", "/music/error-0xbfaf000.ogg", "/music/casiopeia.ogg", "/music/nomads.ogg", "/music/forsaken-grotto.ogg", "/music/accretion-disc.ogg", "/music/tranquility-base.ogg" ] diff --git a/biomes/surface/penumbra.biome b/biomes/surface/penumbra.biome index 696ecfbba40..1c7b64dbf5e 100644 --- a/biomes/surface/penumbra.biome +++ b/biomes/surface/penumbra.biome @@ -174,7 +174,7 @@ "tracks" : [ "/music/darkambient2a.ogg","/music/lava-exploration1.ogg", "/music/crystal-exploration1.ogg", "/music/crystal-exploration2.ogg", "/music/accretion-disc.ogg", "/music/arctic-exploration1.ogg", "/music/error-0xbfaf000.ogg", "/music/casiopeia.ogg", "/music/nomads.ogg", "/music/forsaken-grotto.ogg", "/music/accretion-disc.ogg", "/music/tranquility-base.ogg" ] }, "night" : { - "tracks" : [ "/music/lava-exploration1.ogg", "/music/crystal-exploration1.ogg", "/music/crystal-exploration2.ogg", "/music/accretion-disc.ogg", "/music/arctic-exploration1.ogg", "/music/error-0xbfaf000.ogg", "/music/casiopeia.ogg", "/music/nomads.ogg", "/music/forsaken-grotto.ogg", "/music/accretion-disc.ogg", "/music/tranquility-base.ogg" ] + "tracks" : [ "/music/devilstritone.ogg", "/music/lava-exploration1.ogg", "/music/crystal-exploration1.ogg", "/music/crystal-exploration2.ogg", "/music/accretion-disc.ogg", "/music/arctic-exploration1.ogg", "/music/error-0xbfaf000.ogg", "/music/casiopeia.ogg", "/music/nomads.ogg", "/music/forsaken-grotto.ogg", "/music/accretion-disc.ogg", "/music/tranquility-base.ogg" ] } }, diff --git a/biomes/surface/tarball.biome b/biomes/surface/tarball.biome index 2b6f2760504..ea009e8cab3 100644 --- a/biomes/surface/tarball.biome +++ b/biomes/surface/tarball.biome @@ -166,7 +166,7 @@ "tracks" : [ "/music/crystal-exploration1.ogg", "/music/drosera.ogg", "/music/inviolate-loop.ogg", "/music/lava-exploration1.ogg", "/music/ultramarine.ogg", "/music/arctic-constellation1.ogg", "/music/body-electric-loop.ogg", "/music/mercury.ogg", "/music/nomads.ogg", "/music/psyche.ogg" ] }, "night" : { - "tracks" : [ "/music/crystal-exploration2.ogg", "/music/desert-exploration2.ogg", "/music/lava-exploration2.ogg", "/music/mira.ogg", "/music/tranquility-base.ogg", "/music/arctic-constellation1.ogg", "/music/body-electric-loop.ogg", "/music/mercury.ogg", "/music/nomads.ogg", "/music/casiopeia.ogg" ] + "tracks" : [ "/music/devilstritone.ogg", "/music/crystal-exploration2.ogg", "/music/desert-exploration2.ogg", "/music/lava-exploration2.ogg", "/music/mira.ogg", "/music/tranquility-base.ogg", "/music/arctic-constellation1.ogg", "/music/body-electric-loop.ogg", "/music/mercury.ogg", "/music/nomads.ogg", "/music/casiopeia.ogg" ] } }, diff --git a/music/devils_tritone.ogg b/music/devils_tritone.ogg new file mode 100644 index 00000000000..4bf3e1f701c Binary files /dev/null and b/music/devils_tritone.ogg differ diff --git a/recipes/armory/ranged/guns/1h/telebriumpistol.recipe b/recipes/armory/ranged/guns/1h/telebriumpistol.recipe index d92c4cffe8b..e55930a8093 100644 --- a/recipes/armory/ranged/guns/1h/telebriumpistol.recipe +++ b/recipes/armory/ranged/guns/1h/telebriumpistol.recipe @@ -1,7 +1,7 @@ { "input" : [ { "item" : "moonstonebar", "count" : 2 }, - { "item" : "lunaricrystal", "count" : 1 }, + { "item" : "solaricrystal", "count" : 1 }, { "item" : "tungstenbar", "count" : 1 } ], "output" : { diff --git a/recipes/armory/ranged/guns/2h/telebriumrifle.recipe b/recipes/armory/ranged/guns/2h/telebriumrifle.recipe index 74a3448379c..d2896966c24 100644 --- a/recipes/armory/ranged/guns/2h/telebriumrifle.recipe +++ b/recipes/armory/ranged/guns/2h/telebriumrifle.recipe @@ -1,7 +1,7 @@ { "input" : [ { "item" : "moonstonebar", "count" : 4 }, - { "item" : "lunaricrystal", "count" : 2 }, + { "item" : "solaricrystal", "count" : 2 }, { "item" : "tungstenbar", "count" : 2 } ], "output" : { diff --git a/recipes/starbooze/booze/lavawhiskey.recipe b/recipes/starbooze/booze/lavawhiskey.recipe index 3d632791a26..e4308c5a3a1 100644 --- a/recipes/starbooze/booze/lavawhiskey.recipe +++ b/recipes/starbooze/booze/lavawhiskey.recipe @@ -2,7 +2,7 @@ "input" : [ { "item" : "liquidironfu", "count" : 2 }, { "item" : "spirits", "count" : 1 }, - { "item" : "lead", "count" : 1 }, + { "item" : "volatilepowder", "count" : 1 }, { "item" : "bottle", "count" : 1 } ], "output" : {