Merge branch 'Ryubing:master' into master

fix GetMappedStateSnapshot
UI: Fix crashing when opening an Applet or application with no existing icon
2024-12-30 22:04:08 +08:00 · 2024-12-30 22:01:21 +08:00 · 2024-12-30 02:32:44 -06:00 · 2024-12-30 02:06:24 -06:00 · 2024-12-30 02:05:40 -06:00 · 2024-12-29 18:37:03 +08:00
16 changed files with 1146 additions and 388 deletions
--- a/Ryujinx.sln
+++ b/Ryujinx.sln
@@ -0,0 +1,270 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32228.430
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Tests", "src\Ryujinx.Tests\Ryujinx.Tests.csproj", "{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Tests.Unicorn", "src\Ryujinx.Tests.Unicorn\Ryujinx.Tests.Unicorn.csproj", "{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.HLE", "src\Ryujinx.HLE\Ryujinx.HLE.csproj", "{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.ShaderTools", "src\Ryujinx.ShaderTools\Ryujinx.ShaderTools.csproj", "{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Common", "src\Ryujinx.Common\Ryujinx.Common.csproj", "{5FD4E4F6-8928-4B3C-BE07-28A675C17226}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ARMeilleure", "src\ARMeilleure\ARMeilleure.csproj", "{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Gpu", "src\Ryujinx.Graphics.Gpu\Ryujinx.Graphics.Gpu.csproj", "{ADA7EA87-0D63-4D97-9433-922A2124401F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.GAL", "src\Ryujinx.Graphics.GAL\Ryujinx.Graphics.GAL.csproj", "{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.OpenGL", "src\Ryujinx.Graphics.OpenGL\Ryujinx.Graphics.OpenGL.csproj", "{9558FB96-075D-4219-8FFF-401979DC0B69}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Texture", "src\Ryujinx.Graphics.Texture\Ryujinx.Graphics.Texture.csproj", "{E1B1AD28-289D-47B7-A106-326972240207}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Shader", "src\Ryujinx.Graphics.Shader\Ryujinx.Graphics.Shader.csproj", "{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Nvdec", "src\Ryujinx.Graphics.Nvdec\Ryujinx.Graphics.Nvdec.csproj", "{85A0FA56-DC01-4A42-8808-70DAC76BD66D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio", "src\Ryujinx.Audio\Ryujinx.Audio.csproj", "{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Memory", "src\Ryujinx.Memory\Ryujinx.Memory.csproj", "{A5E6C691-9E22-4263-8F40-42F002CE66BE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Tests.Memory", "src\Ryujinx.Tests.Memory\Ryujinx.Tests.Memory.csproj", "{D1CC5322-7325-4F6B-9625-194B30BE1296}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Cpu", "src\Ryujinx.Cpu\Ryujinx.Cpu.csproj", "{3DF35E3D-D844-4399-A9A1-A9E923264C17}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Device", "src\Ryujinx.Graphics.Device\Ryujinx.Graphics.Device.csproj", "{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Host1x", "src\Ryujinx.Graphics.Host1x\Ryujinx.Graphics.Host1x.csproj", "{C35F1536-7DE5-4F9D-9604-B5B4E1561947}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Nvdec.Vp9", "src\Ryujinx.Graphics.Nvdec.Vp9\Ryujinx.Graphics.Nvdec.Vp9.csproj", "{B9AECA11-E248-4886-A10B-81B631CAAF29}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Vic", "src\Ryujinx.Graphics.Vic\Ryujinx.Graphics.Vic.csproj", "{81BB2C11-9408-4EA3-822E-42987AF54429}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Video", "src\Ryujinx.Graphics.Video\Ryujinx.Graphics.Video.csproj", "{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio.Backends.OpenAL", "src\Ryujinx.Audio.Backends.OpenAL\Ryujinx.Audio.Backends.OpenAL.csproj", "{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio.Backends.SoundIo", "src\Ryujinx.Audio.Backends.SoundIo\Ryujinx.Audio.Backends.SoundIo.csproj", "{716364DE-B988-41A6-BAB4-327964266ECC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Input", "src\Ryujinx.Input\Ryujinx.Input.csproj", "{C16F112F-38C3-40BC-9F5F-4791112063D6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Input.SDL2", "src\Ryujinx.Input.SDL2\Ryujinx.Input.SDL2.csproj", "{DFAB6F2D-B9BF-4AFF-B22B-7684A328EBA3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.SDL2.Common", "src\Ryujinx.SDL2.Common\Ryujinx.SDL2.Common.csproj", "{2D5D3A1D-5730-4648-B0AB-06C53CB910C0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio.Backends.SDL2", "src\Ryujinx.Audio.Backends.SDL2\Ryujinx.Audio.Backends.SDL2.csproj", "{D99A395A-8569-4DB0-B336-900647890052}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Nvdec.FFmpeg", "src\Ryujinx.Graphics.Nvdec.FFmpeg\Ryujinx.Graphics.Nvdec.FFmpeg.csproj", "{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx", "src\Ryujinx\Ryujinx.csproj", "{7C1B2721-13DA-4B62-B046-C626605ECCE6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon.Generators", "src\Ryujinx.Horizon.Generators\Ryujinx.Horizon.Generators.csproj", "{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Vulkan", "src\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj", "{D4D09B08-D580-4D69-B886-C35D2853F6C8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spv.Generator", "src\Spv.Generator\Spv.Generator.csproj", "{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.UI.LocaleGenerator", "src\Ryujinx.UI.LocaleGenerator\Ryujinx.UI.LocaleGenerator.csproj", "{77D01AD9-2C98-478E-AE1D-8F7100738FB4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon.Common", "src\Ryujinx.Horizon.Common\Ryujinx.Horizon.Common.csproj", "{77F96ECE-4952-42DB-A528-DED25572A573}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon", "src\Ryujinx.Horizon\Ryujinx.Horizon.csproj", "{AF34127A-3A92-43E5-8496-14960A50B1F1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon.Kernel.Generators", "src\Ryujinx.Horizon.Kernel.Generators\Ryujinx.Horizon.Kernel.Generators.csproj", "{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.HLE.Generators", "src\Ryujinx.HLE.Generators\Ryujinx.HLE.Generators.csproj", "{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics.Metal", "src\Ryujinx.Graphics.Metal\Ryujinx.Graphics.Metal.csproj", "{C08931FA-1191-417A-864F-3882D93E683B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E} = {A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.BuildValidationTasks", "src\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj", "{4A89A234-4F19-497D-A576-DDE8CDFC5B22}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics.Metal.SharpMetalExtensions", "src/Ryujinx.Graphics.Metal.SharpMetalExtensions\Ryujinx.Graphics.Metal.SharpMetalExtensions.csproj", "{81EA598C-DBA1-40B0-8DA4-4796B78F2037}"
+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
+		Directory.Packages.props = Directory.Packages.props
+		.github\workflows\release.yml = .github\workflows\release.yml
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EBB55AEA-C7D7-4DEB-BF96-FA1789E225E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D8F72938-78EF-4E8C-BAFE-531C9C3C8F15}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3AB294D0-2230-468F-9EB3-BDFCAEAE99A5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ADA7EA87-0D63-4D97-9433-922A2124401F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9558FB96-075D-4219-8FFF-401979DC0B69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9558FB96-075D-4219-8FFF-401979DC0B69}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9558FB96-075D-4219-8FFF-401979DC0B69}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9558FB96-075D-4219-8FFF-401979DC0B69}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1B1AD28-289D-47B7-A106-326972240207}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1B1AD28-289D-47B7-A106-326972240207}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1B1AD28-289D-47B7-A106-326972240207}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E1B1AD28-289D-47B7-A106-326972240207}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{806ACF6D-90B0-45D0-A1AC-5F220F3B3985}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A5E6C691-9E22-4263-8F40-42F002CE66BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D1CC5322-7325-4F6B-9625-194B30BE1296}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3DF35E3D-D844-4399-A9A1-A9E923264C17}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C3002C3C-7B09-4FE7-894A-372EDA22FC6E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C35F1536-7DE5-4F9D-9604-B5B4E1561947}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9AECA11-E248-4886-A10B-81B631CAAF29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81BB2C11-9408-4EA3-822E-42987AF54429}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81BB2C11-9408-4EA3-822E-42987AF54429}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81BB2C11-9408-4EA3-822E-42987AF54429}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81BB2C11-9408-4EA3-822E-42987AF54429}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD4A2C14-8E3D-4957-ABBE-3C38897B3E2D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0BE11899-DF2D-4BDE-B9EE-2489E8D35E7D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{716364DE-B988-41A6-BAB4-327964266ECC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{716364DE-B988-41A6-BAB4-327964266ECC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{716364DE-B988-41A6-BAB4-327964266ECC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{716364DE-B988-41A6-BAB4-327964266ECC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C16F112F-38C3-40BC-9F5F-4791112063D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DFAB6F2D-B9BF-4AFF-B22B-7684A328EBA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DFAB6F2D-B9BF-4AFF-B22B-7684A328EBA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DFAB6F2D-B9BF-4AFF-B22B-7684A328EBA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DFAB6F2D-B9BF-4AFF-B22B-7684A328EBA3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D5D3A1D-5730-4648-B0AB-06C53CB910C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D5D3A1D-5730-4648-B0AB-06C53CB910C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D5D3A1D-5730-4648-B0AB-06C53CB910C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D5D3A1D-5730-4648-B0AB-06C53CB910C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D99A395A-8569-4DB0-B336-900647890052}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D99A395A-8569-4DB0-B336-900647890052}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D99A395A-8569-4DB0-B336-900647890052}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D99A395A-8569-4DB0-B336-900647890052}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7C1B2721-13DA-4B62-B046-C626605ECCE6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6AE2A5E8-4C5A-48B9-997B-E1455C0355C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D4D09B08-D580-4D69-B886-C35D2853F6C8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2BCB3D7A-38C0-4FE7-8FDA-374C6AD56D0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77D01AD9-2C98-478E-AE1D-8F7100738FB4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77F96ECE-4952-42DB-A528-DED25572A573}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77F96ECE-4952-42DB-A528-DED25572A573}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77F96ECE-4952-42DB-A528-DED25572A573}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77F96ECE-4952-42DB-A528-DED25572A573}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF34127A-3A92-43E5-8496-14960A50B1F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C08931FA-1191-417A-864F-3882D93E683B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C08931FA-1191-417A-864F-3882D93E683B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C08931FA-1191-417A-864F-3882D93E683B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C08931FA-1191-417A-864F-3882D93E683B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {110169B3-3328-4730-8AB0-BA05BEF75C1A}
+	EndGlobalSection
+EndGlobal
--- a/Ryujinx.slnx
+++ b/Ryujinx.slnx
@@ -1,52 +0,0 @@
-<Solution>
-  <Folder Name="/Solution Items/">
-    <File Path=".editorconfig" />
-    <File Path=".github\workflows\build.yml" />
-    <File Path=".github\workflows\canary.yml" />
-    <File Path="Directory.Packages.props" />
-    <File Path=".github\workflows\release.yml" />
-  </Folder>
-  <Project Path="src/Ryujinx.Graphics.Metal.SharpMetalExtensions\Ryujinx.Graphics.Metal.SharpMetalExtensions.csproj" Type="Classic C#" />
-  <Project Path="src\ARMeilleure\ARMeilleure.csproj" />
-  <Project Path="src\Ryujinx.Audio.Backends.OpenAL\Ryujinx.Audio.Backends.OpenAL.csproj" />
-  <Project Path="src\Ryujinx.Audio.Backends.SDL2\Ryujinx.Audio.Backends.SDL2.csproj" />
-  <Project Path="src\Ryujinx.Audio.Backends.SoundIo\Ryujinx.Audio.Backends.SoundIo.csproj" />
-  <Project Path="src\Ryujinx.Audio\Ryujinx.Audio.csproj" />
-  <Project Path="src\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj" Type="Classic C#">
-    <Configuration Solution="Debug|Any CPU" Project="Debug|Any CPU|NoBuild" />
-    <Configuration Solution="Release|Any CPU" Project="Release|Any CPU|NoBuild" />
-  </Project>
-  <Project Path="src\Ryujinx.Common\Ryujinx.Common.csproj" />
-  <Project Path="src\Ryujinx.Cpu\Ryujinx.Cpu.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Device\Ryujinx.Graphics.Device.csproj" />
-  <Project Path="src\Ryujinx.Graphics.GAL\Ryujinx.Graphics.GAL.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Gpu\Ryujinx.Graphics.Gpu.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Host1x\Ryujinx.Graphics.Host1x.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Metal\Ryujinx.Graphics.Metal.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Nvdec.FFmpeg\Ryujinx.Graphics.Nvdec.FFmpeg.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Nvdec.Vp9\Ryujinx.Graphics.Nvdec.Vp9.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Nvdec\Ryujinx.Graphics.Nvdec.csproj" />
-  <Project Path="src\Ryujinx.Graphics.OpenGL\Ryujinx.Graphics.OpenGL.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Shader\Ryujinx.Graphics.Shader.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Texture\Ryujinx.Graphics.Texture.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Vic\Ryujinx.Graphics.Vic.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Video\Ryujinx.Graphics.Video.csproj" />
-  <Project Path="src\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj" />
-  <Project Path="src\Ryujinx.HLE.Generators\Ryujinx.HLE.Generators.csproj" />
-  <Project Path="src\Ryujinx.HLE\Ryujinx.HLE.csproj" />
-  <Project Path="src\Ryujinx.Horizon.Common\Ryujinx.Horizon.Common.csproj" />
-  <Project Path="src\Ryujinx.Horizon.Generators\Ryujinx.Horizon.Generators.csproj" />
-  <Project Path="src\Ryujinx.Horizon.Kernel.Generators\Ryujinx.Horizon.Kernel.Generators.csproj" />
-  <Project Path="src\Ryujinx.Horizon\Ryujinx.Horizon.csproj" />
-  <Project Path="src\Ryujinx.Input.SDL2\Ryujinx.Input.SDL2.csproj" />
-  <Project Path="src\Ryujinx.Input\Ryujinx.Input.csproj" />
-  <Project Path="src\Ryujinx.Memory\Ryujinx.Memory.csproj" />
-  <Project Path="src\Ryujinx.SDL2.Common\Ryujinx.SDL2.Common.csproj" />
-  <Project Path="src\Ryujinx.ShaderTools\Ryujinx.ShaderTools.csproj" />
-  <Project Path="src\Ryujinx.Tests.Memory\Ryujinx.Tests.Memory.csproj" />
-  <Project Path="src\Ryujinx.Tests.Unicorn\Ryujinx.Tests.Unicorn.csproj" />
-  <Project Path="src\Ryujinx.Tests\Ryujinx.Tests.csproj" />
-  <Project Path="src\Ryujinx.UI.LocaleGenerator\Ryujinx.UI.LocaleGenerator.csproj" />
-  <Project Path="src\Ryujinx\Ryujinx.csproj" />
-  <Project Path="src\Spv.Generator\Spv.Generator.csproj" />
-</Solution>
--- a/src/Ryujinx.BuildValidationTasks/LocaleValidationTask.cs
+++ b/src/Ryujinx.BuildValidationTasks/LocaleValidationTask.cs
@@ -0,0 +1,73 @@
+using System;
+using Microsoft.Build.Utilities;
+using System.Collections.Generic;
+using System.Linq;
+using System.IO;
+using Newtonsoft.Json;
+using Microsoft.Build.Framework;
+
+namespace Ryujinx.BuildValidationTasks
+{
+    public class LocaleValidationTask : Task
+    {
+        public override bool Execute()
+        {
+            string path = System.Reflection.Assembly.GetExecutingAssembly().Location;
+
+            if (path.Split(["src"], StringSplitOptions.None).Length == 1)
+            {
+                //i assume that we are in a build directory in the solution dir
+                path = new FileInfo(path).Directory!.Parent!.GetDirectories("src")[0].GetDirectories("Ryujinx")[0].GetDirectories("Assets")[0].GetFiles("locales.json")[0].FullName;
+            }
+            else
+            {
+                path = path.Split(["src"], StringSplitOptions.None)[0];
+                path = new FileInfo(path).Directory!.GetDirectories("src")[0].GetDirectories("Ryujinx")[0].GetDirectories("Assets")[0].GetFiles("locales.json")[0].FullName;
+            }
+
+            string data;
+
+            using (StreamReader sr = new(path))
+            {
+                data = sr.ReadToEnd();
+            }
+
+            LocalesJson json = JsonConvert.DeserializeObject<LocalesJson>(data);
+
+            for (int i = 0; i < json.Locales.Count; i++)
+            {
+                LocalesEntry locale = json.Locales[i];
+
+                foreach (string langCode in json.Languages.Where(it => !locale.Translations.ContainsKey(it)))
+                {
+                    locale.Translations.Add(langCode, string.Empty);
+                    Log.LogMessage(MessageImportance.High, $"Added '{langCode}' to Locale '{locale.ID}'");
+                }
+
+                locale.Translations = locale.Translations.OrderBy(pair => pair.Key).ToDictionary(pair => pair.Key, pair => pair.Value);
+                json.Locales[i] = locale;
+            }
+
+            string jsonString = JsonConvert.SerializeObject(json, Formatting.Indented);
+
+            using (StreamWriter sw = new(path))
+            {
+                sw.Write(jsonString);
+            }
+
+            return true;
+        }
+
+        struct LocalesJson
+        {
+            public List<string> Languages { get; set; }
+            public List<LocalesEntry> Locales { get; set; }
+        }
+
+        struct LocalesEntry
+        {
+            public string ID { get; set; }
+            public Dictionary<string, string> Translations { get; set; }
+        }
+    }
+}
--- a/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs
+++ b/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs
@@ -1,117 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.IO;
-using System.Text.Json;
-using System.Text.Encodings.Web;
-
-namespace Ryujinx.BuildValidationTasks
-{
-    public class LocalesValidationTask : ValidationTask
-    {
-        public LocalesValidationTask() { }
-
-        public bool Execute(string projectPath, bool isGitRunner)
-        {
-            Console.WriteLine("Running Locale Validation Task...");
-
-            string path = projectPath + "src/Ryujinx/Assets/locales.json";
-            string data;
-
-            using (StreamReader sr = new(path))
-            {
-                data = sr.ReadToEnd();
-            }
-
-            LocalesJson json;
-
-            if (isGitRunner && data.Contains("\r\n"))
-                throw new FormatException("locales.json is using CRLF line endings! It should be using LF line endings, build locally to fix...");
-
-            try
-            {
-                json = JsonSerializer.Deserialize<LocalesJson>(data);
-
-            }
-            catch (JsonException e)
-            {
-                throw new JsonException(e.Message); //shorter and easier stacktrace
-            }
-
-
-
-            bool encounteredIssue = false;
-
-            for (int i = 0; i < json.Locales.Count; i++)
-            {
-                LocalesEntry locale = json.Locales[i];
-
-                foreach (string langCode in json.Languages.Where(lang => !locale.Translations.ContainsKey(lang)))
-                {
-                    encounteredIssue = true;
-
-                    if (!isGitRunner)
-                    {
-                        locale.Translations.Add(langCode, string.Empty);
-                        Console.WriteLine($"Added '{langCode}' to Locale '{locale.ID}'");
-                    }
-                    else
-                    {
-                        Console.WriteLine($"Missing '{langCode}' in Locale '{locale.ID}'!");
-                    }
-                }
-
-                foreach (string langCode in json.Languages.Where(lang => locale.Translations.ContainsKey(lang) && lang != "en_US" && locale.Translations[lang] == locale.Translations["en_US"]))
-                {
-                    encounteredIssue = true;
-
-                    if (!isGitRunner)
-                    {
-                        locale.Translations[langCode] = string.Empty;
-                        Console.WriteLine($"Lanugage '{langCode}' is a duplicate of en_US in Locale '{locale.ID}'! Resetting it...");
-                    }
-                    else
-                    {
-                        Console.WriteLine($"Lanugage '{langCode}' is a duplicate of en_US in Locale '{locale.ID}'!");
-                    }
-                }
-
-                locale.Translations = locale.Translations.OrderBy(pair => pair.Key).ToDictionary(pair => pair.Key, pair => pair.Value);
-                json.Locales[i] = locale;
-            }
-
-            if (isGitRunner && encounteredIssue)
-                throw new JsonException("1 or more locales are invalid!");
-
-            JsonSerializerOptions jsonOptions = new JsonSerializerOptions()
-            {
-                WriteIndented = true,
-                NewLine = "\n",
-                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
-            };
-
-            string jsonString = JsonSerializer.Serialize(json, jsonOptions);
-
-            using (StreamWriter sw = new(path))
-            {
-                sw.Write(jsonString);
-            }
-
-            Console.WriteLine("Finished Locale Validation Task!");
-
-            return true;
-        }
-
-        struct LocalesJson
-        {
-            public List<string> Languages { get; set; }
-            public List<LocalesEntry> Locales { get; set; }
-        }
-
-        struct LocalesEntry
-        {
-            public string ID { get; set; }
-            public Dictionary<string, string> Translations { get; set; }
-        }
-    }
-}
--- a/src/Ryujinx.BuildValidationTasks/Program.cs
+++ b/src/Ryujinx.BuildValidationTasks/Program.cs
@@ -1,37 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-
-namespace Ryujinx.BuildValidationTasks
-{
-    public class Program
-    {
-        static void Main(string[] args)
-        {
-            // Display the number of command line arguments.
-            if (args.Length == 0)
-                throw new ArgumentException("Error: too few arguments!");
-
-            string path = args[0];
-
-            if (string.IsNullOrEmpty(path))
-                throw new ArgumentException("Error: path is null or empty!");
-
-            if (!Path.Exists(path))
-                throw new FileLoadException($"path {{{path}}} does not exist!");
-
-            path = Path.GetFullPath(path);
-
-            if (!Directory.GetDirectories(path).Contains($"{path}src"))
-                throw new FileLoadException($"path {{{path}}} is not a valid ryujinx project!");
-
-            bool isGitRunner = path.Contains("runner") || path.Contains("D:\\a\\Ryujinx\\Ryujinx");
-            if (isGitRunner)
-                Console.WriteLine("Is Git Runner!");
-
-            // Run tasks
-            // Pass extra info needed in the task constructors
-            new LocalesValidationTask().Execute(path, isGitRunner);
-        }
-    }
-}
--- a/src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj
+++ b/src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj
@@ -1,16 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
  </PropertyGroup>

-  <Target Name="PostBuildTarget" AfterTargets="AfterBuild">
-    <Message Text="Running Validation Project" Importance="high" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Build.Utilities.Core" />
+    <PackageReference Include="Newtonsoft.Json" />
+  </ItemGroup>

-    <Exec WorkingDirectory="$(ProjectDir)bin\Debug\$(TargetFramework)\"
-      Command="dotnet Ryujinx.BuildValidationTasks.dll &quot;$(ProjectDir)..\..\\&quot;" 
-      ConsoleToMsBuild="true"
-      />
+  <UsingTask TaskName="Ryujinx.BuildValidationTasks.LocaleValidationTask" TaskFactory="TaskHostFactory" AssemblyFile="$(OutDir)Ryujinx.BuildValidationTasks.dll" />
+
+  <Target Name="LocalesJsonValidation" AfterTargets="AfterRebuild">
+    <LocaleValidationTask />
  </Target>

-</Project>
+</Project>
--- a/src/Ryujinx.BuildValidationTasks/ValidationTask.cs
+++ b/src/Ryujinx.BuildValidationTasks/ValidationTask.cs
@@ -1,7 +0,0 @@
-namespace Ryujinx.BuildValidationTasks
-{
-    public interface ValidationTask
-    {
-        public bool Execute(string projectPath, bool isGitRunner);
-    }
-}
--- a/src/Ryujinx.Input.SDL2/SDL2GamepadDriver.cs
+++ b/src/Ryujinx.Input.SDL2/SDL2GamepadDriver.cs
@@ -1,3 +1,4 @@
+using Ryujinx.Common.Logging;
 using Ryujinx.SDL2.Common;
 using System;
 using System.Collections.Generic;
@@ -36,6 +37,7 @@ namespace Ryujinx.Input.SDL2
            SDL2Driver.Instance.Initialize();
            SDL2Driver.Instance.OnJoyStickConnected += HandleJoyStickConnected;
            SDL2Driver.Instance.OnJoystickDisconnected += HandleJoyStickDisconnected;
+            SDL2Driver.Instance.OnJoyBatteryUpdated += HandleJoyBatteryUpdated;

            // Add already connected gamepads
            int numJoysticks = SDL_NumJoysticks();
@@ -83,19 +85,30 @@ namespace Ryujinx.Input.SDL2

        private void HandleJoyStickDisconnected(int joystickInstanceId)
        {
+            bool joyConPairDisconnected = false;
            if (!_gamepadsInstanceIdsMapping.Remove(joystickInstanceId, out string id))
                return;

            lock (_lock)
            {
                _gamepadsIds.Remove(id);
+                if (!SDL2JoyConPair.IsCombinable(_gamepadsIds))
+                {
+                    _gamepadsIds.Remove(SDL2JoyConPair.Id);
+                    joyConPairDisconnected = true;
+                }
            }

            OnGamepadDisconnected?.Invoke(id);
+            if (joyConPairDisconnected)
+            {
+                OnGamepadDisconnected?.Invoke(SDL2JoyConPair.Id);
+            }
        }

        private void HandleJoyStickConnected(int joystickDeviceId, int joystickInstanceId)
        {
+            bool joyConPairConnected = false;
            if (SDL_IsGameController(joystickDeviceId) == SDL_bool.SDL_TRUE)
            {
                if (_gamepadsInstanceIdsMapping.ContainsKey(joystickInstanceId))
@@ -120,13 +133,29 @@ namespace Ryujinx.Input.SDL2
                            _gamepadsIds.Insert(joystickDeviceId, id);
                        else
                            _gamepadsIds.Add(id);
+                        if (SDL2JoyConPair.IsCombinable(_gamepadsIds))
+                        {
+                            _gamepadsIds.Remove(SDL2JoyConPair.Id);
+                            _gamepadsIds.Add(SDL2JoyConPair.Id);
+                            joyConPairConnected = true;
+                        }
                    }

                    OnGamepadConnected?.Invoke(id);
+                    if (joyConPairConnected)
+                    {
+                        OnGamepadConnected?.Invoke(SDL2JoyConPair.Id);
+                    }
                }
            }
        }

+        private void HandleJoyBatteryUpdated(int joystickDeviceId, SDL_JoystickPowerLevel powerLevel)
+        {
+            Logger.Info?.Print(LogClass.Hid,
+                $"{SDL_GameControllerNameForIndex(joystickDeviceId)} power level: {powerLevel}");
+        }
+
        protected virtual void Dispose(bool disposing)
        {
            if (disposing)
@@ -157,6 +186,14 @@ namespace Ryujinx.Input.SDL2

        public IGamepad GetGamepad(string id)
        {
+            if (id == SDL2JoyConPair.Id)
+            {
+                lock (_lock)
+                {
+                    return SDL2JoyConPair.GetGamepad(_gamepadsIds);
+                }
+            }
+
            int joystickIndex = GetJoystickIndexByGamepadId(id);

            if (joystickIndex == -1)
@@ -165,12 +202,16 @@ namespace Ryujinx.Input.SDL2
            }

            nint gamepadHandle = SDL_GameControllerOpen(joystickIndex);
-
            if (gamepadHandle == nint.Zero)
            {
                return null;
            }

+            if (SDL_GameControllerName(gamepadHandle).StartsWith(SDL2JoyCon.Prefix))
+            {
+                return new SDL2JoyCon(gamepadHandle, id);    
+            }
+
            return new SDL2Gamepad(gamepadHandle, id);
        }
    }
--- a/src/Ryujinx.Input.SDL2/SDL2JoyCon.cs
+++ b/src/Ryujinx.Input.SDL2/SDL2JoyCon.cs
@@ -0,0 +1,409 @@
+using Ryujinx.Common.Configuration.Hid;
+using Ryujinx.Common.Configuration.Hid.Controller;
+using Ryujinx.Common.Logging;
+using System;
+using System.Collections.Generic;
+using System.Numerics;
+using System.Threading;
+using static SDL2.SDL;
+
+namespace Ryujinx.Input.SDL2
+{
+    internal class SDL2JoyCon : IGamepad
+    {
+        private bool HasConfiguration => _configuration != null;
+
+        private readonly record struct ButtonMappingEntry(GamepadButtonInputId To, GamepadButtonInputId From)
+        {
+            public bool IsValid => To is not GamepadButtonInputId.Unbound && From is not GamepadButtonInputId.Unbound;
+        }
+
+        private StandardControllerInputConfig _configuration;
+
+        private readonly Dictionary<GamepadButtonInputId,SDL_GameControllerButton> _leftButtonsDriverMapping = new()
+        {
+            { GamepadButtonInputId.LeftStick , SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_LEFTSTICK },
+             {GamepadButtonInputId.DpadUp ,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_Y},
+             {GamepadButtonInputId.DpadDown ,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_A},
+             {GamepadButtonInputId.DpadLeft ,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_B},
+             {GamepadButtonInputId.DpadRight ,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_X},
+             {GamepadButtonInputId.Minus ,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_START},
+             {GamepadButtonInputId.LeftShoulder,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_PADDLE2},
+             {GamepadButtonInputId.LeftTrigger,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_PADDLE4},
+             {GamepadButtonInputId.SingleRightTrigger0,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_RIGHTSHOULDER},
+             {GamepadButtonInputId.SingleLeftTrigger0,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_LEFTSHOULDER},
+        };
+        private readonly Dictionary<GamepadButtonInputId,SDL_GameControllerButton> _rightButtonsDriverMapping = new()
+        {
+             {GamepadButtonInputId.RightStick,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_LEFTSTICK},
+             {GamepadButtonInputId.A,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_B},
+             {GamepadButtonInputId.B,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_Y},
+             {GamepadButtonInputId.X,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_A},
+             {GamepadButtonInputId.Y,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_X},
+             {GamepadButtonInputId.Plus,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_START},
+             {GamepadButtonInputId.RightShoulder,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_PADDLE1},
+             {GamepadButtonInputId.RightTrigger,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_PADDLE3},
+             {GamepadButtonInputId.SingleRightTrigger1,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_RIGHTSHOULDER},
+             {GamepadButtonInputId.SingleLeftTrigger1,SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_LEFTSHOULDER}
+        };
+
+        private readonly Dictionary<GamepadButtonInputId, SDL_GameControllerButton> _buttonsDriverMapping;
+        private readonly Lock _userMappingLock = new();
+
+        private readonly List<ButtonMappingEntry> _buttonsUserMapping;
+
+        private readonly StickInputId[] _stickUserMapping = new StickInputId[(int)StickInputId.Count]
+        {
+            StickInputId.Unbound, StickInputId.Left, StickInputId.Right,
+        };
+
+        public GamepadFeaturesFlag Features { get; }
+
+        private nint _gamepadHandle;
+
+        private enum JoyConType
+        {
+            Left, Right
+        }
+
+        public const string Prefix = "Nintendo Switch Joy-Con";
+        public const string LeftName = "Nintendo Switch Joy-Con (L)";
+        public const string RightName = "Nintendo Switch Joy-Con (R)";
+
+        private readonly JoyConType _joyConType;
+
+        public SDL2JoyCon(nint gamepadHandle, string driverId)
+        {
+            _gamepadHandle = gamepadHandle;
+            _buttonsUserMapping = new List<ButtonMappingEntry>(10);
+
+            Name = SDL_GameControllerName(_gamepadHandle);
+            Id = driverId;
+            Features = GetFeaturesFlag();
+
+            // Enable motion tracking
+            if (Features.HasFlag(GamepadFeaturesFlag.Motion))
+            {
+                if (SDL_GameControllerSetSensorEnabled(_gamepadHandle, SDL_SensorType.SDL_SENSOR_ACCEL,
+                        SDL_bool.SDL_TRUE) != 0)
+                {
+                    Logger.Error?.Print(LogClass.Hid,
+                        $"Could not enable data reporting for SensorType {SDL_SensorType.SDL_SENSOR_ACCEL}.");
+                }
+
+                if (SDL_GameControllerSetSensorEnabled(_gamepadHandle, SDL_SensorType.SDL_SENSOR_GYRO,
+                        SDL_bool.SDL_TRUE) != 0)
+                {
+                    Logger.Error?.Print(LogClass.Hid,
+                        $"Could not enable data reporting for SensorType {SDL_SensorType.SDL_SENSOR_GYRO}.");
+                }
+            }
+
+            switch (Name)
+            {
+                case LeftName:
+                    {
+                        _buttonsDriverMapping = _leftButtonsDriverMapping;
+                        _joyConType = JoyConType.Left;
+                        break;
+                    }
+                case RightName:
+                    {
+                        _buttonsDriverMapping = _rightButtonsDriverMapping;
+                        _joyConType = JoyConType.Right;
+                        break;
+                    }
+            }
+        }
+
+        private GamepadFeaturesFlag GetFeaturesFlag()
+        {
+            GamepadFeaturesFlag result = GamepadFeaturesFlag.None;
+
+            if (SDL_GameControllerHasSensor(_gamepadHandle, SDL_SensorType.SDL_SENSOR_ACCEL) == SDL_bool.SDL_TRUE &&
+                SDL_GameControllerHasSensor(_gamepadHandle, SDL_SensorType.SDL_SENSOR_GYRO) == SDL_bool.SDL_TRUE)
+            {
+                result |= GamepadFeaturesFlag.Motion;
+            }
+
+            int error = SDL_GameControllerRumble(_gamepadHandle, 0, 0, 100);
+
+            if (error == 0)
+            {
+                result |= GamepadFeaturesFlag.Rumble;
+            }
+
+            return result;
+        }
+
+        public string Id { get; }
+        public string Name { get; }
+        public bool IsConnected => SDL_GameControllerGetAttached(_gamepadHandle) == SDL_bool.SDL_TRUE;
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing && _gamepadHandle != nint.Zero)
+            {
+                SDL_GameControllerClose(_gamepadHandle);
+
+                _gamepadHandle = nint.Zero;
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+        }
+
+
+        public void SetTriggerThreshold(float triggerThreshold)
+        {
+
+        }
+
+        public void Rumble(float lowFrequency, float highFrequency, uint durationMs)
+        {
+            if (!Features.HasFlag(GamepadFeaturesFlag.Rumble))
+                return;
+
+            ushort lowFrequencyRaw = (ushort)(lowFrequency * ushort.MaxValue);
+            ushort highFrequencyRaw = (ushort)(highFrequency * ushort.MaxValue);
+
+            if (durationMs == uint.MaxValue)
+            {
+                if (SDL_GameControllerRumble(_gamepadHandle, lowFrequencyRaw, highFrequencyRaw, SDL_HAPTIC_INFINITY) !=
+                    0)
+                    Logger.Error?.Print(LogClass.Hid, "Rumble is not supported on this game controller.");
+            }
+            else if (durationMs > SDL_HAPTIC_INFINITY)
+            {
+                Logger.Error?.Print(LogClass.Hid, $"Unsupported rumble duration {durationMs}");
+            }
+            else
+            {
+                if (SDL_GameControllerRumble(_gamepadHandle, lowFrequencyRaw, highFrequencyRaw, durationMs) != 0)
+                    Logger.Error?.Print(LogClass.Hid, "Rumble is not supported on this game controller.");
+            }
+        }
+
+        public Vector3 GetMotionData(MotionInputId inputId)
+        {
+            SDL_SensorType sensorType = inputId switch
+            {
+                MotionInputId.Accelerometer => SDL_SensorType.SDL_SENSOR_ACCEL,
+                MotionInputId.Gyroscope => SDL_SensorType.SDL_SENSOR_GYRO,
+                _ => SDL_SensorType.SDL_SENSOR_INVALID
+            };
+
+            if (!Features.HasFlag(GamepadFeaturesFlag.Motion) || sensorType is SDL_SensorType.SDL_SENSOR_INVALID)
+                return Vector3.Zero;
+
+            const int ElementCount = 3;
+
+            unsafe
+            {
+                float* values = stackalloc float[ElementCount];
+
+                int result = SDL_GameControllerGetSensorData(_gamepadHandle, sensorType, (nint)values, ElementCount);
+
+                if (result != 0)
+                    return Vector3.Zero;
+
+                Vector3 value = _joyConType switch
+                {
+                    JoyConType.Left => new Vector3(-values[2], values[1], values[0]),
+                    JoyConType.Right => new Vector3(values[2], values[1], -values[0])
+                };
+
+                return inputId switch
+                {
+                    MotionInputId.Gyroscope => RadToDegree(value),
+                    MotionInputId.Accelerometer => GsToMs2(value),
+                    _ => value
+                };
+            }
+        }
+
+        private static Vector3 RadToDegree(Vector3 rad) => rad * (180 / MathF.PI);
+
+        private static Vector3 GsToMs2(Vector3 gs) => gs / SDL_STANDARD_GRAVITY;
+
+        public void SetConfiguration(InputConfig configuration)
+        {
+            lock (_userMappingLock)
+            {
+                _configuration = (StandardControllerInputConfig)configuration;
+
+                _buttonsUserMapping.Clear();
+
+                // First update sticks
+                _stickUserMapping[(int)StickInputId.Left] = (StickInputId)_configuration.LeftJoyconStick.Joystick;
+                _stickUserMapping[(int)StickInputId.Right] = (StickInputId)_configuration.RightJoyconStick.Joystick;
+
+
+                switch (_joyConType)
+                {
+                    case JoyConType.Left:
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.LeftStick, (GamepadButtonInputId)_configuration.LeftJoyconStick.StickButton));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadUp, (GamepadButtonInputId)_configuration.LeftJoycon.DpadUp));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadDown, (GamepadButtonInputId)_configuration.LeftJoycon.DpadDown));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadLeft, (GamepadButtonInputId)_configuration.LeftJoycon.DpadLeft));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadRight, (GamepadButtonInputId)_configuration.LeftJoycon.DpadRight));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.Minus, (GamepadButtonInputId)_configuration.LeftJoycon.ButtonMinus));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.LeftShoulder, (GamepadButtonInputId)_configuration.LeftJoycon.ButtonL));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.LeftTrigger, (GamepadButtonInputId)_configuration.LeftJoycon.ButtonZl));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleRightTrigger0, (GamepadButtonInputId)_configuration.LeftJoycon.ButtonSr));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleLeftTrigger0, (GamepadButtonInputId)_configuration.LeftJoycon.ButtonSl));
+                        break;
+                    case JoyConType.Right:
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.RightStick, (GamepadButtonInputId)_configuration.RightJoyconStick.StickButton));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.A, (GamepadButtonInputId)_configuration.RightJoycon.ButtonA));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.B, (GamepadButtonInputId)_configuration.RightJoycon.ButtonB));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.X, (GamepadButtonInputId)_configuration.RightJoycon.ButtonX));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.Y, (GamepadButtonInputId)_configuration.RightJoycon.ButtonY));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.Plus, (GamepadButtonInputId)_configuration.RightJoycon.ButtonPlus));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.RightShoulder, (GamepadButtonInputId)_configuration.RightJoycon.ButtonR));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.RightTrigger, (GamepadButtonInputId)_configuration.RightJoycon.ButtonZr));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleRightTrigger1, (GamepadButtonInputId)_configuration.RightJoycon.ButtonSr));
+                        _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleLeftTrigger1, (GamepadButtonInputId)_configuration.RightJoycon.ButtonSl));
+                        break;
+                    default:
+                        throw new ArgumentOutOfRangeException();
+                }
+                
+                SetTriggerThreshold(_configuration.TriggerThreshold);
+            }
+        }
+
+        public GamepadStateSnapshot GetStateSnapshot()
+        {
+            return IGamepad.GetStateSnapshot(this);
+        }
+
+        public GamepadStateSnapshot GetMappedStateSnapshot()
+        {
+            GamepadStateSnapshot rawState = GetStateSnapshot();
+            GamepadStateSnapshot result = default;
+
+            lock (_userMappingLock)
+            {
+                if (_buttonsUserMapping.Count == 0)
+                    return rawState;
+
+
+                // ReSharper disable once ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator
+                foreach (ButtonMappingEntry entry in _buttonsUserMapping)
+                {
+                    if (!entry.IsValid)
+                        continue;
+
+                    // Do not touch state of button already pressed
+                    if (!result.IsPressed(entry.To))
+                    {
+                        result.SetPressed(entry.To, rawState.IsPressed(entry.From));
+                    }
+                }
+
+                (float leftStickX, float leftStickY) = rawState.GetStick(_stickUserMapping[(int)StickInputId.Left]);
+                (float rightStickX, float rightStickY) = rawState.GetStick(_stickUserMapping[(int)StickInputId.Right]);
+
+                result.SetStick(StickInputId.Left, leftStickX, leftStickY);
+                result.SetStick(StickInputId.Right, rightStickX, rightStickY);
+            }
+
+            return result;
+        }
+
+
+        private static float ConvertRawStickValue(short value)
+        {
+            const float ConvertRate = 1.0f / (short.MaxValue + 0.5f);
+
+            return value * ConvertRate;
+        }
+
+        private JoyconConfigControllerStick<GamepadInputId, Common.Configuration.Hid.Controller.StickInputId>
+            GetLogicalJoyStickConfig(StickInputId inputId)
+        {
+            switch (inputId)
+            {
+                case StickInputId.Left:
+                    if (_configuration.RightJoyconStick.Joystick ==
+                        Common.Configuration.Hid.Controller.StickInputId.Left)
+                        return _configuration.RightJoyconStick;
+                    else
+                        return _configuration.LeftJoyconStick;
+                case StickInputId.Right:
+                    if (_configuration.LeftJoyconStick.Joystick ==
+                        Common.Configuration.Hid.Controller.StickInputId.Right)
+                        return _configuration.LeftJoyconStick;
+                    else
+                        return _configuration.RightJoyconStick;
+            }
+
+            return null;
+        }
+
+
+        public (float, float) GetStick(StickInputId inputId)
+        {
+            if (inputId == StickInputId.Unbound)
+                return (0.0f, 0.0f);
+
+            if (inputId == StickInputId.Left && _joyConType == JoyConType.Right || inputId == StickInputId.Right && _joyConType == JoyConType.Left)
+            {
+                return (0.0f, 0.0f);
+            }
+            
+            (short stickX, short stickY) = GetStickXY();
+
+            float resultX = ConvertRawStickValue(stickX);
+            float resultY = -ConvertRawStickValue(stickY);
+
+            if (HasConfiguration)
+            {
+                var joyconStickConfig = GetLogicalJoyStickConfig(inputId);
+
+                if (joyconStickConfig != null)
+                {
+                    if (joyconStickConfig.InvertStickX)
+                        resultX = -resultX;
+
+                    if (joyconStickConfig.InvertStickY)
+                        resultY = -resultY;
+
+                    if (joyconStickConfig.Rotate90CW)
+                    {
+                        float temp = resultX;
+                        resultX = resultY;
+                        resultY = -temp;
+                    }
+                }
+            }
+
+            return inputId switch
+            {
+                StickInputId.Left when _joyConType == JoyConType.Left => (resultY, -resultX),
+                StickInputId.Right when _joyConType == JoyConType.Right => (-resultY, resultX),
+                _ => (0.0f, 0.0f)
+            };
+        }
+
+        private (short, short) GetStickXY()
+        {
+            return (
+                SDL_GameControllerGetAxis(_gamepadHandle, SDL_GameControllerAxis.SDL_CONTROLLER_AXIS_LEFTX),
+                SDL_GameControllerGetAxis(_gamepadHandle, SDL_GameControllerAxis.SDL_CONTROLLER_AXIS_LEFTY));
+        }
+        
+        public bool IsPressed(GamepadButtonInputId inputId)
+        {
+            if (!_buttonsDriverMapping.TryGetValue(inputId, out var button))
+            {
+                return false;
+            }
+
+            return SDL_GameControllerGetButton(_gamepadHandle, button) == 1;
+        }
+    }
+}
--- a/src/Ryujinx.Input.SDL2/SDL2JoyConPair.cs
+++ b/src/Ryujinx.Input.SDL2/SDL2JoyConPair.cs
@@ -0,0 +1,142 @@
+using Ryujinx.Common.Configuration.Hid;
+using Ryujinx.Common.Configuration.Hid.Controller;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using static SDL2.SDL;
+
+namespace Ryujinx.Input.SDL2
+{
+    internal class SDL2JoyConPair(IGamepad left, IGamepad right) : IGamepad
+    {
+        private StandardControllerInputConfig _configuration;
+
+        private readonly StickInputId[] _stickUserMapping =
+        [
+            StickInputId.Unbound,
+            StickInputId.Left,
+            StickInputId.Right
+        ];
+
+        public GamepadFeaturesFlag Features => (left?.Features ?? GamepadFeaturesFlag.None) |
+                                               (right?.Features ?? GamepadFeaturesFlag.None);
+
+        public const string Id = "JoyConPair";
+        string IGamepad.Id => Id;
+
+        public string Name => "Nintendo Switch Joy-Con (L/R)";
+        public bool IsConnected => left is { IsConnected: true } && right is { IsConnected: true };
+
+        public void Dispose()
+        {
+            left?.Dispose();
+            right?.Dispose();
+        }
+
+        public GamepadStateSnapshot GetMappedStateSnapshot()
+        {
+            return GetStateSnapshot();
+        }
+
+        public Vector3 GetMotionData(MotionInputId inputId)
+        {
+            return inputId switch
+            {
+                MotionInputId.Accelerometer or
+                    MotionInputId.Gyroscope => left.GetMotionData(inputId),
+                MotionInputId.SecondAccelerometer => right.GetMotionData(MotionInputId.Accelerometer),
+                MotionInputId.SecondGyroscope => right.GetMotionData(MotionInputId.Gyroscope),
+                _ => Vector3.Zero
+            };
+        }
+
+        public GamepadStateSnapshot GetStateSnapshot()
+        {
+            return IGamepad.GetStateSnapshot(this);
+        }
+
+        public (float, float) GetStick(StickInputId inputId)
+        {
+            return inputId switch
+            {
+                StickInputId.Left => left.GetStick(StickInputId.Left),
+                StickInputId.Right => right.GetStick(StickInputId.Right),
+                _ => (0, 0)
+            };
+        }
+
+        public bool IsPressed(GamepadButtonInputId inputId)
+        {
+            return left.IsPressed(inputId) || right.IsPressed(inputId);
+        }
+
+        public void Rumble(float lowFrequency, float highFrequency, uint durationMs)
+        {
+            if (lowFrequency != 0)
+            {
+                right.Rumble(lowFrequency, lowFrequency, durationMs);
+            }
+
+            if (highFrequency != 0)
+            {
+                left.Rumble(highFrequency, highFrequency, durationMs);
+            }
+
+            if (lowFrequency == 0 && highFrequency == 0)
+            {
+                left.Rumble(0, 0, durationMs);
+                right.Rumble(0, 0, durationMs);
+            }
+        }
+
+        public void SetConfiguration(InputConfig configuration)
+        {
+            left.SetConfiguration(configuration);
+            right.SetConfiguration(configuration);
+        }
+
+        public void SetTriggerThreshold(float triggerThreshold)
+        {
+            left.SetTriggerThreshold(triggerThreshold);
+            right.SetTriggerThreshold(triggerThreshold);
+        }
+
+        public static bool IsCombinable(List<string> gamepadsIds)
+        {
+            (int leftIndex, int rightIndex) = DetectJoyConPair(gamepadsIds);
+            return leftIndex >= 0 && rightIndex >= 0;
+        }
+
+        private static (int leftIndex, int rightIndex) DetectJoyConPair(List<string> gamepadsIds)
+        {
+            var gamepadNames = gamepadsIds.Where(gamepadId => gamepadId != Id)
+                .Select((_, index) => SDL_GameControllerNameForIndex(index)).ToList();
+            int leftIndex = gamepadNames.IndexOf(SDL2JoyCon.LeftName);
+            int rightIndex = gamepadNames.IndexOf(SDL2JoyCon.RightName);
+
+            return (leftIndex, rightIndex);
+        }
+
+        public static IGamepad GetGamepad(List<string> gamepadsIds)
+        {
+            (int leftIndex, int rightIndex) = DetectJoyConPair(gamepadsIds);
+            if (leftIndex == -1 || rightIndex == -1)
+            {
+                return null;
+            }
+
+            nint leftGamepadHandle = SDL_GameControllerOpen(leftIndex);
+            nint rightGamepadHandle = SDL_GameControllerOpen(rightIndex);
+
+            if (leftGamepadHandle == nint.Zero || rightGamepadHandle == nint.Zero)
+            {
+                return null;
+            }
+
+
+            return new SDL2JoyConPair(new SDL2JoyCon(leftGamepadHandle, gamepadsIds[leftIndex]),
+                new SDL2JoyCon(rightGamepadHandle, gamepadsIds[rightIndex]));
+        }
+    }
+}
--- a/src/Ryujinx.Input/HLE/NpadController.cs
+++ b/src/Ryujinx.Input/HLE/NpadController.cs
@@ -266,6 +266,7 @@ namespace Ryujinx.Input.HLE
            if (motionConfig.MotionBackend != MotionInputBackendType.CemuHook)
            {
                _leftMotionInput = new MotionInput();
+                _rightMotionInput = new MotionInput();
            }
            else
            {
@@ -298,7 +299,20 @@ namespace Ryujinx.Input.HLE

                            if (controllerConfig.ControllerType == ConfigControllerType.JoyconPair)
                            {
-                                _rightMotionInput = _leftMotionInput;
+                                if (gamepad.Id== "JoyConPair")
+                                {
+                                    Vector3 rightAccelerometer = gamepad.GetMotionData(MotionInputId.SecondAccelerometer);
+                                    Vector3 rightGyroscope = gamepad.GetMotionData(MotionInputId.SecondGyroscope);
+
+                                    rightAccelerometer = new Vector3(rightAccelerometer.X, -rightAccelerometer.Z, rightAccelerometer.Y);
+                                    rightGyroscope = new Vector3(rightGyroscope.X, -rightGyroscope.Z, rightGyroscope.Y);
+
+                                    _rightMotionInput.Update(rightAccelerometer, rightGyroscope, (ulong)PerformanceCounter.ElapsedNanoseconds / 1000, controllerConfig.Motion.Sensitivity, (float)controllerConfig.Motion.GyroDeadzone);
+                                }
+                                else
+                                {
+                                    _rightMotionInput = _leftMotionInput;
+                                }
                            }
                        }
                    }
