Sefa Eyeoglu
a545f67a21
fix: take JavaCheckResult by const reference
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02 18:35:07 +02:00
Sefa Eyeoglu
9d5818916a
fix(nix): enable clang-format
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02 18:35:07 +02:00
Sefa Eyeoglu
ea56ff255d
Merge pull request #1339 from TheKodeToad/remove-direct-launch
2023-08-02 18:31:27 +02:00
Sefa Eyeoglu
01d3eea379
Merge pull request #1359 from Trial97/import
2023-08-02 18:25:51 +02:00
Alexandru Ionut Tripon
f13eccb03d
Update launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-08-02 19:24:58 +03:00
Sefa Eyeoglu
39d7bc6c24
Merge pull request #1294 from ashuntu/develop
2023-08-02 18:24:54 +02:00
ashuntu
6a7f63166d
DCO Remediation Commit for ashuntu <101582426+ashuntu@users.noreply.github.com>
...
I, ashuntu <101582426+ashuntu@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 10678096e551d7a6289e1467072f3d
2023-08-02 10:04:53 -05:00
TheKodeToad
bb039d4bc7
Merge pull request #1445 from Trial97/curse
...
feat: removed flame quilt warning
2023-08-02 12:55:49 +01:00
Sefa Eyeoglu
92b2f463e3
Merge pull request #1474 from apix0n/develop
2023-08-02 12:08:34 +02:00
Apix
16e6a01881
fix: fix copyright year
...
Signed-off-by: Apix <apix0n@outlook.com>
2023-08-02 11:35:54 +02: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
ashuntu
1467072f3d
Removed snapcraft.yaml in favor of dedicated repo: https://github.com/ashuntu/prismlauncher-snap
2023-07-28 16:25:32 -05:00
Ash
d133b40b25
Merge branch 'PrismLauncher:develop' into develop
2023-07-28 21:22:35 +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
Alexandru Ionut Tripon
31b62203a7
Update launcher/ui/MainWindow.cpp
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-07-26 23:44:35 +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
Trial97
e6b4fc9182
removed quilt warning
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-26 21:36:40 +03:00
Trial97
c778dcbc9c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
2023-07-26 21:33:15 +03: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
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
Trial97
0b74b3833a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import
2023-07-21 19:30:06 +03:00
