Merge branch 'main' of https://git.ragestudio.net/srgooglo/jaen-united-2024

config/item_obliterator.json

@@ -1120,18 +1120,7 @@
 "enlightened_end:nuclear_bomb",
 "enlightened_end:raw_irradium",
 "enlightened_end:irradium_bar",
-"enlightened_end:depleted_irradium_bar",
-"blocky_siege:giant_cannon",
-"blocky_siege:giant_cannon_ball",
-"blocky_siege:giant_cannon_void_block",
-"blocky_siege:giant_fire_bomb",
-"blocky_siege:giant_frost_bomb",
-"blocky_siege:giant_sculk_bomb",
-"blocky_siege:ballista_stand",
-"blocky_siege:illager_ballista_golem_stand",
-"blocky_siege:cannon_stand",
-"blocky_siege:spewer_stand",
-"blocky_siege:crusher"
+"enlightened_end:depleted_irradium_bar"
   ],
   "only_disable_interactions": [
     "//Items here will not be able to be right-clicked (Interact)",

default_options.txt

@@ -205,15 +205,15 @@ key_key.irons_spellbooks.spell_quick_cast_15:key.keyboard.unknown
 key_key.valkyrienskies.ship_down:key.keyboard.left.control
 key_key.valkyrienskies.ship_cruise:key.keyboard.c
 key_key.entityculling.toggle:key.keyboard.unknown
-soundCategory_master:0.5066225165562914
-soundCategory_music:0.05457746478873239
+soundCategory_master:0.50
+soundCategory_music:0.05
 soundCategory_record:1.0
-soundCategory_weather:0.1073943661971831
+soundCategory_weather:0.10
 soundCategory_block:1.0
 soundCategory_hostile:1.0
 soundCategory_neutral:1.0
 soundCategory_player:1.0
-soundCategory_ambient:0.10387323943661972
+soundCategory_ambient:0.10
 soundCategory_voice:1.0
 modelPart_cape:true
 modelPart_jacket:true