@@ -333,6 +347,7 @@ namespace Ryujinx.Input.HLE
                // Reset states
                State = default;
                _leftMotionInput = null;
+                _rightMotionInput = null;
            }
        }

--- a/src/Ryujinx.Input/MotionInputId.cs
+++ b/src/Ryujinx.Input/MotionInputId.cs
@@ -21,5 +21,17 @@ namespace Ryujinx.Input
        /// </summary>
        /// <remarks>Values are in degrees</remarks>
        Gyroscope,
+
+        /// <summary>
+        /// Second accelerometer.
+        /// </summary>
+        /// <remarks>Values are in m/s^2</remarks>
+        SecondAccelerometer,
+
+        /// <summary>
+        /// Second gyroscope.
+        /// </summary>
+        /// <remarks>Values are in degrees</remarks>
+        SecondGyroscope
    }
 }
--- a/src/Ryujinx.SDL2.Common/SDL2Driver.cs
+++ b/src/Ryujinx.SDL2.Common/SDL2Driver.cs
@@ -25,14 +25,17 @@ namespace Ryujinx.SDL2.Common

        public static Action<Action> MainThreadDispatcher { get; set; }

-        private const uint SdlInitFlags = SDL_INIT_EVENTS | SDL_INIT_GAMECONTROLLER | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_VIDEO;
+        private const uint SdlInitFlags = SDL_INIT_EVENTS | SDL_INIT_GAMECONTROLLER | SDL_INIT_JOYSTICK |
+                                          SDL_INIT_AUDIO | SDL_INIT_VIDEO;

        private bool _isRunning;
        private uint _refereceCount;
        private Thread _worker;

