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

6550 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rachel Powers
760b80934f
fix(filelink exe): add console sources 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 15:22:18 -07:00
Rachel Powers
6d564628b7
fix(FileLink): drop FreeConsole 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 15:11:00 -07:00
Rachel Powers
a7ef663735
fix(windows console): use new logic in FileLink exe 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 14:03:20 -07:00
Rachel Powers
186211244d
refactor(windows console): move to external file 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 13:38:47 -07:00
Rachel Powers
5740ee0444
fix(windows console): properly bind windows console 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 13:38:47 -07:00
seth
9137721e8e
Merge pull request #1461 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2023-07-30 04:45:10 -04:00
Sefa Eyeoglu
566425166b
Merge pull request #1449 from Trial97/tehnic 
Reintroduce parsing of INI files
 2023-07-30 09:47:40 +02:00
github-actions[bot]
d1513732be chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/f465da166263bc0d4b39dfd4ca28b777c92d4b73' (2023-07-22)
  → 'github:nixos/nixpkgs/d2b52322f35597c62abf56de91b0236746b2a03d' (2023-07-29)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/eb433bff05b285258be76513add6f6c57b441775' (2023-07-18)
  → 'github:cachix/pre-commit-hooks.nix/1e2443dd3f669eb65433b2fc26a3065e05a7dc9c' (2023-07-29)
 2023-07-30 00:20:33 +00:00
Sefa Eyeoglu
bdec11c501
Merge pull request #1437 from LostLuma/instance-export-ignore-caches-2 2023-07-27 09:40:31 +02:00
LostLuma
4a9ea832ff
Ignore cache files entirely, also apply to modpack export 
Signed-off-by: LostLuma <lilly@lostluma.net>
 2023-07-27 01:42:14 +02:00
seth
928e18b66d
Merge pull request #1446 from getchoo/nix-fixes 
disable darwin in flake + cleanup garnix.yaml + fix markdownlint warnings
 2023-07-26 17:10:07 -04:00
Sefa Eyeoglu
d960effb99
Merge pull request #1447 from getchoo/typomoment 
fix: typo in task.h
 2023-07-26 22:56:31 +02:00
Trial97
1e82cb6a7c
fix: add support for QByteArray inifile 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-26 23:56:01 +03:00
seth
af59c41713
fix: typo in task.h 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-26 16:20:30 -04:00
seth
f7ffbcca6c
chore(docs): correct markdownlint warnings 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-26 14:49:09 -04:00
seth
342a0d0091
fix(nix): disable x86_64-darwin 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-26 14:49:09 -04:00
seth
1974bb7e59
chore(ci): cleanup garnix.yaml 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-26 14:49:05 -04:00
Sefa Eyeoglu
a0944dab7a
Merge pull request #1438 from Scrumplex/update-docs 2023-07-26 20:30:04 +02:00
LostLuma
a9fefb2eeb
Address review comments 
Signed-off-by: LostLuma <lilly@lostluma.net>
 2023-07-26 15:22:22 +02:00
Sefa Eyeoglu
4ad448993c
fix: fix typo in README 
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-07-26 14:48:53 +02:00
Sefa Eyeoglu
bcadffa0e3
Merge pull request #1434 from getchoo/garnix 2023-07-26 14:47:14 +02:00
TheKodeToad
ce2d2c9f32
Merge pull request #1427 from tjw123hh/develop 
Add some missing strings to translations
 2023-07-26 13:41:54 +01:00
Sefa Eyeoglu
6f652e1d2f
chore: update information for downstreams 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-07-26 14:38:34 +02:00
LostLuma
361583edfc
Ignore cache files when exporting instances 
Signed-off-by: LostLuma <lilly@lostluma.net>
 2023-07-26 04:23:01 +02:00
seth
fbf29274e8
chore(ci): remove nix job 
we're using garnix now

Signed-off-by: seth <getchoo@tuta.io>
 2023-07-25 19:23:17 -04:00
seth
3c35d647b8
feat(ci): init garnix.yaml 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-25 19:18:30 -04:00
TheKodeToad
b4159d30fc Revert permission change 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-25 15:17:20 +01:00
tjw123hh
f843d0732b Merge branch 'develop' of https://github.com/tjw123hh/PrismLauncher into develop 2023-07-25 17:36:38 +08:00
tjw123hh
280f041acb Delete some incorrect notr="true" tags 
Signed-off-by: tjw123hh <tjw123hh@outlook.com>
 2023-07-25 17:35:31 +08:00
Sefa Eyeoglu
4f00012268
Merge pull request #1426 from TheKodeToad/token-censor-fix 2023-07-24 20:41:23 +02:00
tjw123hh
4ab630b832
Update org.prismlauncher.PrismLauncher.desktop.in 
Signed-off-by: tjw123hh <56749271+tjw123hh@users.noreply.github.com>
 2023-07-24 20:50:11 +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
TheKodeToad
f505d43fc0 Fix token "0" being replaced 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-24 13:43:26 +01: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