Merge pull request #1 from LotP1/fix-line-endings

change line endings from crlf to lf
Merge branch 'Ryubing:master' into master
2024-12-27 20:36:44 +01:00 · 2024-12-27 20:36:23 +01:00 · 2024-12-27 19:23:08 +01:00 · 2024-12-27 02:05:37 -06:00 · 2024-12-27 02:02:43 -06:00 · 2024-12-27 01:59:29 -06:00
3 changed files with 917 additions and 13 deletions
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@@ -21,9 +21,9 @@ env:
  DOTNET_CLI_TELEMETRY_OPTOUT: 1
  RYUJINX_BASE_VERSION: "1.2"
  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "canary"
-  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "Hydra-NX"
+  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "Ryubing"
  RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO: "Ryujinx"
-  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx-Canary"
+  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Canary-Releases"
  RELEASE: 1

 jobs:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ env:
  DOTNET_CLI_TELEMETRY_OPTOUT: 1
  RYUJINX_BASE_VERSION: "1.2"
  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "release"
-  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "GreemDev"
+  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "Ryubing"
  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx"
  RELEASE: 1

--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
Author	SHA1	Message	Date
Daniel Nylander	ec54ac7ecc	Merge pull request #1 from LotP1/fix-line-endings change line endings from crlf to lf	2024-12-27 20:36:44 +01:00
Daniel Nylander	8074bc4b44	Merge branch 'Ryubing:master' into master	2024-12-27 20:36:23 +01:00
LotP1	dbcae110b4	change line endings from crlf to lf	2024-12-27 19:23:08 +01:00
Evan Husted	9eb273a0f7	Org rename (they call me indecisive)	2024-12-27 02:05:37 -06:00
Evan Husted	aeb5172323	Merge branch 'master' into master	2024-12-27 02:02:43 -06:00
Evan Husted	ccddaa77d1	infra: Org	2024-12-27 01:59:29 -06:00
Daniel Nylander	e5e4f0ca6c	Add files via upload	2024-12-27 08:42:57 +01:00
Daniel Nylander	bd63351b0d	Merge branch 'GreemDev:master' into master	2024-12-27 08:42:35 +01:00
Evan Husted	01c2e67334	lol	2024-12-27 01:41:48 -06:00
Daniel Nylander	7eeef2e459	Updated Swedish translation	2024-12-27 08:41:18 +01:00
Daniel Nylander	5ed4c91e94	Merge branch 'GreemDev:master' into master	2024-12-27 08:40:51 +01:00
Daniel Nylander	907c978b35	Merge branch 'GreemDev:master' into master	2024-12-27 08:35:55 +01:00
Daniel Nylander	7740137631	Update locales.json	2024-12-27 08:03:47 +01:00
Daniel Nylander	c42d26c505	Merge branch 'GreemDev:master' into master	2024-12-27 08:03:09 +01:00
Evan Husted	8185df74f9	Revert "metal: Try and see if this lets VSync turn off." This reverts commit `9558b37716`.	2024-12-26 22:44:51 -06:00
Evan Husted	9558b37716	metal: Try and see if this lets VSync turn off.	2024-12-26 22:42:39 -06:00
Daniel Nylander	7759a48c25	Merge branch 'GreemDev:master' into master	2024-12-26 17:31:23 +01:00
Daniel Nylander	dbac783c6e	Updated Swedish translation in new format	2024-12-25 10:43:48 +01:00