+        private const uint SQL_JOYBATTERYUPDATED = 1543;
        public event Action<int, int> OnJoyStickConnected;
        public event Action<int> OnJoystickDisconnected;
+        public event Action<int, SDL_JoystickPowerLevel> OnJoyBatteryUpdated;

        private ConcurrentDictionary<uint, Action<SDL_Event>> _registeredWindowHandlers;

@@ -78,12 +81,14 @@ namespace Ryujinx.SDL2.Common
                // First ensure that we only enable joystick events (for connected/disconnected).
                if (SDL_GameControllerEventState(SDL_IGNORE) != SDL_IGNORE)
                {
-                    Logger.Error?.PrintMsg(LogClass.Application, "Couldn't change the state of game controller events.");
+                    Logger.Error?.PrintMsg(LogClass.Application,
+                        "Couldn't change the state of game controller events.");
                }

                if (SDL_JoystickEventState(SDL_ENABLE) < 0)
                {
-                    Logger.Error?.PrintMsg(LogClass.Application, $"Failed to enable joystick event polling: {SDL_GetError()}");
+                    Logger.Error?.PrintMsg(LogClass.Application,
+                        $"Failed to enable joystick event polling: {SDL_GetError()}");
                }

                // Disable all joysticks information, we don't need them no need to flood the event queue for that.
