CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,519 Commits 10 Branches 30 Tags 34 MiB
280f041acb
Commit Graph

6519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tjw123hh
280f041acb Delete some incorrect notr="true" tags 
Signed-off-by: tjw123hh <tjw123hh@outlook.com>
 2023-07-25 17:35:31 +08:00
tjw123hh
a32ca43288 DCO Remediation Commit for tjw123hh <tjw123hh@outlook.com> 
I, tjw123hh <tjw123hh@outlook.com>, hereby add my Signed-off-by to this commit: 6a01c277e8

Signed-off-by: tjw123hh <tjw123hh@outlook.com>
 2023-07-24 20:48:27 +08:00
tjw123hh
6a01c277e8 Delete some incorrect tags 2023-07-24 20:41:22 +08:00
Sefa Eyeoglu
684c2ec47a
Merge pull request #1420 from PrismLauncher/update_flake_lock_action 2023-07-23 11:45:31 +02:00
seth
273d75fd51
Merge pull request #1419 from pandaninjas/update-libnbtplusplus 
Update libnbtplusplus submodule
 2023-07-22 20:41:27 -04:00
github-actions[bot]
6f6b0b9661 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'libnbtplusplus':
    'github:PrismLauncher/libnbtplusplus/2203af7eeb48c45398139b583615134efd8d407f' (2022-04-15)
  → 'github:PrismLauncher/libnbtplusplus/a5e8fd52b8bf4ab5d5bcc042b2a247867589985f' (2023-07-22)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/46ed466081b9cad1125b11f11a2af5cc40b942c7' (2023-07-15)
  → 'github:nixos/nixpkgs/f465da166263bc0d4b39dfd4ca28b777c92d4b73' (2023-07-22)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/5e28316db471d1ac234beb70031b635437421dd6' (2023-07-14)
  → 'github:cachix/pre-commit-hooks.nix/eb433bff05b285258be76513add6f6c57b441775' (2023-07-18)
 2023-07-23 00:21:25 +00:00
PandaNinjas
2253100ac6 Update libnbtplusplus submodule 
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
 2023-07-22 14:26:49 -04:00
TheKodeToad
6ffcfcd7e9
Merge pull request #1402 from Trial97/flame_import 
feat:made flame instace creation use metadata for recommended version
 2023-07-22 11:14:12 +01:00
Sefa Eyeoglu
821dd8400b
Merge pull request #1253 from Trial97/catpacks 2023-07-21 11:11:12 +02:00
Trial97
f8d9cd9a03
use range for 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-19 23:08:16 +03:00
Trial97
b7bccb9058
removed subdirectory flag 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-19 12:27:02 +03:00
Trial97
f046bd7d50
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks 2023-07-19 12:26:12 +03:00
TheKodeToad
593f452986
Merge pull request #1399 from Scrumplex/offline-uuid 
fix: generate predictable UUIDs for offline accounts
 2023-07-19 10:16:27 +01:00
seth
f8d88cc83d
Merge pull request #1372 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2023-07-18 21:19:58 +00:00
Trial97
f393aa684e
wait to load metadata 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-18 23:59:43 +03:00
Trial97
4c319c8f4f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into flame_import 2023-07-18 23:49:52 +03:00
Sefa Eyeoglu
3728cbb62a
Merge pull request #1397 from Gaming32/develop 2023-07-18 22:47:55 +02:00
Sefa Eyeoglu
3fbc25155b
Merge pull request #1362 from Trial97/fix_warning 2023-07-18 22:28:27 +02:00
Sefa Eyeoglu
ecac05b2fc
Merge pull request #1378 from Trial97/prism_export 
Added progress bar to Prism instance export
 2023-07-18 22:26:56 +02:00
seth
5b54475d3e
Merge pull request #1385 from orowith2os/flatpak-updates 
Update Flatpak manifest
 2023-07-18 20:12:39 +00:00
Trial97
391497645f
feat:made flame instace creation use metadata for recommended version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-18 22:33:39 +03:00
Sefa Eyeoglu
f8fcb98c68
fix: generate predictable UUIDs for offline accounts 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-07-18 10:07:35 +02:00
Dallas Strouse
2eff1de560
Update Flatpak manifest 
Signed-off-by: Dallas Strouse <dastrouses@gmail.com>
 2023-07-17 22:38:12 -05:00
