diff --git a/.forgejo/workflows/canary.yml b/.forgejo/workflows/canary.yml index cd8f3aa1d..025dc2417 100644 --- a/.forgejo/workflows/canary.yml +++ b/.forgejo/workflows/canary.yml @@ -136,6 +136,7 @@ jobs: uses: actions/create-release@v1 with: name: "Canary ${{ steps.version_info.outputs.build_version }}" + body: "**Full Changelog:** [`${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}`](https://git.ryujinx.app/projects/Ryubing/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }})" repository: "Ryubing/Canary" token: ${{ secrets.RELEASER_TOKEN }} tag_name: ${{ steps.version_info.outputs.build_version }} @@ -198,6 +199,7 @@ jobs: uses: actions/create-release@v1 with: name: "Canary ${{ steps.version_info.outputs.build_version }}" + body: "**Full Changelog:** [`${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}`](https://git.ryujinx.app/projects/Ryubing/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }})" repository: "Ryubing/Canary" token: ${{ secrets.RELEASER_TOKEN }} tag_name: ${{ steps.version_info.outputs.build_version }} @@ -246,4 +248,4 @@ jobs: - name: Advance to the next version run: | - gli increment-version -T ${{ secrets.UPDATE_SERVER_ADMIN_TOKEN }} -c Canary \ No newline at end of file + gli increment-version -T ${{ secrets.UPDATE_SERVER_ADMIN_TOKEN }} -c Canary diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index ed9171f3d..c6da033b1 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -203,8 +203,8 @@ jobs: files: |- publish_ava/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz - create_gitlab_release: - name: Create GitLab Release + post_ci: + name: Post-CI Steps runs-on: ubuntu-24.04 needs: - macos_release diff --git a/Ryujinx.sln b/Ryujinx.sln index deddb97a0..26e96311e 100644 --- a/Ryujinx.sln +++ b/Ryujinx.sln @@ -86,11 +86,11 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{36F870C1-3E5F-485F-B426-F0645AF78751}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig - .github\workflows\build.yml = .github\workflows\build.yml - .github\workflows\canary.yml = .github\workflows\canary.yml + .forgejo\workflows\build.yml = .forgejo\workflows\build.yml + .forgejo\workflows\canary.yml = .forgejo\workflows\canary.yml Directory.Packages.props = Directory.Packages.props Directory.Build.props = Directory.Build.props - .github\workflows\release.yml = .github\workflows\release.yml + .forgejo\workflows\release.yml = .forgejo\workflows\release.yml nuget.config = nuget.config EndProjectSection EndProject diff --git a/assets/Locales/Root.json b/assets/Locales/Root.json index a455a47da..5035d1552 100644 --- a/assets/Locales/Root.json +++ b/assets/Locales/Root.json @@ -15351,28 +15351,28 @@ } }, { - "ID": "AboutGitLabUrlTooltipMessage", + "ID": "AboutForgejoUrlTooltipMessage", "Translations": { "ar_SA": "انقر لفتح صفحة ريوجينكس في غيت هاب في متصفحك الافتراضي.", - "de_DE": "Klicke hier, um die Ryujinx GitLab Seite im Standardbrowser zu öffnen.", - "el_GR": "Κάντε κλικ για να ανοίξετε τη σελίδα Ryujinx GitLab στο προεπιλεγμένο πρόγραμμα περιήγησης.", - "en_US": "Click to open the Ryujinx GitLab page in your default browser.", - "es_ES": "Haz clic para abrir el GitLab de Ryujinx en tu navegador predeterminado.", - "fr_FR": "Cliquez pour ouvrir la page GitLab de Ryujinx dans votre navigateur par défaut.", + "de_DE": "Klicke hier, um die Ryujinx Forgejo Seite im Standardbrowser zu öffnen.", + "el_GR": "Κάντε κλικ για να ανοίξετε τη σελίδα Ryujinx Forgejo στο προεπιλεγμένο πρόγραμμα περιήγησης.", + "en_US": "Click to open the Ryujinx Forgejo page in your default browser.", + "es_ES": "Haz clic para abrir el Forgejo de Ryujinx en tu navegador predeterminado.", + "fr_FR": "Cliquez pour ouvrir la page Forgejo de Ryujinx dans votre navigateur par défaut.", "he_IL": "לחץ כדי לפתוח את דף הגיטהב של ריוג'ינקס בדפדפן ברירת המחדל שלך.", - "it_IT": "Clicca per aprire la pagina GitLab di Ryujinx nel tuo browser predefinito.", - "ja_JP": "クリックするとデフォルトのブラウザで Ryujinx の GitLab ページを開きます.", - "ko_KR": "클릭하면 기본 브라우저에서 Ryujinx GitLab 페이지가 열립니다.", - "no_NO": "Klikk for å åpne Ryujinx GitLab siden i din standardnettleser.", - "pl_PL": "Kliknij, aby otworzyć stronę GitLab Ryujinx w domyślnej przeglądarce.", - "pt_BR": "Clique para abrir a página do GitLab do Ryujinx no seu navegador padrão.", - "ru_RU": "Нажмите, чтобы открыть страницу Ryujinx на GitLab", - "sv_SE": "Klicka för att öppna Ryujinx GitLab-sida i din webbläsare.", - "th_TH": "คลิกเพื่อเปิดหน้า GitLab ของ Ryujinx บนเบราว์เซอร์เริ่มต้นของคุณ", - "tr_TR": "Ryujinx'in GitLab sayfasını varsayılan tarayıcınızda açmak için tıklayın.", - "uk_UA": "Натисніть, щоб відкрити сторінку GitLab Ryujinx у браузері.", - "zh_CN": "在浏览器中打开 Ryujinx 的 GitLab 代码库。", - "zh_TW": "在預設瀏覽器中開啟 Ryujinx 的 GitLab 網頁。" + "it_IT": "Clicca per aprire la pagina Forgejo di Ryujinx nel tuo browser predefinito.", + "ja_JP": "クリックするとデフォルトのブラウザで Ryujinx の Forgejo ページを開きます.", + "ko_KR": "클릭하면 기본 브라우저에서 Ryujinx Forgejo 페이지가 열립니다.", + "no_NO": "Klikk for å åpne Ryujinx Forgejo siden i din standardnettleser.", + "pl_PL": "Kliknij, aby otworzyć stronę Forgejo Ryujinx w domyślnej przeglądarce.", + "pt_BR": "Clique para abrir a página do Forgejo do Ryujinx no seu navegador padrão.", + "ru_RU": "Нажмите, чтобы открыть страницу Ryujinx на Forgejo", + "sv_SE": "Klicka för att öppna Ryujinx Forgejo-sida i din webbläsare.", + "th_TH": "คลิกเพื่อเปิดหน้า Forgejo ของ Ryujinx บนเบราว์เซอร์เริ่มต้นของคุณ", + "tr_TR": "Ryujinx'in Forgejo sayfasını varsayılan tarayıcınızda açmak için tıklayın.", + "uk_UA": "Натисніть, щоб відкрити сторінку Forgejo Ryujinx у браузері.", + "zh_CN": "在浏览器中打开 Ryujinx 的 Forgejo 代码库。", + "zh_TW": "在預設瀏覽器中開啟 Ryujinx 的 Forgejo 網頁。" } }, { @@ -15431,23 +15431,23 @@ "ar_SA": "", "de_DE": "", "el_GR": "", - "en_US": "Ryujinx is an emulator for the Nintendo Switch™ 1.\nGet all the latest news in our Discord.\nDevelopers interested in contributing can find out more on our GitLab or Discord.", - "es_ES": "Ryujinx es un emulador para Nintendo Switch™ 1.\nObtén todas las novedades en nuestro Discord.\nLos desarrolladores interesados en contribuir pueden obtener más información en nuestro GitLab o Discord.", - "fr_FR": "Ryujinx est un émulateur pour la Nintendo Switch™ 1.\nObtenez les dernières nouvelles sur notre Discord.\nLes développeurs souhaitant contribuer peuvent en savoir plus sur notre GitLab ou Discord.", + "en_US": "Ryujinx is an emulator for the Nintendo Switch™ 1.\nGet all the latest news in our Discord.\nDevelopers interested in contributing can find out more on our Forgejo or Discord.", + "es_ES": "Ryujinx es un emulador para Nintendo Switch™ 1.\nObtén todas las novedades en nuestro Discord.\nLos desarrolladores interesados en contribuir pueden obtener más información en nuestro Forgejo o Discord.", + "fr_FR": "Ryujinx est un émulateur pour la Nintendo Switch™ 1.\nObtenez les dernières nouvelles sur notre Discord.\nLes développeurs souhaitant contribuer peuvent en savoir plus sur notre Forgejo ou Discord.", "he_IL": "", - "it_IT": "Ryujinx è un emulatore della console Nintendo Switch™ 1.\nRimani aggiornato sulle ultime novità nel nostro server Discord.\nGli sviluppatori interessati a contribuire possono trovare maggiori informazioni su Discord o sulla nostra pagina GitLab.", + "it_IT": "Ryujinx è un emulatore della console Nintendo Switch™ 1.\nRimani aggiornato sulle ultime novità nel nostro server Discord.\nGli sviluppatori interessati a contribuire possono trovare maggiori informazioni su Discord o sulla nostra pagina Forgejo.", "ja_JP": "", - "ko_KR": "Ryujinx는 Nintendo Switch™ 1용 에뮬레이터입니다.\n모든 최신 소식을 Discord에서 확인하세요.\n기여에 관심이 있는 개발자는 GitLab 또는 Discord에서 자세한 내용을 확인할 수 있습니다.", - "no_NO": "Ryujinx er en emulator for Nintendo Switch™ 1\nVennligst støtt oss på Patreon.\nFå alle de siste nyhetene på vår Twitter eller Discord.\nUtviklere som er interessert i å bidra kan finne ut mer på GitLab eller Discord.", + "ko_KR": "Ryujinx는 Nintendo Switch™ 1용 에뮬레이터입니다.\n모든 최신 소식을 Discord에서 확인하세요.\n기여에 관심이 있는 개발자는 Forgejo 또는 Discord에서 자세한 내용을 확인할 수 있습니다.", + "no_NO": "Ryujinx er en emulator for Nintendo Switch™ 1\nVennligst støtt oss på Patreon.\nFå alle de siste nyhetene på vår Twitter eller Discord.\nUtviklere som er interessert i å bidra kan finne ut mer på Forgejo eller Discord.", "pl_PL": "", - "pt_BR": "Ryujinx é um emulador de Nintendo Switch™ 1.\nReceba todas as últimas notícias em nosso Discord.\nDesenvolvedores interessados em contribuir podem descobrir mais em nosso GitLab ou Discord.", - "ru_RU": "Ryujinx - это эмулятор для Nintendo Switch™ 1.\nПолучайте все последние новости разработки в нашем Discord.\nРазработчики, заинтересованные в участии, могут узнать больше на нашем GitLab или Discord.", - "sv_SE": "Ryujinx är en emulator för Nintendo Switch™ 1.\nFå de senaste nyheterna via vår Discord.\nUtvecklare som är intresserade att bidra kan hitta mer info på vår GitLab eller Discord.", - "th_TH": "Ryujinx เป็นโปรแกรมจำลองสำหรับเครื่อง Nintendo Switch™ 1\nติดตามข่าวสารล่าสุดได้ที่ Discord ของเรา\nนักพัฒนาที่สนใจร่วมพัฒนา สามารถดูข้อมูลเพิ่มเติมได้ทาง GitLab หรือ Discord", + "pt_BR": "Ryujinx é um emulador de Nintendo Switch™ 1.\nReceba todas as últimas notícias em nosso Discord.\nDesenvolvedores interessados em contribuir podem descobrir mais em nosso Forgejo ou Discord.", + "ru_RU": "Ryujinx - это эмулятор для Nintendo Switch™ 1.\nПолучайте все последние новости разработки в нашем Discord.\nРазработчики, заинтересованные в участии, могут узнать больше на нашем Forgejo или Discord.", + "sv_SE": "Ryujinx är en emulator för Nintendo Switch™ 1.\nFå de senaste nyheterna via vår Discord.\nUtvecklare som är intresserade att bidra kan hitta mer info på vår Forgejo eller Discord.", + "th_TH": "Ryujinx เป็นโปรแกรมจำลองสำหรับเครื่อง Nintendo Switch™ 1\nติดตามข่าวสารล่าสุดได้ที่ Discord ของเรา\nนักพัฒนาที่สนใจร่วมพัฒนา สามารถดูข้อมูลเพิ่มเติมได้ทาง Forgejo หรือ Discord", "tr_TR": "", - "uk_UA": "Ryujinx — це емулятор для Nintendo Switch™ 1.\nОстанні новини можна отримати в нашому Discord.\nРозробники, що бажають долучитись до розробки та зробити свій внесок, можуть отримати більше інформації на нашому GitLab або в Discord.", - "zh_CN": "Ryujinx 是一个 Nintendo Switch™ 1 模拟器。\n有兴趣做出贡献的开发者可以在我们的 GitLab 或 Discord 上了解更多信息。\n", - "zh_TW": "Ryujinx 是一款 Nintendo Switch™ 1 模擬器。\n關注我們的 Discord 取得所有最新消息。\n對於有興趣貢獻的開發者，可以在我們的 GitLab 或 Discord 上了解更多資訊。" + "uk_UA": "Ryujinx — це емулятор для Nintendo Switch™ 1.\nОстанні новини можна отримати в нашому Discord.\nРозробники, що бажають долучитись до розробки та зробити свій внесок, можуть отримати більше інформації на нашому Forgejo або в Discord.", + "zh_CN": "Ryujinx 是一个 Nintendo Switch™ 1 模拟器。\n有兴趣做出贡献的开发者可以在我们的 Forgejo 或 Discord 上了解更多信息。\n", + "zh_TW": "Ryujinx 是一款 Nintendo Switch™ 1 模擬器。\n關注我們的 Discord 取得所有最新消息。\n對於有興趣貢獻的開發者，可以在我們的 Forgejo 或 Discord 上了解更多資訊。" } }, { @@ -24901,4 +24901,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/Ryujinx.Common/ReleaseInformation.cs b/src/Ryujinx.Common/ReleaseInformation.cs index 530dc369e..54525278b 100644 --- a/src/Ryujinx.Common/ReleaseInformation.cs +++ b/src/Ryujinx.Common/ReleaseInformation.cs @@ -29,8 +29,8 @@ namespace Ryujinx.Common public static string GetChangelogUrl(Version currentVersion, Version newVersion) => IsCanaryBuild - ? $"https://git.ryujinx.app/ryubing/ryujinx/-/compare/Canary-{currentVersion}...Canary-{newVersion}" - : $"https://git.ryujinx.app/ryubing/ryujinx/-/releases/{newVersion}"; + ? $"https://git.ryujinx.app/projects/Ryubing/compare/Canary-{currentVersion}...Canary-{newVersion}" + : $"https://git.ryujinx.app/projects/Ryubing/releases/tag/{newVersion}"; } diff --git a/src/Ryujinx.Common/SharedConstants.cs b/src/Ryujinx.Common/SharedConstants.cs index 53b6f1350..2c79c3478 100644 --- a/src/Ryujinx.Common/SharedConstants.cs +++ b/src/Ryujinx.Common/SharedConstants.cs @@ -8,12 +8,12 @@ namespace Ryujinx.Common public const string AmiiboTagsUrl = "https://raw.githubusercontent.com/Ryubing/Nfc/refs/heads/main/tags.json"; - public const string FaqWikiUrl = "https://git.ryujinx.app/ryubing/ryujinx/-/wikis/FAQ-&-Troubleshooting"; + public const string FaqWikiUrl = "https://git.ryujinx.app/projects/Ryubing/wiki/FAQ-%26-Troubleshooting"; public const string SetupGuideWikiUrl = - "https://git.ryujinx.app/ryubing/ryujinx/-/wikis/Setup-&-Configuration-Guide"; + "https://git.ryujinx.app/projects/Ryubing/wiki/Setup-%26-Configuration-Guide"; public const string MultiplayerWikiUrl = - "https://git.ryujinx.app/ryubing/ryujinx/-/wikis/Multiplayer-(LDN-Local-Wireless)-Guide"; + "https://git.ryujinx.app/projects/Ryubing/wiki/Multiplayer-(LDN-Local-Wireless)-Guide"; } } diff --git a/src/Ryujinx/Assets/UIImages/Logo_Forgejo.png b/src/Ryujinx/Assets/UIImages/Logo_Forgejo.png new file mode 100644 index 000000000..de736c621 Binary files /dev/null and b/src/Ryujinx/Assets/UIImages/Logo_Forgejo.png differ diff --git a/src/Ryujinx/Assets/UIImages/Logo_GitLab_Dark.png b/src/Ryujinx/Assets/UIImages/Logo_GitLab_Dark.png deleted file mode 100644 index e6fb5ecb5..000000000 Binary files a/src/Ryujinx/Assets/UIImages/Logo_GitLab_Dark.png and /dev/null differ diff --git a/src/Ryujinx/Assets/UIImages/Logo_GitLab_Light.png b/src/Ryujinx/Assets/UIImages/Logo_GitLab_Light.png deleted file mode 100644 index 17a4feefb..000000000 Binary files a/src/Ryujinx/Assets/UIImages/Logo_GitLab_Light.png and /dev/null differ diff --git a/src/Ryujinx/Ryujinx.csproj b/src/Ryujinx/Ryujinx.csproj index 489b2c313..ecbcc7927 100644 --- a/src/Ryujinx/Ryujinx.csproj +++ b/src/Ryujinx/Ryujinx.csproj @@ -169,9 +169,8 @@ - - + diff --git a/src/Ryujinx/Systems/Updater/Updater.cs b/src/Ryujinx/Systems/Updater/Updater.cs index bc45f8ff6..ac168eb03 100644 --- a/src/Ryujinx/Systems/Updater/Updater.cs +++ b/src/Ryujinx/Systems/Updater/Updater.cs @@ -79,7 +79,7 @@ namespace Ryujinx.Ava.Systems { buildSizeClient.DefaultRequestHeaders.Add("Range", "bytes=0-0"); - // GitLab instance is located in Ukraine. Connection times will vary across the world. + // Forgejo instance is located in Ukraine. Connection times will vary across the world. buildSizeClient.Timeout = TimeSpan.FromSeconds(10); HttpResponseMessage message = await buildSizeClient.GetAsync(new Uri(_versionResponse.ArtifactUrl), HttpCompletionOption.ResponseHeadersRead); diff --git a/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs index 47a99d886..b5cff424a 100644 --- a/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs @@ -11,7 +11,7 @@ namespace Ryujinx.Ava.UI.ViewModels { public partial class AboutWindowViewModel : BaseModel, IDisposable { - [ObservableProperty] public partial Bitmap GitLabLogo { get; set; } + [ObservableProperty] public partial Bitmap ForgejoLogo { get; set; } [ObservableProperty] public partial Bitmap DiscordLogo { get; set; } @@ -37,6 +37,7 @@ namespace Ryujinx.Ava.UI.ViewModels } private const string LogoPathFormat = "resm:Ryujinx.Assets.UIImages.Logo_{0}_{1}.png?assembly=Ryujinx"; + private const string UnthemedLogoPathFormat = "resm:Ryujinx.Assets.UIImages.Logo_{0}.png?assembly=Ryujinx"; private void UpdateLogoTheme(string theme) { @@ -46,7 +47,7 @@ namespace Ryujinx.Ava.UI.ViewModels string themeName = isDarkTheme ? "Dark" : "Light"; DiscordLogo = LoadBitmap(LogoPathFormat.Format("Discord", themeName)); - GitLabLogo = LoadBitmap(LogoPathFormat.Format("GitLab", themeName)); + ForgejoLogo = LoadBitmap(UnthemedLogoPathFormat.Format("Forgejo")); } private static Bitmap LoadBitmap(string uri) => new(Avalonia.Platform.AssetLoader.Open(new Uri(uri))); @@ -55,7 +56,7 @@ namespace Ryujinx.Ava.UI.ViewModels { RyujinxApp.ThemeChanged -= Ryujinx_ThemeChanged; - GitLabLogo.Dispose(); + ForgejoLogo.Dispose(); DiscordLogo.Dispose(); GC.SuppressFinalize(this); diff --git a/src/Ryujinx/UI/Views/Dialog/AboutView.axaml b/src/Ryujinx/UI/Views/Dialog/AboutView.axaml index 5700de6b9..d2f6284a2 100644 --- a/src/Ryujinx/UI/Views/Dialog/AboutView.axaml +++ b/src/Ryujinx/UI/Views/Dialog/AboutView.axaml @@ -122,8 +122,8 @@ Click="Button_OnClick" CornerRadius="15" Tag="https://src.ryujinx.app" - ToolTip.Tip="{ext:Locale AboutGitLabUrlTooltipMessage}"> - + ToolTip.Tip="{ext:Locale AboutForgejoUrlTooltipMessage}"> +