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

2147 Commits

Author SHA1 Message Date
seth
9908e115aa
Merge pull request #1067 from RedsonBr140/feat/dont-hide-settings 
feat: Don't hide the settings tab when an instance is running
 2023-06-15 02:20:00 -04:00
Trial97
811c79423f
Fixed version comparation 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 00:43:05 +03:00
Trial97
cf4c1605eb
Fixed qt5 build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 00:37:32 +03:00
Trial97
e0b901169a
Added new migration for special characters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 00:27:20 +03:00
seth
3f1548ae0e
Merge pull request #1099 from Trial97/logdir 
store logs in seperate directory
 2023-06-14 15:38:47 -04:00
TheKodeToad
3526d00a23
Merge branch 'develop' into feat/dont-hide-settings 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-14 20:05:02 +01:00
DioEgizio
a4502f44c2
Merge pull request #1145 from Trial97/net_job_crash 2023-06-14 12:46:00 +02:00
Trial97
b77fb05908
Added back the INIFile read function 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-13 21:07:05 +03:00
DioEgizio
69bfb55397
Merge pull request #1166 from TheKodeToad/mrpack-export-oops 2023-06-13 18:00:44 +02:00
Tayou
b174f82261
Merge pull request #1162 from leo78913/i-hate-naming-branches 2023-06-12 21:41:17 +02:00
TheKodeToad
f4a814b5e6
Remove unnecessary code 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-12 15:46:15 +01:00
TheKodeToad
94ddc8bbf7
Could this work? 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-12 14:14:50 +01:00
leo78913
d6c7b4e813 add icons to export menu 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-06-11 21:50:29 -03:00
Tayou
5aa1c340dc
rainbow konami & toggle 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-11 01:58:37 +02:00
Trial97
ae9e8dbafd
Removed const specification 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-10 22:04:08 +03:00
Trial97
b3d743635c
Updated the messages 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-09 21:29:12 +03:00
Trial97
f2932c6d03
Fixed some crashes 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-09 21:23:41 +03:00
Trial97
f96b135ef7
Higlight installed mods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-08 20:26:09 +03:00
Tayou
9b9d439fce
Merge pull request #1111 from Trial97/requires 2023-06-07 18:57:46 +02:00
Sefa Eyeoglu
62d1bc87ae
Merge pull request #1117 from leo78913/update-pack-formats 2023-06-07 17:49:52 +02:00
Tayou
51ed39804f
Merge pull request #1125 from Ryex/fix/link-crash-1118 2023-06-07 16:14:53 +02:00
Rachel Powers
d12110b47b
fix #1118 : use filePath not path on QFileInfo 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-07 06:26:58 -07:00
Sefa Eyeoglu
accf0cd40e
Merge pull request #1115 from leo78913/fix-resource-downloader-crash 2023-06-07 08:47:19 +02:00
leo78913
a9302468e7 update resource and data pack pack_format_versions 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-06-06 16:10:15 -03:00
Tayou
3b9d822d72
Merge pull request #1073 from leo78913/accounts-menus-fixes 2023-06-06 20:34:41 +02:00
leo78913
a807b231a7 fix: fix crash when selecting resource/texture/shader packs 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-06-06 15:17:13 -03:00
leo78913
d59a06344a fix main toolbar accounts toolbutton name 
previously it was not using the selected account name when opening the launcher

and i also added an action group to the menu items so it uses radio buttons instead of checkboxes :p

Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-06-06 14:21:41 -03:00
Tayou
e884341795
save meta custom url as string, not QUrl 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-06 18:15:26 +02:00
Trial97
1043d29dd5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into requires 2023-06-06 10:34:36 +03:00
Trial97
6505a62801
Renamed requires fields 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-06 10:34:05 +03:00
DioEgizio
e1b37f3cd3
Merge pull request #1108 from Ryex/fix/memory-leak-translation 2023-06-05 20:34:56 +02:00
DioEgizio
0c24827a52
Merge pull request #1103 from Ryex/fix/1.120-allowed_symlinks.txt 2023-06-05 20:32:30 +02:00
TheKodeToad
37b4f606c8 Validate input lengths on mrpack export 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-05 17:54:24 +01:00
Rachel Powers
5824047ffa fix(memory leak): cyclic refrence in translations model dl task 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-05 01:12:16 -07:00
Rachel Powers
3dccc38f42
Merge pull request #904 from TheKodeToad/mrpack-export 
mrpack export
 2023-06-04 19:01:50 -07:00