Josiah Glosson
1fbb41f5e2
Make Launch Offline not launch online in 1.6+ 
Signed-off-by: Josiah Glosson <soujournme@gmail.com>
 2023-07-17 17:07:06 -05:00
TheKodeToad
01afa8957f
Merge pull request #1387 from Scrumplex/fix-quilt-beacon 
Check if any modloader is installed
 2023-07-17 17:40:42 +01:00
Trial97
b0940d696b
Added QFutureWatcher 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

abort

forgot

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-17 17:52:00 +03:00
Trial97
fe73d696cb
replace emplace with insert 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-17 17:24:29 +03:00
Trial97
2ea4a78541
Upgraded ExportToZipTask 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-17 17:24:23 +03:00
Sefa Eyeoglu
2be630904f
fix: don't take modloaders by reference 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-07-17 14:33:01 +02:00
Tayou
e8c44e700d
Merge pull request #1286 from TayouVR/better-instance-group-separator 2023-07-17 11:55:31 +02:00
Sefa Eyeoglu
54a091ca59
fix: check if any modloader is installed 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-07-17 10:09:01 +02:00
Trial97
ec32618e11
reveted back to add years 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-17 10:20:22 +03:00
Sefa Eyeoglu
aaf1726965
Merge pull request #1357 from getchoo/quilt-beacon 
feat: add toggle for quilt beacon
 2023-07-17 06:42:46 +02:00
seth
6b970954d6
Merge pull request #1381 from getchoo/backporting-docs 
chore(docs): add backporting info to CONTRIBUTING.md
 2023-07-16 18:36:51 -04:00
seth
ed2f680202
chore(docs): add backporting info to CONTRIBUTING.md 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-16 17:28:52 -04:00
seth
5e0df9b696
Merge pull request #1276 from Scrumplex/print-build-platform 
Print build platform on launch
 2023-07-16 17:15:55 -04:00
Alexandru Ionut Tripon
ec41252535
Update launcher/MMCZip.h 
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-07-16 23:47:54 +03:00
Alexandru Ionut Tripon
4df9df03ab
Update launcher/MMCZip.cpp 
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-07-16 23:47:47 +03:00
Trial97
79222a56e3
use shared pointer 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

use shared pointer
 2023-07-16 21:14:39 +03:00
Trial97
cadb7142f0
Added progress bar to Prism instance export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-16 20:57:57 +03:00
Trial97
251055302e
format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-16 20:53:58 +03:00
Sefa Eyeoglu
b54d1651ab
Merge pull request #1373 from Scrumplex/backport-bot 2023-07-16 19:42:09 +02:00
Trial97
de30a72c4e
made the date a object 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-16 15:16:16 +03:00
Trial97
0a956bbc73
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks 2023-07-16 14:18:26 +03:00
Trial97
1e9a596908
simplified code in cat packs 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-16 14:18:17 +03:00
Sefa Eyeoglu
b9568279dc
Merge pull request #1010 from TayouVR/add_default_editorconfig 2023-07-16 12:30:22 +02:00
Sefa Eyeoglu
fcdd9ea986
Merge pull request #1246 from Trial97/export 2023-07-16 12:24:42 +02:00
Sefa Eyeoglu
c145bfa524
Merge pull request #1369 from Trial97/autoselect 2023-07-16 12:21:17 +02:00
Sefa Eyeoglu
18ebc858fd
feat(actions): add backport action 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-07-16 11:47:54 +02:00
github-actions[bot]
6597a5c860 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/267149c58a14d15f7f81b4d737308421de9d7152' (2023-07-01)
  → 'github:hercules-ci/flake-parts/8e8d955c22df93dbe24f19ea04f47a74adbdc5ec' (2023-07-04)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/cd99c2b3c9f160cd004318e0697f90bbd5960825' (2023-07-01)
  → 'github:nixos/nixpkgs/46ed466081b9cad1125b11f11a2af5cc40b942c7' (2023-07-15)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/42587d3414d1747999a5f71e92a83cf6547b62da' (2023-07-03)
  → 'github:cachix/pre-commit-hooks.nix/5e28316db471d1ac234beb70031b635437421dd6' (2023-07-14)
 2023-07-16 00:23:55 +00:00