git_admin/obsidian-vault
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[2026-05-29] fix: resolved merge conflict in wiki/htpc-bazzite-proton.md

Browse Source
This commit is contained in:
Alexey Martemyanov
2026-05-29 08:50:04 +06:00
parent 2a730e45da
commit 65ba02027d
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wiki/htpc-bazzite-proton.md
+2 -7
View File
@@ -33,13 +33,8 @@ on Proton 8.0.
- **Rayman Origins** (fixed 2026-05-23 — GE-Proton10-34 + `WINEDLLOVERRIDES=\"d3d9=b\" %command%`)
- Samurai Gunn (works but **gamepad not detected**)
- GTA V, Cuphead (assumed; not retested)
<<<<<<< HEAD
- **VK GameCenter** (GE-Proton10-34, shared prefix c Lutris, авторизация через Lutris + `vk-login-helper`)
- **Atomic Heart VK** (через VK GameCenter, 97GB, `Data/gamecenter/atomic heart/`, URL-схема `vkplay://play/0.2015959`)
=======
- **VK GameCenter** (GE-Proton10-34, `Data/gamecenter/GameCenter/`)
- **Atomic Heart VK** (через VK GameCenter, 97GB, `Data/gamecenter/atomic heart/`)
>>>>>>> nas/main
|- **VK GameCenter** (GE-Proton10-34, shared prefix c Lutris, авторизация через Lutris + `vk-login-helper`)
|- **Atomic Heart VK** (через VK GameCenter, 97GB, `Data/gamecenter/atomic heart/`, URL-схема `vkplay://play/0.2015959`)
- **Doom 3 BFG** (через flatpak Classic-RBDOOM-3-BFG)
## Removed from Steam shortcuts ✅