Rachel Powers
f613b03efd
Typo fix 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-03 08:28:49 -07:00
TheKodeToad
3c87e5d31e Make mcInstance mutable 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-03 13:48:15 +01:00
TheKodeToad
e26827b849 Optimised icons 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-03 13:39:42 +01:00
Rachel Powers
8eb10e991f fix: use isSymLink (i've made this mistake before but I've made it again) 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-02 16:14:38 -07:00
Rachel Powers
f6f32914de fix: add origonal instance path to allowed_symlinks.txt when copying via symlinks 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-02 16:04:27 -07:00
Trial97
d50bd096a4
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into logdir 2023-06-03 00:44:53 +03:00
Alexandru Ionut Tripon
1840505a0f
Fix crash when selecting same mod from different providers (#1029) 2023-06-02 18:04:06 -03:00
Sefa Eyeoglu
0ece0b5b27
Merge pull request #1086 from TayouVR/fix-qt6_5-brown-system-theme 2023-06-02 12:18:37 +02:00
Trial97
17691ab515
Made use of moveFile function 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-02 01:22:25 +03:00
Trial97
3a6657596b
Added migration for old logs 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-01 23:48:48 +03:00
Trial97
6c082403c4
Fixed comments 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-31 20:23:23 +03:00
Trial97
29c3dc40ef
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into logdir 2023-05-31 20:12:12 +03:00
Rachel Powers
7af116fb00 refactor: function scope statics 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-28 05:06:28 -07:00
Rachel Powers
0357921284 cleanup: move qstyle getInstance decl inline 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-28 04:37:09 -07:00
TheKodeToad
86974b046e
Clarify comment 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-28 11:48:09 +01:00
Rachel Powers
a04a6f1e0d fix(memory leak): don't give shared pointers out to foldermodels (causes cyclic refrence) 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-28 02:15:39 -07:00
Rachel Powers
37420405c7 fix(memory leak): refactor NoBigComboStyle -> singleton 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-27 23:22:40 -07:00
Rachel Powers
c81cb59b4b fix(memory leak): don't capture job and create cyclic refrence 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-26 21:21:10 -07:00
Rachel Powers
ff03dd22fe fix(memory leak): don't override default deconstructor + reset shared_ptr + ensure modal get's cleaned up 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-26 21:10:49 -07:00
Rachel Powers
aae892dfd1 fix(memory leak): IndexedPack too large to live inside a qlist without pointers () 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-26 19:21:07 -07:00
Rachel Powers
e61d8e4dc8 fix: katabasis and QStyle leaks 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-25 16:16:58 -07:00
Tayou
3c937532f2
fix System theme colors on windows 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-05-24 15:18:08 +02:00
TheKodeToad
863027cbe8 Enable size grip 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-22 11:56:54 +01:00
Rachel Powers
6b8fe283f0 fix: memory leak, set parent so it's in tree to get cleaned up. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-21 01:49:13 -07:00
Rachel Powers
7983977156 feat: Qt 5.15 adds transfer timeouts. at least use it for downloads 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-21 01:48:34 -07:00
Rachel Powers
21cb459899 fix: memory leak NetJob wans't getting cleaned up. ensure lambda capture of job doens;t increase refcount or it will be cyclic 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-21 01:47:54 -07:00
Rachel Powers
1b3ff96ffd fix: memory leak with NetJob and responce not getting cleaned up 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-21 01:46:28 -07:00
Kode
3be18b58bb
Better variable name :p 
Signed-off-by: Kode <TheKodeToad@proton.me>
 2023-05-15 19:15:56 +01:00
TheKodeToad
22aaf56855 De-hardcode .index 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-15 18:48:49 +01:00
leo78913
7537ea1ef5 make instance settings account selector a comboBox 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-05-14 16:33:41 -03:00
Kode
f60562c5a2
Merge branch 'develop' into mrpack-export 
Signed-off-by: Kode <TheKodeToad@proton.me>
 2023-05-13 19:07:03 +01:00
TheKodeToad
18cfe219fe Hopefully This Works™ 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-13 18:58:05 +01:00
TheKodeToad
129e959a3b Move setAbortable(true) 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-13 18:28:51 +01:00
TheKodeToad
e1b6020b76 Make some changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-13 18:24:01 +01:00
Redson
79ce7eb1fc
fix: shouldDisplay() is now redundant. 
Signed-off-by: Redson <redson@riseup.net>
 2023-05-13 09:00:10 -03:00
Kode
5b8d025440
ty! 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Kode <TheKodeToad@proton.me>
 2023-05-12 14:43:55 +01:00
Rachel Powers
6b6d6a01dc
Merge branch 'develop' into fix/network_and_signals 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-12 01:13:17 -07:00
Rachel Powers
b16829b0f9
Gib -> GiB 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-12 00:21:37 -07:00
Rachel Powers
f27716656c fix: remove qt < 5.6 support process error signal 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-11 16:32:00 -07:00
Redson
37a6ef95f0
feat: Don't hide the settings tab when an instance is running 
Signed-off-by: Redson <redson@riseup.net>
 2023-05-10 08:25:13 -03:00
Redson
475761b295
fix: Prism sets the data dir to the working directory. 
Signed-off-by: Redson <redson@riseup.net>
 2023-05-09 06:36:21 -03:00
Redson
0b251fa754
feat: Add the launcher root folder to the Folders menu 
Signed-off-by: Redson <redson@riseup.net>
 2023-05-08 19:57:30 -03:00
Rachel Powers
30cf73a22f typo fix 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-07 13:23:59 -07:00
Rachel Powers
884ac73078 Merge remote-tracking branch 'upstream/develop' into better-tasks 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-07 13:21:21 -07:00
Rachel Powers
718abaae0e doc fixes 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-06 19:18:39 -07:00
Rachel Powers
62a402d05a refactor: move functions to utils + code-review fixes 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-06 19:10:58 -07:00
Sefa Eyeoglu
ce5bb29c44
Merge pull request #1054 from Ryex/more-lax-block-mods-filename-check 2023-05-06 09:54:59 +02:00
Sefa Eyeoglu
d535f73a58
Merge pull request #950 from DioEgizio/resize-settings 
fix: divide minecraftpage into tabs
 2023-05-06 08:28:46 +02:00
DioEgizio
d38696f411
Update launcher/ui/pages/global/MinecraftPage.ui 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-05-06 07:15:14 +02:00
Rachel Powers
d0b6f0124b change: don't search appdata locaiton for logging rules if using custom data dir 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-05 14:13:34 -07:00
Rachel Powers
b266068644
Apply suggestions from code review 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-05 14:07:10 -07:00
Rachel Powers
e0635955df fix: super lax compare 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-04 13:30:39 -07:00
Rachel Powers
5ec4cbf1cb fix add an addtion lax file name match with replaced with + 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-03 20:31:15 -07:00
TheKodeToad
e0380960fd Change to use future 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-02 14:23:31 +01:00
Sefa Eyeoglu
64ba5e4ed1
Merge pull request #833 from Ryex/advanced_copy_instance 2023-05-02 12:11:41 +02:00
Rachel Powers
733619ca74 feat: estimate remining time on downloads 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
9f9c829bc5 fix: prevent logspam, fix MacOS theme artifacts 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
236764adf6 refactor: Qt can handle const& in signals and slots 
While most Qt types cna use implicit data sharing
pasing our own structs means copies. const& ensure
it's only copied as needed by Qt.

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
a80b425551 fix: no need for const bool 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
d7032d975c fix: no need to loop all sub tasks 
pathc by flowin

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
96decbac27 feat: default qtlogging.ini file 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
0fb6a2836b refactor: propogate only only one StepProgress at a time 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
fe36471b8d refactor: logging.h -> Logging.h 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
6b28af6cc5 fix: clean up license headers for Tasks 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
6306fb564b feat: add UID to debug lines of upload tasks 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00