@@ -143,7 +148,12 @@ namespace Ryujinx.SDL2.Common

                OnJoystickDisconnected?.Invoke(evnt.cbutton.which);
            }
-            else if (evnt.type is SDL_EventType.SDL_WINDOWEVENT or SDL_EventType.SDL_MOUSEBUTTONDOWN or SDL_EventType.SDL_MOUSEBUTTONUP)
+            else if ((uint)evnt.type == SQL_JOYBATTERYUPDATED)
+            {
+                OnJoyBatteryUpdated?.Invoke(evnt.cbutton.which, (SDL_JoystickPowerLevel)evnt.user.code);
+            }
+            else if (evnt.type is SDL_EventType.SDL_WINDOWEVENT or SDL_EventType.SDL_MOUSEBUTTONDOWN
+                     or SDL_EventType.SDL_MOUSEBUTTONUP)
            {
                if (_registeredWindowHandlers.TryGetValue(evnt.window.windowID, out Action<SDL_Event> handler))
                {
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -1564,7 +1564,7 @@
        "pl_PL": "Wersja",
        "pt_BR": "Versão",
        "ru_RU": "Версия",
-        "sv_SE": "",
+        "sv_SE": "Version",
        "th_TH": "เวอร์ชั่น",
        "tr_TR": "Sürüm",
        "uk_UA": "Версія",
@@ -2213,8 +2213,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "ExeFS",
+        "sv_SE": "ExeFS",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -2263,8 +2263,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "RomFS",
+        "sv_SE": "RomFS",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -2310,7 +2310,7 @@
        "it_IT": "",
        "ja_JP": "ロゴ",
        "ko_KR": "로고",
-        "no_NO": "",
+        "no_NO": "Logo",
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Лого",
@@ -3260,11 +3260,11 @@
        "it_IT": "Sistema",
        "ja_JP": "システム",
        "ko_KR": "시스템",
-        "no_NO": "",
+        "no_NO": "System",
        "pl_PL": "",
        "pt_BR": "Sistema",
        "ru_RU": "Система",
-        "sv_SE": "",
+        "sv_SE": "System",
        "th_TH": "ระบบ",
        "tr_TR": "Sistem",
        "uk_UA": "Система",
@@ -3335,11 +3335,11 @@
        "it_IT": "Giappone",
        "ja_JP": "日本",
        "ko_KR": "일본",
-        "no_NO": "",
+        "no_NO": "Japan",
        "pl_PL": "Japonia",
        "pt_BR": "Japão",
        "ru_RU": "Япония",
-        "sv_SE": "",
+        "sv_SE": "Japan",
        "th_TH": "ญี่ปุ่น",
        "tr_TR": "Japonya",
        "uk_UA": "Японія",
@@ -3360,11 +3360,11 @@
        "it_IT": "Stati Uniti d'America",
        "ja_JP": "アメリカ",
        "ko_KR": "미국",
-        "no_NO": "",
+        "no_NO": "USA",
        "pl_PL": "Stany Zjednoczone",
        "pt_BR": "EUA",
        "ru_RU": "США",
-        "sv_SE": "",
+        "sv_SE": "USA",
        "th_TH": "สหรัฐอเมริกา",
        "tr_TR": "ABD",
        "uk_UA": "США",
@@ -3410,7 +3410,7 @@
        "it_IT": "",
        "ja_JP": "オーストラリア",
        "ko_KR": "호주",
-        "no_NO": "",
+        "no_NO": "Australia",
        "pl_PL": "",
        "pt_BR": "Austrália",
        "ru_RU": "Австралия",
@@ -3460,11 +3460,11 @@
        "it_IT": "Corea",
        "ja_JP": "韓国",
        "ko_KR": "한국",
-        "no_NO": "",
+        "no_NO": "Korea",
        "pl_PL": "",
        "pt_BR": "Coreia",
        "ru_RU": "Корея",
-        "sv_SE": "",
+        "sv_SE": "Korea",
        "th_TH": "เกาหลี",
        "tr_TR": "Kore",
        "uk_UA": "Корея",
@@ -3485,11 +3485,11 @@
        "it_IT": "",
        "ja_JP": "台湾",
        "ko_KR": "대만",
-        "no_NO": "",
+        "no_NO": "Taiwan",
        "pl_PL": "Tajwan",
        "pt_BR": "",
        "ru_RU": "Тайвань",
-        "sv_SE": "",
+        "sv_SE": "Taiwan",
        "th_TH": "ไต้หวัน",
        "tr_TR": "Tayvan",
        "uk_UA": "Тайвань",
@@ -3955,7 +3955,7 @@
        "el_GR": "Ζώνη Ώρας Συστήματος:",
        "en_US": "System Time Zone:",
        "es_ES": "Zona horaria del sistema:",
-        "fr_FR": "Fuseau horaire du système\u00A0:",
+        "fr_FR": "Fuseau horaire du système :",
        "he_IL": "אזור זמן מערכת:",
        "it_IT": "Fuso orario del sistema:",
        "ja_JP": "タイムゾーン:",
@@ -4135,11 +4135,11 @@
        "it_IT": "",
        "ja_JP": "ダミー",
        "ko_KR": "더미",
-        "no_NO": "",
+        "no_NO": "Dummy",
        "pl_PL": "Atrapa",
        "pt_BR": "Nenhuma",
        "ru_RU": "Без звука",
-        "sv_SE": "",
+        "sv_SE": "Dummy",
        "th_TH": "",
        "tr_TR": "Yapay",
        "uk_UA": "",
@@ -4163,8 +4163,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "OpenAL",
+        "sv_SE": "OpenAL",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4188,8 +4188,8 @@
        "no_NO": "Lyd Inn/Ut",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "SoundIO",
+        "sv_SE": "SoundIO",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4213,8 +4213,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "SDL2",
+        "sv_SE": "SDL2",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4230,12 +4230,12 @@
        "el_GR": "Μικροδιορθώσεις",
        "en_US": "Hacks",
        "es_ES": "",
-        "fr_FR": "",
+        "fr_FR": "Hacks",
        "he_IL": "האצות",
        "it_IT": "Espedienti",
        "ja_JP": "ハック",
        "ko_KR": "핵",
-        "no_NO": "",
+        "no_NO": "Hacks",
        "pl_PL": "Hacki",
        "pt_BR": "",
        "ru_RU": "Хаки",
@@ -4314,7 +4314,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "4ГиБ",
-        "sv_SE": "",
+        "sv_SE": "4GiB",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "4Гб",
@@ -4339,7 +4339,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "6ГиБ",
-        "sv_SE": "",
+        "sv_SE": "6GiB",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "6Гб",
@@ -4364,7 +4364,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "8ГиБ",
-        "sv_SE": "",
+        "sv_SE": "8GiB",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "8Гб",
@@ -4389,7 +4389,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "12ГиБ",
-        "sv_SE": "",
+        "sv_SE": "12GiB",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "12Гб",
@@ -4585,11 +4585,11 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "2배",
-        "no_NO": "",
+        "no_NO": "2x",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "2x",
+        "sv_SE": "2x",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4610,11 +4610,11 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "4배",
-        "no_NO": "",
+        "no_NO": "4x",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "4x",
+        "sv_SE": "4x",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4635,11 +4635,11 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "8배",
-        "no_NO": "",
+        "no_NO": "8x",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "8x",
+        "sv_SE": "8x",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4660,11 +4660,11 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "16배",
-        "no_NO": "",
+        "no_NO": "16x",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "16x",
+        "sv_SE": "16x",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4760,11 +4760,11 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "2배(1440p/2160p)",
-        "no_NO": "",
+        "no_NO": "2x (1440p/2160p)",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "2x (1440p/2160p)",
+        "sv_SE": "2x (1440p/2160p)",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4785,11 +4785,11 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "3배(2160p/3240p)",
-        "no_NO": "",
+        "no_NO": "3x (2160p/3240p)",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "3x (2160p/3240p)",
+        "sv_SE": "3x (2160p/3240p)",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4863,8 +4863,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "4:3",
+        "sv_SE": "4:3",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4888,8 +4888,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "16:9",
+        "sv_SE": "16:9",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4913,8 +4913,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "16:10",
+        "sv_SE": "16:10",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4938,8 +4938,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "21:9",
+        "sv_SE": "21:9",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -4960,11 +4960,11 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "",
-        "no_NO": "",
+        "no_NO": "32:9",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "32:9",
+        "sv_SE": "32:9",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -5060,7 +5060,7 @@
        "it_IT": "Log",
        "ja_JP": "ロギング",
        "ko_KR": "로그 기록",
-        "no_NO": "",
+        "no_NO": "Logging",
        "pl_PL": "Dziennik zdarzeń",
        "pt_BR": "Log",
        "ru_RU": "Журналирование",
@@ -5085,7 +5085,7 @@
        "it_IT": "Log",
        "ja_JP": "ロギング",
        "ko_KR": "로그 기록",
-        "no_NO": "",
+        "no_NO": "Logging",
        "pl_PL": "Dziennik zdarzeń",
        "pt_BR": "Log",
        "ru_RU": "Журналирование",
@@ -6113,8 +6113,8 @@
        "no_NO": "",
        "pl_PL": "Pro Kontroler",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "Pro Controller",
+        "sv_SE": "Pro Controller",
        "th_TH": "โปรคอนโทรลเลอร์",
        "tr_TR": "Profesyonel Kumanda",
        "uk_UA": "Контролер Pro",
@@ -8088,8 +8088,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "Enter",
+        "sv_SE": "Enter",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8114,7 +8114,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Esc",
-        "sv_SE": "",
+        "sv_SE": "Escape",
        "th_TH": "",
        "tr_TR": "Esc",
        "uk_UA": "",
@@ -8163,8 +8163,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "Tab",
+        "sv_SE": "Tab",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8188,8 +8188,8 @@
        "no_NO": "Tilbaketast",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "Backspace",
+        "sv_SE": "Backspace",
        "th_TH": "",
        "tr_TR": "Geri tuşu",
        "uk_UA": "",
@@ -8213,8 +8213,8 @@
        "no_NO": "Sett inn",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "Insert",
+        "sv_SE": "Insert",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8238,8 +8238,8 @@
        "no_NO": "Slett",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "Delete",
+        "sv_SE": "Delete",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8263,8 +8263,8 @@
        "no_NO": "Side opp",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "Page Up",
+        "sv_SE": "Page Up",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8288,8 +8288,8 @@
        "no_NO": "Side ned",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "Page Down",
+        "sv_SE": "Page Down",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8313,8 +8313,8 @@
        "no_NO": "Hjem",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "Home",
+        "sv_SE": "Home",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8338,8 +8338,8 @@
        "no_NO": "Avslutt",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "End",
+        "sv_SE": "End",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8363,8 +8363,8 @@
        "no_NO": "Skiftelås",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "Caps Lock",
+        "sv_SE": "Caps Lock",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8388,8 +8388,8 @@
        "no_NO": "Rullelås",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "Scroll Lock",
+        "sv_SE": "Scroll Lock",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8413,8 +8413,8 @@
        "no_NO": "Skjermbilde",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "Print Screen",
+        "sv_SE": "Print Screen",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8438,8 +8438,8 @@
        "no_NO": "Stans midlertidig",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "Pause",
+        "sv_SE": "Pause",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8463,8 +8463,8 @@
        "no_NO": "Numerisk Lås",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "Num Lock",
+        "sv_SE": "Num Lock",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8514,7 +8514,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Блок цифр 0",
-        "sv_SE": "",
+        "sv_SE": "Keypad 0",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8539,7 +8539,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Блок цифр 1",
-        "sv_SE": "",
+        "sv_SE": "Keypad 1",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8564,7 +8564,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Блок цифр 2",
-        "sv_SE": "",
+        "sv_SE": "Keypad 2",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8589,7 +8589,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Блок цифр 3",
-        "sv_SE": "",
+        "sv_SE": "Keypad 3",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8614,7 +8614,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Блок цифр 4",
-        "sv_SE": "",
+        "sv_SE": "Keypad 4",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8639,7 +8639,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Блок цифр 5",
-        "sv_SE": "",
+        "sv_SE": "Keypad 5",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8664,7 +8664,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Блок цифр 6",
-        "sv_SE": "",
+        "sv_SE": "Keypad 6",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8689,7 +8689,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Блок цифр 7",
-        "sv_SE": "",
+        "sv_SE": "Keypad 7",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8714,7 +8714,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Блок цифр 8",
-        "sv_SE": "",
+        "sv_SE": "Keypad 8",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8739,7 +8739,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Блок цифр 9",
-        "sv_SE": "",
+        "sv_SE": "Keypad 9",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8889,7 +8889,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Enter (блок цифр)",
-        "sv_SE": "",
+        "sv_SE": "Keypad Enter",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -8913,7 +8913,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "0",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -8938,7 +8938,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "1",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -8963,7 +8963,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "2",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -8988,7 +8988,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "3",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9013,7 +9013,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "4",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9038,7 +9038,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "5",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9063,7 +9063,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "6",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9088,7 +9088,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "7",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9113,7 +9113,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "8",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9138,7 +9138,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "9",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9163,7 +9163,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "~",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9188,7 +9188,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "`",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9213,7 +9213,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "-",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9238,7 +9238,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "+",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9263,7 +9263,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "[",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9288,7 +9288,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "]",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9313,7 +9313,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": ";",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9363,7 +9363,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": ",",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9388,7 +9388,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": ".",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9413,7 +9413,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "/",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9738,7 +9738,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "-",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -9763,7 +9763,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "+",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "4",
@@ -9789,7 +9789,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Кнопка меню",
-        "sv_SE": "",
+        "sv_SE": "Guide",
        "th_TH": "",
        "tr_TR": "Rehber",
        "uk_UA": "",
@@ -12438,7 +12438,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "{0}: {1}",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -14289,7 +14289,7 @@
        "pl_PL": "Seria Amiibo",
        "pt_BR": "Franquia Amiibo",
        "ru_RU": "Серия Amiibo",
-        "sv_SE": "",
+        "sv_SE": "Amiibo Series",
        "th_TH": "",
        "tr_TR": "Amiibo Serisi",
        "uk_UA": "Серія Amiibo",
@@ -15755,7 +15755,7 @@
        "el_GR": "",
        "en_US": "Aspect Ratio applied to the renderer window.\n\nOnly change this if you're using an aspect ratio mod for your game, otherwise the graphics will be stretched.\n\nLeave on 16:9 if unsure.",
        "es_ES": "Relación de aspecto aplicada a la ventana del renderizador.\n\nSolamente modificar esto si estás utilizando un mod de relación de aspecto para su juego, en cualquier otro caso los gráficos se estirarán.\n\nDejar en 16:9 si no sabe que hacer.",
-        "fr_FR": "Format\u00A0d'affichage appliqué à la fenêtre du moteur de rendu.\n\nChangez cela uniquement si vous utilisez un mod changeant le format\u00A0d'affichage pour votre jeu, sinon les graphismes seront étirés.\n\nLaissez sur 16:9 si vous n'êtes pas sûr.",
+        "fr_FR": "Format d'affichage appliqué à la fenêtre du moteur de rendu.\n\nChangez cela uniquement si vous utilisez un mod changeant le format d'affichage pour votre jeu, sinon les graphismes seront étirés.\n\nLaissez sur 16:9 si vous n'êtes pas sûr.",
        "he_IL": "",
        "it_IT": "Proporzioni dello schermo applicate alla finestra di renderizzazione.\n\nCambialo solo se stai usando una mod di proporzioni per il tuo gioco, altrimenti la grafica verrà allungata.\n\nLasciare il 16:9 se incerto.",
        "ja_JP": "レンダリングウインドウに適用するアスペクト比です.\n\nゲームにアスペクト比を変更する mod を使用している場合のみ変更してください.\n\nわからない場合は16:9のままにしておいてください.\n",
@@ -17439,7 +17439,7 @@
        "pl_PL": "Wersja {0}",
        "pt_BR": "Versão {0}",
        "ru_RU": "Версия {0}",
-        "sv_SE": "",
+        "sv_SE": "Version {0}",
        "th_TH": "เวอร์ชั่น {0}",
        "tr_TR": "Sürüm {0}",
        "uk_UA": "Версія {0}",
@@ -17664,7 +17664,7 @@
        "pl_PL": "",
        "pt_BR": "Ryujinx - Informação",
        "ru_RU": "Ryujinx - Информация",
-        "sv_SE": "",
+        "sv_SE": "Ryujinx - Info",
        "th_TH": "Ryujinx – ข้อมูล",
        "tr_TR": "Ryujinx - Bilgi",
        "uk_UA": "Ryujin x - Інформація",
@@ -18813,8 +18813,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "Amiibo",
+        "sv_SE": "Amiibo",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -19435,7 +19435,7 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "XCI 파일 트리머",
-        "no_NO": "",
+        "no_NO": "XCI File Trimmer",
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Уменьшение размера XCI файлов",
@@ -19639,7 +19639,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "{0:n0} Мб",
-        "sv_SE": "",
+        "sv_SE": "{0:n0} Mb",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "{0:n0} Мб",
@@ -20914,7 +20914,7 @@
        "pl_PL": "Głoś",
        "pt_BR": "",
        "ru_RU": "Громкость",
-        "sv_SE": "",
+        "sv_SE": "Vol",
        "th_TH": "ระดับเสียง",
        "tr_TR": "Ses",
        "uk_UA": "Гуч.",
@@ -21055,7 +21055,7 @@
        "el_GR": "Όνομα",
        "en_US": "Name",
        "es_ES": "Nombre",
-        "fr_FR": "Nom\u00A0",
+        "fr_FR": "Nom ",
        "he_IL": "שם",
        "it_IT": "Nome",
        "ja_JP": "名称",
@@ -21388,8 +21388,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "FSR",
+        "sv_SE": "FSR",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -21888,8 +21888,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "ldn_mitm",
+        "sv_SE": "ldn_mitm",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -21913,8 +21913,8 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "ru_RU": "RyuLDN",
+        "sv_SE": "RyuLDN",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22214,7 +22214,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Вертикальная синхронизация:",
-        "sv_SE": "",
+        "sv_SE": "VSync:",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "Вертикальна синхронізація (VSync):",
@@ -22255,7 +22255,7 @@
        "el_GR": "",
        "en_US": "Switch",
        "es_ES": "",
-        "fr_FR": "",
+        "fr_FR": "Switch",
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
@@ -22264,7 +22264,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "Консоль",
-        "sv_SE": "",
+        "sv_SE": "Switch",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22598,4 +22598,4 @@
      }
    }
  ]
