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

6636 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sefa Eyeoglu
7004388105
Merge pull request #1227 from Ryex/packaging/appimage-updates 2023-08-07 13:18:06 +02:00
Rachel Powers
9a9a4fcfd4
Apply suggestions from code review 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-08-06 13:16:30 -07:00
seth
efaf4024ab
Merge pull request #1464 from Ryex/fix/windows-console-attach 
[Windows] Fix attaching logs to console
 2023-08-06 15:37:44 -04:00
Sefa Eyeoglu
5b8c997180
Merge pull request #1456 from Trial97/icons 2023-08-05 22:50:52 +02:00
Trial97
377fc0352a
Merge branch 'staging' of https://github.com/PrismLauncher/PrismLauncher into icons 2023-08-05 19:00:12 +03:00
Sefa Eyeoglu
304e294ea7
Merge pull request #1102 from Ryex/refactor/net-split-headers-to-proxy-class 2023-08-04 20:31:43 +02:00
seth
50c7d39e08
Merge pull request #1483 from DioEgizio/update-qt652 
[macOS,Windows] Update to Qt 6.5.2
 2023-08-04 12:05:45 -04:00
DioEgizio
b013133cc1 chore: update to qt 6.5.2 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-08-03 09:24:47 +02:00
Sefa Eyeoglu
ac36a2289f
Merge pull request #1452 from getchoo/sparkle-disable 2023-08-02 19:28:01 +02:00
Sefa Eyeoglu
fa2b784f7e
Merge branch 'develop' into sparkle-disable 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-02 19:27:48 +02:00
Sefa Eyeoglu
01e17806f6
Merge pull request #1391 from Trial97/prism_export2 2023-08-02 19:27:14 +02:00
Sefa Eyeoglu
f561e7febf
Merge pull request #1476 from Scrumplex/fix-saving-metaurl 2023-08-02 19:24:24 +02:00
Sefa Eyeoglu
39d4f0df66
fix: don't reset meta url on launch 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-02 18:56:54 +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: 10678096e5
I, ashuntu <101582426+ashuntu@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 51d7a6289e
I, ashuntu <101582426+ashuntu@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 1467072f3d

Signed-off-by: ashuntu <101582426+ashuntu@users.noreply.github.com>
 2023-08-02 10:04:53 -05:00
Rachel Powers
bae59a8c07
refactor(windows console): reduce code duplication 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-08-02 06:19:43 -07: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
Rachel Powers
f19e8dd086
Apply suggestions from code review 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-08-01 18:53:51 -07:00
Rachel Powers
5a9f780cf8
fix(FlameInstanceCreationTask): include Net::Apidownload 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-31 22:36:13 -07:00
Rachel Powers
2d1197f59f
Merge branch 'develop' into refactor/net-split-headers-to-proxy-class 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-31 22:26:20 -07:00
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
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
Trial97
c3eb17db74
removed unneded if condition 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 13:22:04 +03:00
Trial97
4789708cc2
added missing ) 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 13:16:57 +03:00
Alexandru Ionut Tripon
83fce74bb1
Update launcher/ui/dialogs/NewInstanceDialog.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-07-28 13:11:56 +03:00
Trial97
fcac98b367
removed comment 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 10:05:22 +03:00
Trial97
97ff7afbe7
keep the icon suffix 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 08:37:45 +03:00
Trial97
7e58b965b7
refactor icon list 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 01:20:05 +03:00
Trial97
1ca7e5efe9
added license header 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 01:20:05 +03:00
Trial97
d460986de0
format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-28 01:20:05 +03:00
Sefa Eyeoglu
bdec11c501
Merge pull request #1437 from LostLuma/instance-export-ignore-caches-2 2023-07-27 09:40:31 +02:00
Sefa Eyeoglu
b1aa9e5846
refactor: introduce internal Launcher_ENABLE_UPDATER variable 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-07-27 09:37:56 +02:00
seth
51bfda937d
chore: don't include sparkle when not enabled 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-27 02:19:21 -04: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
a8498b0dab
chore: make INSTALL_BUNDLE a cached variable 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-26 19:03:14 -04:00
seth
48e5040196
feat: disable sparkle when update url is empty 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-26 19:01:39 -04: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