From 8007270f48b0f5031eaa24f0865ee15a29c1d2e5 Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Sat, 6 May 2023 15:27:56 +0200 Subject: [PATCH] fix: fixed merge issues --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- src/ui/preferences/game.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ffa5589..6c4fbdd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -65,8 +65,8 @@ dependencies = [ [[package]] name = "anime-launcher-sdk" -version = "1.2.1" -source = "git+https://github.com/an-anime-team/anime-launcher-sdk?tag=1.2.1#f7bddd1d2fde4dcc7d04bda9e4d9160a5bc88218" +version = "1.2.2" +source = "git+https://github.com/an-anime-team/anime-launcher-sdk?tag=1.2.2#f2efb2c8bf339e065ecafc53cfcc9c02a129124e" dependencies = [ "anime-game-core", "anyhow", diff --git a/Cargo.toml b/Cargo.toml index 28306a8..160c6a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ glib-build-tools = "0.17" [dependencies.anime-launcher-sdk] git = "https://github.com/an-anime-team/anime-launcher-sdk" -tag = "1.2.1" +tag = "1.2.2" features = ["all", "star-rail"] # path = "../anime-launcher-sdk" # ! for dev purposes only diff --git a/src/ui/preferences/game.rs b/src/ui/preferences/game.rs index b02e268..2fcaa7b 100644 --- a/src/ui/preferences/game.rs +++ b/src/ui/preferences/game.rs @@ -5,7 +5,7 @@ use relm4::factory::*; use adw::prelude::*; use anime_launcher_sdk::sessions::SessionsExt; -use anime_launcher_sdk::genshin::sessions::Sessions; +use anime_launcher_sdk::star_rail::sessions::Sessions; use super::main::PreferencesAppMsg;