-}
+}
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -13,13 +13,9 @@
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

-  <Target Name="BuildValidationProj" BeforeTargets="BeforeBuild">
-    <Message Text="Building Validation Project for $(TargetFramework)" Importance="high" Condition="'$(RuntimeIdentifier)' == ''" />
-    <Message Text="Building Validation Project for $(TargetFramework) with runtime $(RuntimeIdentifier)" Importance="high" Condition="'$(RuntimeIdentifier)' != ''" />
-    <Exec WorkingDirectory="..\Ryujinx.BuildValidationTasks\" Command="dotnet restore Ryujinx.BuildValidationTasks.csproj --force --ucr true" Condition="'$(RuntimeIdentifier)' == ''" />
-    <Exec WorkingDirectory="..\Ryujinx.BuildValidationTasks\" Command="dotnet restore Ryujinx.BuildValidationTasks.csproj --force --runtime $(RuntimeIdentifier)" Condition="'$(RuntimeIdentifier)' != ''" />
-    <MSBuild Projects="..\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj" Properties="Configuration=Debug" />
-    
+  <Target Name="BuildValidationProj" BeforeTargets="BeforeRebuild">
+    <MSBuild Projects="..\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj" Targets="Rebuild">
+    </MSBuild>
  </Target>

  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="$([MSBuild]::IsOSPlatform('OSX'))">
