CCF_100/suyu-mirror
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu synced 2025-08-31 16:36:34 -05:00
Code Issues Releases Wiki Activity

Merge branch 'dev' into dev-fork

Browse Source
This commit is contained in:
Exverge
2024-03-25 01:27:14 +01:00
parent 2857540817 ba411a17e0
commit f033d7e1e9
10 changed files with 541 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/android/gradlew.bat vendored
View File

@@ -1,4 +1,4 @@
@rem SPDX-FileCopyrightText: 2023 suyu Emulator Project
@rem SPDX-FileCopyrightText: 2023 yuzu Emulator Project
@rem SPDX-License-Identifier: GPL-3.0-or-later
@if "%DEBUG%" == "" @echo off

3
src/suyu/discord_impl.cpp
View File

@@ -24,7 +24,8 @@ DiscordImpl::DiscordImpl(Core::System& system_) : system{system_} {
DiscordEventHandlers handlers{};
// The number is the client ID for suyu, it's used for images and the
// application name
Discord_Initialize("712465656758665259", &handlers, 1, nullptr);
// NOTE: This application is owned by million1156 (million@alyocord.com)
Discord_Initialize("1221314350216646828", &handlers, 1, nullptr);
}
DiscordImpl::~DiscordImpl() {

9
src/suyu/main.cpp
View File

@@ -1756,11 +1756,10 @@ bool GMainWindow::LoadROM(const QString& filename, Service::AM::FrontendAppletPa
}
if (!ContentManager::AreKeysPresent()) {
QMessageBox::warning(this, tr("Derivation Components Missing"),
tr("Encryption keys are missing. "
"In order to use this emulator, "
"you need to provide your own encryption keys "
"in order to play them."));
QMessageBox::warning(
this, tr("Encryption Keys Missing"),
tr("In order to use suyu you need to provide your own encryption keys. "
"You can install them by going to Tools -> Install encryption keys."));
return false;
}
}