Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-12 05:07:46 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,508 Commits 9 Branches 38 Tags
ff1fb8755a7a2e2cb25dcc7a3ed271de88ff37dc
Commit Graph

416 Commits

Author SHA1 Message Date
Trial97
91d03b34ac Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into validate_metadata 2024-07-21 02:24:30 +03:00
Alexandru Ionut Tripon
0041d2a126 Merge pull request #2440 from Trial97/fix_retry_dialog 
update retry netjob dialog
 2024-07-19 15:47:12 +03:00
Ben Westover
fb10cb5fdf Fix a few typos 
As part of packaging Prism Launcher for Debian, I have run a package linter
called lintian which found a few spelling errors throughout the source.

I am not a fan of contributions that only fix cosmetics like spelling errors,
but Debian encourages forwarding this stuff upstream instead of letting it get
fixed naturally over time.

Signed-off-by: Ben Westover <me@benthetechguy.net>
 2024-07-18 22:08:18 -04:00
Trial97
a09742a406 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-07-06 01:07:00 +03:00
Kationor
83a5fe1984 Rename setting to SkipModpackUpdatePrompt 
Was ModpackUpdatePromptDisabled

Signed-off-by: Kationor <n96211028@gmail.com>
 2024-07-03 23:13:39 +02:00
Kationor
9b172278f8 Add ModpackUpdatePromptDisabled setting 
When creating an instance of a modpack that's already associated with
another instance, the user gets asked if they want to update that
instance instead. This commit introduces a setting to suppress the
prompt and directly create the new instance.

Signed-off-by: Kationor <n96211028@gmail.com>
 2024-07-03 12:43:05 +02:00
Trial97
0f311453e1 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-30 22:54:23 +03:00
Trial97
4b4da8e6f6 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-30 22:41:49 +03:00
Alexandru Ionut Tripon
fc445078cd Merge pull request #2415 from Trial97/configure_timeout 
Add config for transfer timeout
 2024-06-30 22:26:19 +03:00
Trial97
7a0b299be9 control Prism data directory via env variable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-29 18:08:28 +03:00
Trial97
2af6902b42 validate metadata on launch 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:51:26 +03:00
Trial97
515baffb8e Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog 2024-06-28 20:48:28 +03:00
Trial97
0b79abcdcd Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:45:30 +03:00
Alexandru Ionut Tripon
2cd0223cff Merge pull request #2578 from Trial97/clang-format 
chore:increment clang-tools version
 2024-06-28 19:33:18 +03:00
Trial97
147741e616 increment clang-tools version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 12:48:52 +03:00
seth
66e6fc04d3 Merge pull request #2520 from Trial97/metadata 2024-06-28 04:57:39 +00:00
Trial97
096266c141 fix update message 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 21:31:26 +03:00
Trial97
2108ddcc1d completly remove metadata on refresh 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 01:16:09 +03:00
Trial97
11ae169087 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-10 09:34:48 +03:00
Trial97
e63f25c9e4 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-10 09:01:01 +03:00
Trial97
689b76885c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 2024-06-09 20:13:09 +03:00
Trial97
ca369ac2b0 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-09 19:52:37 +03:00
Alexandru Ionut Tripon
3af4c94612 Merge pull request #2390 from Trial97/delete_tmp 
Delete instaces tmp diectory on startup
 2024-06-09 16:03:51 +03:00
Trial97
45463dcd75 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2024-06-04 11:04:02 +03:00
Trial97
7a200a337f update retry netjob dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-26 11:04:41 +03:00
Trial97
425a6e0919 Fix code format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-19 10:09:34 +03:00
Trial97
d9e2badf71 Rename timeout option 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-19 08:54:19 +03:00
Trial97
6078a771c1 add config for transfer timeout 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 21:46:05 +03:00
Trial97
7a5348a179 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-05-18 14:14:31 +03:00
Trial97
633489884d Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 13:27:31 +03:00
Alexandru Ionut Tripon
3887cfe5df Merge pull request #1525 from Trial97/waitprofiler 
Add wait profiler
 2024-05-18 13:17:24 +03:00
Trial97
23134d4b72 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 2024-05-18 11:38:18 +03:00
Trial97
d795ba25e7 Delete instaces tmp diectory on startup 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-10 20:55:26 +03:00
Trial97
3a4f82ffd1 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-24 00:21:39 +03:00
Trial97
9f48694eb2 Fixed application close on open file dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-09 08:28:09 +03:00
Alexandru Ionut Tripon
b3abc052b5 Merge pull request #1529 from Trial97/portabledatadir 
Added UserData as another posible path for portable builds
 2024-03-28 14:48:34 +02:00
Trial97
1a6dfd04d6 Made tar.gz parser 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-21 19:46:57 +02:00
Trial97
1322277ae6 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-03-17 20:57:53 +02:00
Trial97
889f604a41 Removed JavaExtraSearchPaths 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-18 21:38:31 +02:00
DioEgizio
44327980db feat: add "use zink" button 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-02-18 13:30:55 +01:00
Trial97
2941307581 Added basic java auto-detect and auto-download 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-16 23:42:39 +02:00
Trial97
031a9f4738 Replaced QFile::remove with FS::deletePath 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-10 11:03:51 +02:00
Trial97
379f1a70e9 Leave headers alone 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-08 22:37:57 +02:00
Trial97
b3fc07d444 Added extra java search paths 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-08 21:47:59 +02:00
Trial97
3d29da916d Made Java path configurable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-08 20:15:19 +02:00
Trial97
ba990e075b Added JavaPath function 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-08 19:45:46 +02:00
Trial97
25bca28707 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-01-24 18:26:48 +02:00
Trial97
a0e7729aa6 Started workin on stuff 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-24 18:26:43 +02:00
Sefa Eyeoglu
a62eaba702 Merge pull request #1825 from Trial97/ftb_import 2024-01-18 18:18:17 +01:00
TheKodeToad
f285c3fe13 Merge pull request #1972 from lumiscosity/feature/cat_opacity 
Add a cat opacity option
 2024-01-06 19:42:17 +00:00