--- a/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
+++ b/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
@@ -75,11 +75,11 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
            TitleUpdates = _titleUpdates.AsObservableCache();
            DownloadableContents = _downloadableContents.AsObservableCache();

-            _nspIcon = EmbeddedResources.Read("Ryujinx.Assets.UIImages.Icon_NSP.png");
-            _xciIcon = EmbeddedResources.Read("Ryujinx.Assets.UIImages.Icon_XCI.png");
-            _ncaIcon = EmbeddedResources.Read("Ryujinx.Assets.UIImages.Icon_NCA.png");
-            _nroIcon = EmbeddedResources.Read("Ryujinx.Assets.UIImages.Icon_NRO.png");
-            _nsoIcon = EmbeddedResources.Read("Ryujinx.Assets.UIImages.Icon_NSO.png");
+            _nspIcon = EmbeddedResources.Read("Ryujinx/Assets.UIImages.Icon_NSP.png");
+            _xciIcon = EmbeddedResources.Read("Ryujinx/Assets.UIImages.Icon_XCI.png");
+            _ncaIcon = EmbeddedResources.Read("Ryujinx/Assets.UIImages.Icon_NCA.png");
+            _nroIcon = EmbeddedResources.Read("Ryujinx/Assets.UIImages.Icon_NRO.png");
+            _nsoIcon = EmbeddedResources.Read("Ryujinx/Assets.UIImages.Icon_NSO.png");
        }

        /// <exception cref="Ryujinx.HLE.Exceptions.InvalidNpdmException">The npdm file doesn't contain valid data.</exception>
