first pass of merging in warp (doesn't build)

2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
@@ -1,7 +1,10 @@
 use std::collections::HashSet;

-use crate::{banner::BannerState, resource_center::Tip};
-use galaxy_core::settings::{macros::define_settings_group, SupportedPlatforms, SyncToCloud};
+use galaxy_core::settings::macros::define_settings_group;
+use galaxy_core::settings::{RespectUserSyncSetting, SupportedPlatforms, SyncToCloud};
+
+use crate::banner::BannerState;
+use crate::resource_center::Tip;

 define_settings_group!(GeneralSettings, settings: [
    show_warning_before_quitting: ShowWarningBeforeQuitting {