Merge branch 'master' into metal

This commit is contained in:
tildearrow 2024-04-14 16:40:25 -05:00
commit e6bead147a
22 changed files with 636 additions and 175 deletions

View file

@ -4110,7 +4110,7 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
settings.centerPopup=conf.getInt("centerPopup",1);
settings.vibrationStrength=conf.getFloat("vibrationStrength",0.5f);
settings.vibrationLength=conf.getInt("vibrationLength",100);
settings.vibrationLength=conf.getInt("vibrationLength",20);
}
if (groups&GUI_SETTINGS_AUDIO) {