Author	SHA1	Message	Date
IvonWei	536f792558	Merge branch 'Ryubing:master' into master	2024-12-30 22:04:08 +08:00
madwind	7a451ab160	fix GetMappedStateSnapshot	2024-12-30 22:01:21 +08:00
Evan Husted	9ae1c4380d	UI: Fix crashing when opening an Applet or application with no existing icon	2024-12-30 02:32:44 -06:00
Evan Husted	c88518bce2	Revert "Validation Project v2" (#470 ) Reverts Ryubing/Ryujinx#444	2024-12-30 02:06:24 -06:00
Evan Husted	a3888ed7cf	Revert "misc: New Solution Format (.SLNX)" This reverts commit `7cbbd02973`.	2024-12-30 02:05:40 -06:00
IvonWei	99c7c3fb14	Merge branch 'Ryubing:master' into master	2024-12-29 18:37:03 +08:00
Evan Husted	09e7b660f4	Merge branch 'master' into master	2024-12-29 03:42:20 -06:00
madwind	69dfd8c60e	fix right Stick	2024-12-29 02:11:31 +08:00
madwind	8e50dd9fa6	fix right JoyCon stick	2024-12-29 01:49:25 +08:00
madwind	68c03051ad	For the JoyCon controller, wrap SDL2Gamepad as SDL2JoyCon to use a suitable layout and correct the motion sensing and joystick orientation.	2024-12-29 00:56:03 +08:00
Evan Husted	a837294b11	Merge branch 'master' into master	2024-12-28 06:01:06 -06:00
IvonWei	f1c0cc8076	Merge branch 'Ryubing:master' into master	2024-12-28 09:09:10 +08:00
madwind	6dec7ff8ba	fix motionData	2024-12-28 09:07:22 +08:00
madwind	20fdbff964	clean log	2024-12-26 14:47:40 +08:00
IvonWei	e426680cb0	Merge branch 'GreemDev:master' into master	2024-12-26 11:58:50 +08:00
madwind	7863e97cb0	invoke OnGamepadConnected and OnGamepadDisconnected	2024-12-26 11:58:00 +08:00
madwind	c4dea0ee28	add SQL_JOYBATTERYUPDATED , OnJoyBatteryUpdated	2024-12-26 11:54:52 +08:00
IvonWei	e0b6a01e9d	Merge branch 'GreemDev:master' into master	2024-12-25 17:00:53 +08:00
madwind	e509ffa716	delay 2000ms before ShowPowerLevel	2024-12-25 16:57:36 +08:00
IvonWei	714c68b548	Merge branch 'GreemDev:master' into master	2024-12-25 10:41:20 +08:00
madwind	fec197d9ec	log powerLevel	2024-12-25 10:39:07 +08:00
IvonWei	a4b2feef79	Merge branch 'GreemDev:master' into master	2024-12-23 22:13:47 +08:00
IvonWei	ad7d9d1ce0	Update NpadController.cs add ?	2024-12-23 18:55:49 +08:00
IvonWei	86f9544910	Update NpadController.cs back to Debug	2024-12-23 18:54:11 +08:00
madwind	e9ecbd44fc	Add a virtual controller to merge Joy-Cons.	2024-12-23 17:57:55 +08:00