0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,813 Commits 1 Branch 0 Tags 29 MiB
0bec0046bb
Commit Graph

1917 Commits

Author SHA1 Message Date
leo78913
7439fd6bcb fix: Fix some stuff in the menu bar 
- Remove duplicated launch actions
 - Enable the add instance action icon in menus
 - Remove ugly separator at the end of the help menu if the updater is disabled
 - Add icons to the help and news menu items

Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-11-15 10:56:41 -03:00
Redson
6fe626ab9a
feat: Make the changes persistent. 
Signed-off-by: Redson <redson@riseup.net>
 2022-11-15 06:09:13 -03:00
Redson
a12f892841
fix: Check the box when the theme is changed via settings 
Signed-off-by: Redson <redson@riseup.net>
 2022-11-15 05:46:24 -03:00
Redson
aa3ea79f94
fix: Check the current theme box on startup. 
Signed-off-by: Redson <redson@riseup.net>
 2022-11-15 05:38:31 -03:00
Redson
ef53455b66
fix: Build on QT6 
Signed-off-by: Redson <redson@riseup.net>
 2022-11-15 05:19:46 -03:00
ADudeCalledLeo
ba46ff6692
Merge remote-tracking branch 'upstream/develop' into feature/instance-shortcuts 2022-11-15 10:05:04 +02:00
leo78913
0e916244f0
feat: Add themes and their logic. 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-11-14 21:10:48 -03:00
RedsonBr140
1e4ee02cbc
Merge branch 'PrismLauncher:develop' into menu-themes 2022-11-14 21:09:37 -03:00
flow
cedc7754d9
Merge pull request #428 from DioEgizio/fixes-to-CI 2022-11-14 14:16:01 -08:00
flow
fece9e207b
Merge pull request #448 from TheLastRar/fixup-warnings 2022-11-14 14:15:46 -08:00
ADudeCalledLeo
cca052ccc9
Restore QRC headers 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-14 22:46:41 +02:00
Sefa Eyeoglu
5be9472912
fix: fix potentially uninitialized variable 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-14 21:20:38 +01:00
Redson
be765f8d88
feat: Add empty menu 
Signed-off-by: Redson <redson@riseup.net>
 2022-11-14 16:33:25 -03:00
leo78913
8d6aecd944 add the missing icons to the legacy icon theme 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-11-14 16:16:52 -03:00
TheLastRar
aef5349aee Pass index.parent() as parent parameter for rowCount 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-14 19:05:57 +00:00
TheLastRar
ac993aa31f Use Q_UNUSED instead of [[maybe_unused]] in onParseFailed 
Qt5 on Ubuntu cannot handle [[maybe_unused]] in this function

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-14 19:05:57 +00:00
TheLastRar
fce323b945 Check parent in rowCount/columnCount/canFetchMore 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-14 19:05:57 +00:00
TheLastRar
5558f3d2cc Mark paramaters of dropMimeData as unused 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-14 19:05:57 +00:00
TheLastRar
08f8623cb7 Mark paramaters of onParseFailed as unused 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-14 19:05:56 +00:00
TheLastRar
f8a137a26e Mark loadExtraPackInfo abstract 
All classes that inherit from ModModel override this method

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-14 19:05:56 +00:00
TheLastRar
3cba359d38 Mark paramater runtimeContext as unused 
Base class uses variable, but ImplicitRule does not

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-14 19:05:56 +00:00
TheLastRar
b8d7aedb2c Mark paramater line as unused in guessLevel() 
The base method doesn't use this variable, but classes overriding this method do

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-14 19:05:56 +00:00
TheLastRar
55c7b291e1 Remove unused qhash function 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-14 19:05:56 +00:00
TheLastRar
472d931b4b Prefix member variables in HttpMetaCache 
MSVC warns about shadowing variables

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-14 19:05:56 +00:00
ADudeCalledLeo
ce892c9e77
Add icon 
NOTE: Currently missing on Legacy, Flat and Flat (White)
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-14 21:02:31 +02:00
Sefa Eyeoglu
e14b998da3
refactor: improve readability 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-14 18:38:12 +01:00
Ryan Cao
2c9452efaf
Merge branch 'develop' into macos-add-to-path 2022-11-14 19:26:31 +08:00
Ryan Cao
97a7af855f
slight reword: "install to PATH" 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-14 19:21:47 +08:00
ADudeCalledLeo
5be8545edc
Windows, Linux: prevent segfault on missing icon 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-13 20:18:51 +02:00
txtsd
0a04c3a2a7 fix: Fix the error that CodeQL caught 
Signed-off-by: txtsd <code@ihavea.quest>
 2022-11-13 18:54:55 +01:00
ADudeCalledLeo
acd50969e0
Linux: remove TryExec entry from .desktop files 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-13 19:50:27 +02:00
ADudeCalledLeo
b0269e6dfc
Linux: fixes 
- Fix shortcut icons
- Possibly fix shortcut creation on AppImages
- Fix shortcut not working if path to launcher contains spaces

Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-13 17:51:29 +02:00
ADudeCalledLeo
43b9d9484d
tabs -> spaces 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-13 15:49:28 +02:00
ADudeCalledLeo
69bbb29328
Mac: attempt 2 
- create .command files instead of .sh
- fix shortcuts not working if path to Prism Launcher contains spaces
- fix path to executable in shortcutss
- add check for running from extracted folder (prevents creating shortcuts)

Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-13 15:47:37 +02:00
flow
577069cfb4
fix: don't have the clear button on instance page filters 
This thing is otherworldly unoptimized. o.O

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-12 19:23:57 -03:00
Sefa Eyeoglu
fe94c3609e
fix: implement code review suggestions 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:28:30 +01:00
Sefa Eyeoglu
173aed7fd8
chore: add REUSE headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:28:30 +01:00
Sefa Eyeoglu
335bec68fb
fix: prevent abort for un-abortable tasks 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:28:30 +01:00
Sefa Eyeoglu
bbb7e9f5c7
feat: show current copy operation in migration dialog 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:28:30 +01:00
Sefa Eyeoglu
086304f7f2
feat: add initial Migration dialog 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:28:30 +01:00
Sefa Eyeoglu
bd7065eece
feat: add SimplePrefixMatcher 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:28:30 +01:00
Sefa Eyeoglu
15aaff7c1c
feat: add dryRun to copy operation 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:28:29 +01:00
Sefa Eyeoglu
e048bce13e
refactor: allow copy operation with whitelist 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:27:13 +01:00
Sefa Eyeoglu
ddfb449b28
fix: remove PolyMC data paths 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:27:13 +01:00
ADudeCalledLeo
5322155b19
Mac: fix build 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:48:21 +02:00
ADudeCalledLeo
45ce72593a
Windows: remove icon if shortcut creation fails 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:43:58 +02:00
ADudeCalledLeo
b813c867b5
refactor #if checks 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:41:52 +02:00
ADudeCalledLeo
f7d7d76ee8
Mac: now supported! [UNTESTED] 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:36:49 +02:00
ADudeCalledLeo
7e5076b068
Linux: fix path shortcut is written to 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:32 +02:00
ADudeCalledLeo
dbe0553b4a
Move addAction call above left-align loop 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:31 +02:00
ADudeCalledLeo
9be48f1dc4
this ain't static, falco 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:31 +02:00
ADudeCalledLeo
6043444e4e
Apply suggestions from code review 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:30 +02:00
ADudeCalledLeo
487e352642
Fix nested #if directive 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:29 +02:00
ADudeCalledLeo
cc5f82bfac
Windows: fix window icon being replaced 
Dunno why it happens but the fix was literally 2 lines, so whatever I guess

Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:28 +02:00
ADudeCalledLeo
4d4dfab388
Windows: add instance icon to shortcut 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:28 +02:00
ADudeCalledLeo
b83f9be1bd
Add missing fail check for CoInitialize 
Add a few comments

Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:27 +02:00
ADudeCalledLeo
6ae3b183fd
Remove unnessecary "is defined" check 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:27 +02:00
ADudeCalledLeo
f12117c532
[UNTESTED] Linux: add icons to shortcuts 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:26 +02:00
ADudeCalledLeo
70768189ba
Windows: implement FS::createShortcut 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:25 +02:00
ADudeCalledLeo
30b266622c
Add 'Create shortcut' button to instance toolbar 
Implemented on Windows only rn!

Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:18:49 +02:00
Rachel Powers
25b306b7e1 feat: mark folder paths as links 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 18:32:11 -07:00
Rachel Powers
9af1b00df5 feat: add list of watched folders 
move explanation text into dialog class and it's own label

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 18:05:19 -07:00
Rachel Powers
51c27e2748 always use the pending path set to avoid task duplication. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 16:33:52 -07:00
Rachel Powers
b9e2c3524c chore: clang format & cleanup 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 16:07:57 -07:00
Rachel Powers
3f6cc17818 properly handle a currently running hashing task 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 15:45:40 -07:00
Rachel Powers
5909af9878 drag&drop + add folder to watch 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 14:17:33 -07:00
flow
64576f4c4c
Merge pull request #304 from Ryex/move-downloads 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/222
 2022-11-11 12:48:53 -08:00
Sefa Eyeoglu
b57fee1a44
fix: swap spin box and state icon 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-11 15:24:14 +01:00
Sefa Eyeoglu
cabd887866
feat: use icons to show memory allocation state 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-11 15:22:16 +01:00
Sefa Eyeoglu
863a168cb5
feat: raise memory limits to 1TiB 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-11 15:05:00 +01:00
Sefa Eyeoglu
5ee4fb3522
feat: validate maximum memory allocation 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-11 15:04:05 +01:00
Rachel Powers
2f10fa8b61 add some extra debug logs for CF blocked mods 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 05:41:32 -07:00
flow
46a8e18841
Merge pull request #367 from TheKodeToad/linkjumping 
fix https://github.com/PrismLauncher/PrismLauncher/issues/363
 2022-11-10 08:08:44 -08:00
flow
6c53e68a52
Merge pull request #406 from Scrumplex/fix-clear-metadata 2022-11-10 07:50:14 -08:00
Sefa Eyeoglu
392452d422
Merge pull request #397 from flowln/windows_mod_updater_fixes_maybe 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/226
 2022-11-10 14:34:15 +01:00
TheKodeToad
99ed0b6c2c Implement flowln's suggestions 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-10 11:14:58 +00:00
Sefa Eyeoglu
e6d057fe6d
Merge pull request #415 from TayouVR/fix-main-warning 2022-11-09 18:27:40 +01:00
flow
9ad6eb11a3
refactor: fix CodeQL warnings in StringUtils::naturalCompare 
I have no idea why this function exists, so better to just let it exist.
=D

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-09 14:14:25 -03:00
TheKodeToad
32c2ad2bbd A lot more cleanup 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 17:51:18 +00:00
TheKodeToad
9931c9a286 Remove arguments being passed twice 
Passing the classpath into stdin has no effect. Java is already provided the classpath with -cp, which pretty much takes up the largest part of the arguments anyway, which leads me to wonder, what's the point of stdin arguments at all?

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:37:00 +00:00
TheKodeToad
e68dcea6bc Various tweaks to the Java component of the launcher 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:24:55 +00:00
txtsd
fcb9733df0
Merge pull request #392 from PrismLauncher/max_ram_logic 2022-11-08 12:23:24 +05:30
flow
589d160515
fix: use cross-platform toStdString in FlameHasher 
Almost the same issue from toml++ :p

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-07 14:04:48 -03:00
Tayou
9ac6114b63
Fix warning in main function 
main could according to the compiler end up not returning. of course it will always return, but I satisfied the compiler by adding a default case.

Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-07 14:33:37 +01:00
TheLastRar
456999eee6 Fix: Configuration-less config for Qt Install 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-06 14:25:38 +00:00
TheKodeToad
16e3b786fc Implement Scrumplex's suggestions 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-06 10:09:06 +00:00
DioEgizio
126bbd67f7
Merge pull request #405 from AshtakaOOf/spooky 2022-11-06 07:27:39 +01:00
Sefa Eyeoglu
9fb80a2687
Merge pull request #242 from marcelohdez/more-copy-options 2022-11-06 01:10:24 +01:00
Sefa Eyeoglu
d5d224d89a
fix: save metacache after clearing 
If the user closes the launcher right after clearing, it probably
didn't actually clear the cache yet.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-06 01:05:13 +01:00
Sefa Eyeoglu
4708ce4226
refactor: rename halloween cats to -spooky 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-06 00:47:33 +01:00
Sefa Eyeoglu
a0580946dc
fix: allow -ween variants for all cats 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-06 00:04:43 +01:00
Sefa Eyeoglu
e68fd7c1e3
Merge pull request #383 from leo78913/toolbar-lock 2022-11-06 00:00:47 +01:00
Adrien
369419870e add: Spooky Rory 
Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com>
 2022-11-05 23:55:43 +01:00
leo78913
0938f80b41
Update launcher/ui/MainWindow.cpp 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-11-05 18:10:36 -03:00
Ryan Cao
3df31579a1
fix: @timoreo22 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-05 22:31:38 +08:00
Ryan Cao
f1d3481a29
fix: remove dumb FS::symlink function 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-05 22:25:22 +08:00
Ryan Cao
cf3aad9c41
fix: use osascript to get admin privileges 
inspired from VSCode's approach

Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-05 22:18:05 +08:00
Ryan Cao
7b1e68bfa8
initial support for add to PATH action 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-05 22:17:59 +08:00
Sefa Eyeoglu
4af22d663a
Merge pull request #229 from ryanccn/macos-drag-n-drop 2022-11-05 11:17:21 +01:00
Sefa Eyeoglu
ba8322aa5c
Merge pull request #396 from leozamboni/develop 2022-11-05 11:17:13 +01:00
Sefa Eyeoglu
e4bd82190a
Merge pull request #149 from TayouVR/better-custom-themes 2022-11-05 11:16:41 +01:00
Sefa Eyeoglu
695734636f
Merge pull request #294 from piperswe/add-snapcraft-yml 2022-11-05 11:09:51 +01:00
Sefa Eyeoglu
5e9b26dbef
Merge pull request #366 from TheLastRar/MSVC-Build 2022-11-04 23:49:54 +01:00
flow
d35c2db41e
fix: separate types of std::string in Packwiz 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-04 16:53:25 -03:00
flow
dff5fea976
feat: add more separation between types of std::string in StringUtils 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-04 16:53:25 -03:00
flow
ab6c7244fc
refactor: move FS's toStdString to StringUtils 
This is so that anyone can use it :)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-04 16:53:25 -03:00
flow
353b51f11e
refactor: move MMCStrings -> StringUtils 
General utilities can go in here >:)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-04 16:53:24 -03:00
flow
76050880f1
fix: use unicode variant for marking '.index' hidden 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-04 16:53:21 -03:00
TheLastRar
e29259cd55 Fix: Resolve ambiguous overload errors 
Clang-cl fails to select the correct function and instead errors

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:39 +00:00
TheLastRar
f8ad1a052f CMake: Support multi-configuration generators 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:38 +00:00
TheLastRar
653a953d2f CMake: Add zlib 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:35 +00:00
leozamboni
9f5537d936
feat: spooky cat for halloween 
Signed-off-by: leozamboni <leonardonunes169@gmail.com>
 2022-11-04 15:09:57 -03:00
Sefa Eyeoglu
21a7af535c
Merge branch 'develop' into macos-drag-n-drop 2022-11-04 18:30:42 +01:00
txtsd
8f045af867
Merge pull request #374 from flowln/fix_lto 2022-11-04 15:39:41 +05:30
TheLastRar
e682c3e9b8 Fix: Correct exclusions for debug QT plugins 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-03 21:35:28 +00:00
TheLastRar
c993209b76 Fix: Explicitly specify Version.h path 
MSVC uses a different search mechanism that ends up picking the mete Version.h

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-03 21:35:27 +00:00
Tayou
c2f37716e5
clang_format for PR files 
I'm getting a rendezvous... I thought I did this already

Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-03 05:05:07 +01:00
Tayou
e9bfd43ff7
added requested changes 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-03 05:04:36 +01:00
leo78913
3d11d044d2 add an option to lock the toolbars 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-11-02 20:33:02 -03:00
TheKodeToad
cb796dbdfb
Remove unnecessary block 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-02 16:38:32 +00:00
Sefa Eyeoglu
094b57bb23
Merge pull request #372 from santiagocezar/rory 2022-11-02 12:06:08 +01:00
Santiago Cézar
9ca4f19aea remove logcat 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-02 07:45:43 -03:00
TheKodeToad
a29d88c313 Even more fixes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-02 09:59:58 +00:00
TheKodeToad
a1ed8154f7 Another fix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-02 09:31:39 +00:00
TheKodeToad
6c45a990ef A good use of auto 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-02 09:13:44 +00:00
TheKodeToad
8dfa3393dc Formatting and forward-declaration 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-02 08:43:46 +00:00
txtsd
d12323396f
Merge pull request #346 from ryanccn/more-user-friendly-java-warning-text-ahaha 2022-11-02 10:38:26 +05:30
Santiago Cézar
48d34741f3 keyboard navigation is important 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-01 22:53:45 -03:00
Santiago Cézar
76203018e9 forgot the qrc 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-01 20:21:34 -03:00
flow
7956e6f04e
fix: don't use forward-declared Ptr types in meta/ 
This would cause ODR violations when those headers were included in
other places that also included stuff like "Version.h" (note the
"meta/Version.h"), which can cause problems, especially in LTO.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-01 19:48:26 -03:00
Santiago Cézar
668342b470 add rory flat too (and holiday variants) 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
Co-authored-by: Ashtaka <66513643+AshtakaOOf@users.noreply.github.com>
 2022-11-01 19:31:37 -03:00
Santiago Cézar
0a0ce74105 add rory 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
Co-authored-by: Ashtaka <66513643+AshtakaOOf@users.noreply.github.com>
 2022-11-01 19:06:27 -03:00
txtsd
718a9a3559
change: Update credits 
Replaces txtsd's GitHub link with their website
Moves DioEgizio and flowln from contributors to dev team

Signed-off-by: txtsd <code@ihavea.quest>
 2022-11-02 01:20:58 +05:30
Tayou
afcdf4b9cf
condensed icon theme code 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-01 20:18:07 +01:00
Tayou
a3f5ea3598
added suggested changes 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-01 20:17:53 +01:00
Tayou
fef60a9da0
add support for multiple custom themes 
also moved theme related code from Application.cpp to new ui/themes/ThemeManager.cpp, this class should cleanly isolate theme related functions and help avoid code duplication in future theme related additions.
Themes can now be just qss or css files, they won't have color pallette information with them in that case

Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-01 20:10:12 +01:00
TheKodeToad
576867605d Add another fallback 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 18:40:12 +00:00
TheKodeToad
d1626d20bd Slight cleanup 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 18:30:11 +00:00
TheKodeToad
c890aa18f7 Only select correct mod 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 18:25:54 +00:00
TheKodeToad
6c7d040439 Hacky tweaks 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 18:12:27 +00:00
TheKodeToad
d03ae34b61 Auto-select first result 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 17:19:54 +00:00
TheKodeToad
b9547adce7 Add more license headers 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 17:02:24 +00:00
TheKodeToad
7f32c6464d Initial better mod browser link implementation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 16:58:22 +00:00
Rachel Powers
209a1650e4 clang_format and code cleanup 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 07:06:36 -07:00
Rachel Powers
6010ce0dc5 chore(remove FS::copyFile): 
Now that #333 is merged and FS::copy works on non directory copyFile can be removed.

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:28:57 -07:00
Rachel Powers
a7a331a26e ensure FS::copyFile is marked for removal 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
fda2c116be code quality cleanup 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
d2f3dbaa29 fix mispellings and wrap strings for translation 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
e9d4793b1e minor clean up and add some docs 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
13c7efa058 copy found mods to instance (FTB and Flame) 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
1598d65824 watch filesystem, compute and match hashes 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
028e086960 send blocked mod info to dialog & prototype UI 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
timoreo
04b39294ba
Merge pull request #333 from flowln/fix_atl_packs_post_modpack_update 2022-11-01 09:56:16 +01:00
timoreo
3a446c410c
Merge pull request #329 from flowln/only_safe_workarounds 2022-11-01 09:55:43 +01:00
Chrono
ce1a4857cc
Merge branch 'PrismLauncher:develop' into develop 2022-10-31 20:06:59 -04:00
Chrono
dfdf739282
remove one space 
Signed-off-by: Chrono <me@disilla.org>
 2022-10-31 19:44:55 -04:00
Sefa Eyeoglu
7086b1e65c
Merge pull request #351 from Scrumplex/fix-trash 2022-10-31 22:56:07 +01:00
Sefa Eyeoglu
f2d445d27b
fix: fix undo key sequence 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-31 11:34:48 +01:00
Sefa Eyeoglu
29d362a6e0
fix: do not trash instances in Flatpak 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-31 11:34:46 +01:00
DioEgizio
c8adc4e356
Merge pull request #354 from Scrumplex/translations-maybe 
Improve display names of certain languages
 2022-10-31 08:43:43 +01:00
Ryan Cao
8467daa0ec
oop 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-10-31 14:58:38 +08:00
DioEgizio
13e14b712e
Merge pull request #352 from TheLastRar/Win-setDarkWinTitlebar-10OrGreater 2022-10-31 07:51:13 +01:00
Ryan Cao
27dfe30fe6
Update VerifyJavaInstall.cpp 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-10-31 14:44:11 +08:00
Sefa Eyeoglu
42350e689d
chore: improve display names of certain languages 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-30 23:50:57 +01:00
Fayne Aldan
b7d5fee995 Change Profiles to Accounts for consistency 
Signed-off-by: Fayne Aldan <FayneAldan@gmail.com>
 2022-10-30 15:56:45 -06:00
TheLastRar
fd099166c6 Fix: Check if Windows 10 before calling setDarkWinTitlebar() 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-10-30 20:49:56 +00:00
Sefa Eyeoglu
b4be28b9bb
fix: fix disabled trash undo action 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-30 18:37:06 +01:00
Ryan Cao
19a8d51bf3
fix: more user friendly Java warning text 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-10-30 11:56:43 +08:00
Marcelo Hernandez
5d1aac3c53
added option to not copy screenshots 
+ moved select all checkbox to top row, centered.

Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-29 22:27:31 -04:00
fn2006
b142a6da5b fix hardcoded svg 
Signed-off-by: fn2006 <usernamefn2006alreadyused@protonmail.com>
 2022-10-29 16:42:37 +01:00
Sefa Eyeoglu
5ed7eb9d53
chore: update credits 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-29 13:12:51 +02:00
Marcelo Hernandez
c00f96c7ca
create getters and setters for InstanceCopyPrefs 
+ use pragma once like other .h files in this directory

Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-29 00:55:33 -04:00
flow
be3c9abcfe
fix: copy single files too in FS::copy 
eek

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-28 20:54:58 -03:00
Sefa Eyeoglu
177f17450a
Merge pull request #173 from Scrumplex/fix-icons 2022-10-29 00:35:48 +02:00
leo78913
76146e0f17 add a flat white version of the launch icon 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-10-28 15:51:20 -03:00
leo78913
4500e345b3
Merge branch 'PrismLauncher:develop' into toolbar-icons 2022-10-28 15:46:02 -03:00
Sefa Eyeoglu
e885f3c26a
Merge pull request #65 from he3als/develop 2022-10-28 18:43:30 +02:00
flow
e6e92f2b0e
fix: only allow workarounds for blocked mods from MR when 100% safe 
If a version on Modrinth has more than a single mod loader associated,
it means that it's possible we might get the wrong file for download,
since individual files don't really have this kind of metadata in the
API response.

So, in such cases, it's best to let the user take care of it instead.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-28 13:31:21 -03:00
Sefa Eyeoglu
7b446dd30f
Merge pull request #319 from Scrumplex/fix-avoid-mr-segfault 2022-10-28 13:40:52 +02:00
Sefa Eyeoglu
93894f62ff
fix: avoid segfault for unexpected API reponse 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-28 00:08:15 +02:00
Sefa Eyeoglu
2ba3de79d8 chore: add comment about copy bug 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-27 21:23:17 +02:00
Piper McCorkle
2e0f818905 Add a snapcraft.yml for building Snaps 
The included snapcraft.yml can be used to build a Snap (the application
format used by Canonical's modern package manager) out of Prism. If the
project wants in the future, Prism can publish these Snaps to the Snap
Store so the Prism Launcher can be installed through the Ubuntu Software
app on vanilla Ubuntu.

I haven't registered the Snap name, so it's currently free for anyone to
reserve. I'd suggest that a Prism developer register the name
prismlauncher at https://snapcraft.io/register-snap to ensure the name
belongs to the project, even if there are no plans of setting up CI to
publish snaps in the short term.

I have also modified JavaUtils.cpp to be able to autodetect the Java
versions included in the Snap, and added "*.snap" to the .gitignore so
the compiled Snap isn't accidentally committed to the repository.

Signed-off-by: Piper McCorkle <contact@piperswe.me>
 2022-10-26 09:25:54 -05:00
Marcelo Hernandez
63b6c6685c
Abstract away InstanceCopyPrefs' internals through new getSelectedFiltersAsRegex() function 
+ fix typo in comment
+ remove unused import
+ add [[nodiscard]] to methods

Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-26 00:20:36 -04:00
DioEgizio
b516dd970f
Merge pull request #206 from flowln/changelog_height_fix 2022-10-25 11:29:14 +02:00
Marcelo Hernandez
385c452ddf
remove checkBool function, add updateSelectAllCheckbox function 
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-24 20:49:40 -04:00
Marcelo Hernandez
a89df42561
Simplify bool check in CopyInstanceDialog.cpp 
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-24 19:31:40 -04:00
Sefa Eyeoglu
08cd5d52fa
Merge pull request #283 from flowln/fix_abort_on_autosearch 2022-10-24 23:00:02 +02:00
Sefa Eyeoglu
d0e668e1d8
Merge pull request #211 from Hibiii/show-instace-arg 2022-10-24 22:51:30 +02:00
flow
b638a6ae95
fix: retry mod search job after aborting it 
This way, we don't get stuck with an aborted job in our way! :o

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-24 09:09:24 -03:00
Sefa Eyeoglu
6a474a0125
fix: update icon generate script 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-24 11:18:53 +02:00
Marcelo Hernandez
4caf06bc99
Check "Select all" checkbox if all options are already selected 
+ code cleanup

Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-23 19:30:41 -04:00
Marcelo Hernandez
15593b5c09
Add "Select all" checkbox + ui revamp + code cleanup 
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-23 19:30:41 -04:00
Marcelo Hernandez
e7e56eb1e3
add more options to copy instance dialog 
- Copy game options, copy resource packs, copy shaders,
copy servers, and copy mods
- Also made a new InstanceCopyPrefs struct to store those
options rather than passing 7 different booleans into
InstanceCopyTask's constructor

Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-23 19:30:28 -04:00
leo78913
43bf601f12 add icons to the instance toolbar 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-10-23 20:04:19 -03:00
Trisave
d5109f024b
Better dark theme selection contrast 
Tweak background of the selection background in order to make text more readable

Signed-off-by: Trisave <42098407+Protrikk@users.noreply.github.com>
 2022-10-23 20:32:04 +02:00
flow
7f441f5b87
Merge pull request #228 from bensuperpc/change_cast 2022-10-23 14:28:33 -03:00
he3als
0aac85dda1 Replace tab with spaces in flat_white.qrc 
Signed-off-by: he3als <65787561+he3als@users.noreply.github.com>
 2022-10-23 14:35:33 +01:00
he3als
4777a45722 Fix new flat white icons 
Signed-off-by: he3als <65787561+he3als@users.noreply.github.com>
 2022-10-23 14:32:35 +01:00
jn64
01db80d19a Fix version labels width 
Make labels fit to the contents, so Ibeam cursor doesn't appear
over empty space. Should have been done with 90025ed.

Signed-off-by: jn64 <23169302+jn64@users.noreply.github.com>
 2022-10-23 03:35:23 +08:00
flow
8b28ed67ae
Merge pull request #234 from AliceDTRH/fix/dedupejava 2022-10-22 13:14:26 -03:00
Ryan Cao
f35a30d371
oops 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-10-22 23:47:53 +08:00
AliceDTRH
b2789fef0f
Use correct variable for Windows 
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com>
 2022-10-22 17:19:34 +02:00
he3als
46fe7e77b3 DCO Remediation Commit for he3als <65787561+he3als@users.noreply.github.com> 
I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: d87f743a2b
I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 92dfd659f1
I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: a6e65dfc7a
I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 99e1c13e80

Signed-off-by: he3als <65787561+he3als@users.noreply.github.com>
 2022-10-22 16:14:50 +01:00
he3als
99e1c13e80 fix: add flat_white to code 2022-10-22 15:50:06 +01:00
he3als
a6e65dfc7a Add new flat white icons 2022-10-22 15:40:39 +01:00
AliceDTRH
1471eddc7e
Deduplicates java installs before passing it on 
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com>
 2022-10-22 16:40:31 +02:00
he3als
89fd84d916
Merge branch 'PrismLauncher:develop' into develop 2022-10-22 15:30:40 +01:00
Jamie Mansfield
0e17eee096
ATLauncher: Fix pack installation always aborting 
I made a mistake during when cherry picking a previous commit, this
applies the change - and fixes installing ATLauncher packs.
 2022-10-22 15:22:30 +01:00
flow
81f1305270
Merge pull request #215 from forkiesassds/develop 2022-10-22 10:48:00 -03:00
Sefa Eyeoglu
24e4db676a
Merge pull request #224 from jamierocks/atl-abort-close-optional-mods-dialog 2022-10-22 15:31:53 +02:00
Sefa Eyeoglu
6e21a9829d
Merge pull request #225 from Scrumplex/fix-segfault-fileresolver 2022-10-22 15:31:46 +02:00
flow
4e99e10cbd
Merge pull request #218 from getchoo/change-jars-path 2022-10-22 10:18:58 -03:00
Ryan Cao
a406aeb3ea
feat: register as zip/mrpack handler on macOS 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-10-22 20:51:46 +08:00
Sefa Eyeoglu
970e4b020e
fix: fix segfault when resolving Flame resources 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-22 14:11:51 +02:00
Jamie Mansfield
a6b13487f0
ATLauncher: Abort install if optional mods dialog is closed 
This matches the behaviour of ATLauncher.
 2022-10-22 12:35:34 +01:00
Bensuperpc
56ae4e5b6a
Change old style cast to C++ cast 
Change old style cast to C++ cast

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
 2022-10-22 13:04:48 +02:00
Sefa Eyeoglu
54c26b05fa
Merge pull request #185 from flowln/fix_blocked_mods_crash 2022-10-22 12:44:20 +02:00
seth
4a2b25e841
fix: use correct variable for jars path 
Signed-off-by: seth <getchoo@tuta.io>
 2022-10-21 21:40:21 -04:00
seth
ba4af1a890
fix: make jars path specific to prism 
Signed-off-by: seth <getchoo@tuta.io>
 2022-10-21 21:40:20 -04:00
forkiesassds
9b17cde019 CurseForge modpack page improvements 
Signed-off-by: forkiesassds <icanttellyou@memeware.net>
 2022-10-22 01:20:08 +03:00
Sefa Eyeoglu
aefb8b353e
Merge pull request #187 from leo78913/menu-icons 2022-10-21 22:39:35 +02:00
Hibi
1288b92615
Add argument to show instance window 2022-10-21 15:40:28 -03:00
flow
7eecf454e8
fix: remove max height logic for mod update changelogs 
It's not worth it to keep this, it's just a heuristic that fails from
time to time.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-21 14:07:43 -03:00
leo78913
ccf7d1e0c4 material design icons 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-10-21 14:04:04 -03:00
leo78913
e4b5cd23e6 the trashcan icons dont look like trash now 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-10-21 13:49:31 -03:00
circuit10
ff2f40f5e1
Fix typo 
Signed-off-by: circuit10 <heath.mitchell27@gmail.com>
 2022-10-21 16:28:04 +01:00
Sefa Eyeoglu
12d8409e65
Merge pull request #39 from Sebbl0508/mod_dialog_fontsize 2022-10-21 15:25:28 +02:00
leo78913
8db89b4cfb
Merge branch 'PrismLauncher:develop' into menu-icons 2022-10-20 17:54:43 -03:00
leo78913
31dc92dafe add icons to the instance menu and 4 new icons: 
delete
rename
tag
export

Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-10-20 17:48:57 -03:00
flow
01b90809e8
fix: memory leak when finishing blocked mods job 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-20 16:55:22 -03:00
flow
0a7383a4e1
fix: hide ProgressDialog when failing/succeeding tasks 
WHY IS QT LIKE THAT AAAAAAAA

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-20 16:54:39 -03:00
Chrono-byte
88341b923a
fix contributor notices in AboutDialog.cpp for license compliance 
Signed-off-by: Chrono-byte <me@disilla.org>
 2022-10-20 15:14:26 -04:00
flow
5d27633821
fix: show a single line in ProjectItem's desc. when there's no more space 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-20 15:03:46 -03:00
Sebastian Rueth
b46c4a81e0
check space requirements of project description 
if there isn't enough space for 2 lines of project description, only
draw one

Signed-off-by: Sebastian Rueth <sebastian.rueth@protonmail.com>
 2022-10-20 08:02:05 +02:00
flow
d6479e133d fix: properly center project descriptions 
In particular, this takes into account the space used by the title, so
(hopefully) there won't be problems with custom themes with that.

Signed-off-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Sebastian Rüth <sebastian.rueth@protonmail.com>
 2022-10-19 20:12:50 +02:00
Sebastian Rüth
50bbf2aacc fix text clipping 
Signed-off-by: Sebastian Rüth <sebastian.rueth@protonmail.com>
 2022-10-19 20:12:50 +02:00
Sefa Eyeoglu
4e08f28246
Merge pull request #31 from flowln/who_needs_webview 2022-10-19 14:28:29 +02:00
Sefa Eyeoglu
46c57e120f
Merge pull request #27 from flowln/ftb_install_improve 2022-10-19 13:51:35 +02:00
Sefa Eyeoglu
61fbc5a791
refactor: replace with new logo 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-19 13:08:23 +02:00
Samisafool
8201d1df02
Rename 
Signed-off-by: Samisafool <thenerdiestguy@gmail.com>
 2022-10-19 15:02:43 +05:30
Fayne Aldan
888a87463e
Add fallback for multimc.cfg 
Signed-off-by: Fayne Aldan <FayneAldan@gmail.com>
 2022-10-18 14:40:34 -06:00
flow
3a95a3b7c1
fix: don't take item from a possibly empty list 
The list gets destroyed when we take the last object, so things explode.
😔

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-18 16:51:42 -03:00
DioEgizio
fb4cf0b75d
Merge pull request #55 from flowln/config_add_fallback 2022-10-18 19:50:34 +02:00
he3als
92dfd659f1 Fix .QRC file for flat white icons 2022-10-18 17:54:26 +01:00
he3als
d87f743a2b Add flat white icons 
This is mainly for dark mode users, as I think that the regular colour of the flat icons do not look good with dark mode.
 2022-10-18 17:49:35 +01:00
Cleo John
83ceb26151 Streamline Button changes to improve source readability. 2022-10-18 17:28:23 +02:00
flow
32cdfb871c
fix: add fallback for polymc.cfg 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-18 12:22:42 -03:00
flow
801e7da5ee
feat: allow specifying fallbacks to INI files 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-18 12:22:42 -03:00
Sefa Eyeoglu
3405fd91c6
Merge pull request #33 from DioEgizio/remove-useless-actions 2022-10-18 15:31:32 +02:00
DioEgizio
194822f11e
Merge pull request #28 from flowln/fix_copy 2022-10-18 15:27:53 +02:00
Sefa Eyeoglu
98963d4cdf
Merge pull request #29 from Scrumplex/feat-clear-metadata 2022-10-18 15:25:56 +02:00
DioEgizio
804ef36b20
Merge pull request #26 from Scrumplex/armhf 2022-10-18 15:24:33 +02:00
DioEgizio
e05fe77bfe feat: remove redundant actions from instance toolbar and redundant "instance"s 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-10-18 14:43:29 +02:00
Sefa Eyeoglu
6db3f68ae1
refactor: use correct data path 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-18 13:58:50 +02:00
Sefa Eyeoglu
3ac398ac49
fix: use display name in code 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-18 09:50:27 +02:00
Sefa Eyeoglu
722194405a
refactor: initial rebrand 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-18 09:37:59 +02:00
DioEgizio
87d35f0d16 fix: remove some unused libs 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-10-15 20:16:15 +02:00
Sefa Eyeoglu
c089f9b59f
Merge pull request #1203 from DioEgizio/macos-legacy 2022-10-15 15:24:30 +02:00
flow
8bc529be3d
fix: include hidden files when copying instances 
fixes instance ccopy on linux .-.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-15 09:20:31 -03:00
Sefa Eyeoglu
303628bb05
refactor: support system ghc-filesystem 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-15 13:13:38 +02:00
Sefa Eyeoglu
3b92ec8e82
chore: clang-format RuntimeContext 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-15 12:43:15 +02:00
Sefa Eyeoglu
545944cb0d
refactor: support armhf 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-15 12:41:16 +02:00
flow
c90a88b6b6
fix: correct ftb legacy too 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-14 12:18:06 -03:00
flow
124097d3a5 feat!: use ghc/filesystem in place of std's one if needed 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-14 14:08:48 +02:00
flow
c520faed6d feat: add gulrak/filesystem submodule 
... for old macs that don't have std::filesystem in their stdlib.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-14 14:08:42 +02:00
flow
dfa220ef02
fix: issues with aborts (again) 
i hate it

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-13 15:10:35 -03:00
flow
f26be00571
fix: abort search if we're already trying to download a pack 
Meaning we don't have to wait for the searches to finish in the
background to finally start the modpack download, when we have already
selected it -_-

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-13 13:49:06 -03:00
flow
83654a193e
refactor+fix: Make FTB install task similar to other install tasks 
In particular, this changes the order so that the instance gets created
before downloading the mods (like other install tasks), and the mod download
directly puts the files in the staging folder (like the others), instead
of that weird makeCached and copy stuff.

This fixes some issues with modpack downloads from FTB, like creating an
instance with no mods in it.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-13 13:27:52 -03:00
flow
b2a5d8daf4
fix: don't include opted out versions with the 'Any' filter on the MD 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-12 10:26:14 -03:00
flow
fda3f1352e
feat: add image support for the news reader :^) 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-11 16:11:08 -03:00
flow
d194b02e28
fix: prevent images overriding content when changing pages 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-11 15:51:54 -03:00
Tayou
aaba99dc10
Update launcher/ui/MainWindow.cpp 
make " Offline" string for profilers translatable

Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>
 2022-10-11 14:58:34 +02:00
Tayou
93a2e0f777
Merge Launch Buttons 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-10-10 23:23:06 +02:00
Sefa Eyeoglu
71f3c6b461
feat: add clear metadata action 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-10 12:48:25 +02:00
Sefa Eyeoglu
aabcca5059
Merge pull request #1175 from Ozynt/patch-1 2022-10-09 20:20:05 +02:00
Ozynt
7e67fd8c79
Update LaunchController.cpp 
Signed-off-by: Ozynt <104643560+Ozynt@users.noreply.github.com>
 2022-10-09 13:20:50 +02:00
Ozynt
fecf1ffcb9
Update LaunchController.cpp 
Signed-off-by: Ozynt <104643560+Ozynt@users.noreply.github.com>
 2022-10-09 13:19:38 +02:00
Sefa Eyeoglu
fafc9cf9ca
Merge pull request #1033 from Scrumplex/multi-arch-support 2022-10-08 20:12:40 +02:00
Sefa Eyeoglu
3111e6a721
chore: add missing license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-08 20:12:07 +02:00
flow
28f84902f6
Merge pull request #1185 from DioEgizio/fix-tooltip 
Fix outdated 'Disable mod metadata' button's warning message.
 2022-10-08 14:34:59 -03:00
Trisave
ebee50eedc
Improve default light and dark themes (#1174) 2022-10-08 14:33:24 -03:00
flow
e0ef09dfe1
Merge pull request #1183 from Scrumplex/fix-capabilities-first-run 2022-10-08 14:29:14 -03:00
flow
d7992ab29d
feat: add image support for FTB packs 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-08 14:12:05 -03:00
flow
60f19f305e
feat: add image support for modrinth modpack pages 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-08 14:12:03 -03:00
flow
d99976f5d7
fix: make mod and modpack caches separate for Modrinth 
This makes it similar to CF mods / modpacks. The mods cache is
maintained with the same name because it most likely has more data it
in, so this commit will affect existing caches as minimally as possible.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-08 14:11:20 -03:00
flow
db158a5735
feat: add image support for mod pages 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-08 14:11:20 -03:00
flow
ea3be17220
feat: add widget for a text browser with image support 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-08 14:11:20 -03:00
DioEgizio
f26049009e fix: mod updating isn't upcoming anymore :p 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-10-08 16:20:46 +02:00
Sefa Eyeoglu
787234a53a
Merge pull request #1163 from flowln/fix_list_icons 2022-10-08 12:12:38 +02:00
Sefa Eyeoglu
fc3a64056c
Merge pull request #1154 from Scrumplex/epic-formatting-codes 2022-10-08 12:12:26 +02:00
Sefa Eyeoglu
6ebc9abb80
fix: update capabilities before first-run wizard 
On first run, the condition for the wizard would return, before running
updateCapabilities(). This moves that call up, as its only dependency is
the settings system.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-06 14:46:13 +02:00
txtsd
f315025a8d
Merge pull request #1167 from Scrumplex/epic-commandline 2022-10-02 00:41:34 +05:30
stoltsvensk
8e43d97133
Microsoft account only 
Signed-off-by: stoltsvensk <104643560+stoltsvensk@users.noreply.github.com>
 2022-10-01 16:47:23 +02:00
Sefa Eyeoglu
7ccafdc993
fix: add missing includes to fix Qt 6.4 build 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-30 19:56:01 +02:00
Sefa Eyeoglu
0dca9cb6b8
Merge pull request #1162 from Trial97/feature/Replace-toml-library 2022-09-30 19:44:45 +02:00
Sefa Eyeoglu
11c44c676c
fix: remove unused MACOS_HINT 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-26 13:28:46 +02:00
flow
370c3aa598
Merge pull request #894 from flowln/update_from_external_source 
epic PR
 2022-09-26 08:25:12 -03:00
Sefa Eyeoglu
1cdadafdf8
refactor: use QCommandLineParser instead 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-26 13:21:27 +02:00
timoreo
dd6f670dec
fix: Fixed memory leak 
Signed-off-by: timoreo <contact@timoreo.fr>
 2022-09-26 11:50:55 +02:00
timoreo
9ff364b0d3
huge nit: added const refs, everywhere 
Signed-off-by: timoreo <contact@timoreo.fr>
 2022-09-26 11:50:31 +02:00
Sefa Eyeoglu
58a5331f7b
Merge pull request #1164 from Scrumplex/fix-sort-languages 2022-09-25 19:50:55 +02:00
Alexandru Ionut Tripon
ed261f0af9
Update launcher/minecraft/mod/tasks/LocalModParseTask.cpp 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2022-09-25 20:38:55 +03:00
ErogigGit
8a4f1c66f8 Allow double clicking to mark for dowload 
Signed-off-by: Erogig <erogigabyte@gmail.com>
 2022-09-24 22:37:51 +02:00
Sefa Eyeoglu
b187231b0e
fix: sort languages by their name instead of key 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-24 11:53:41 +02:00
Sefa Eyeoglu
60b38de69f
fix: fallback for languages without a native name 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-24 11:48:33 +02:00
Trial97
600c49f7f0
Replaced tomlc99 with tomlplusplus 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2022-09-24 00:10:27 +03:00
flow
e7380e70a3
fix: use placeholder icon when the project has no icon in MR 
Projects with no icon return a null icon URL in Modrinth's API.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-23 18:05:58 -03:00
flow
3df8594f19
feat: change project item delegate for modrinth modpacks 
more info! \ ^-^/

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-23 16:59:40 -03:00
flow
ee4a829293
fix: remove manual icon resize in ModModel 
THis fixes a FIXME, now that we fixed the issue :o

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-23 16:59:40 -03:00
flow
1862f3c124
fix: set icon sizes correctly in ProjectItemDelegate 
no more dumb hacks with icons!!

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-23 16:59:40 -03:00
Sefa Eyeoglu
777ab3416f
feat: also format resource/texture pack names 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-21 15:00:28 +02:00
Sefa Eyeoglu
ecf5ab75e7
feat: support more formatting codes 
also fix some crashes

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-21 14:59:01 +02:00
flow
4f6d964217
fix: don't change groups when updating an instance 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:10 -03:00
flow
06019f01e3
feat: add dialog to ask whether to chaneg instance's name 
This prevents custom names from being lost when updating, by only
changing the name if the old instance name constains the old version,
so that we can update it if the user whishes to.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:10 -03:00
flow
ddde885084
fix: show warning in case there's no old index when updating 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:10 -03:00
flow
be8c6f218c
refactor: setAbortStatus -> setAbortable 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:10 -03:00
flow
9eb35ea7c8
fix: don't load specific settings for managed pack info 
This avoids loading all settings for all instances when searching for
one with a specific managed pack name.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:10 -03:00
flow
d2fdbec41d
fix: move file deletion to the end of the instance update 
This makes it harder for problems in the updating process to affect the
current instance. Network issues, for instance, will no longer put the
instance in an invalid state.

Still, a possible improvement to this would be passing that logic to
InstanceStaging instead, to be handled with the instance commiting
directly. However, as it is now, the code would become very spaguetti-y,
and given that the override operation in the commiting could also put
the instance into an invalid state, it seems to me that, in order to
fully error-proof this, we would need to do a copy operation on the
whole instance, in order to modify the copy, and only in the end
override everything an once with a rename. That also has the possibility
of corrupting the instance if done without super care, however, so I
think we may need to instead create an automatic backup system, with an
undo command of sorts, or something like that. This doesn't seem very
trivial though, so it'll probably need to wait until another PR. In the
meantime, the user is advised to always backup their instances before
doing this kind of action, as always.

What a long commit message o.O

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:09 -03:00
flow
2dd372600c
fix: some abort-related issues 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:09 -03:00
flow
eda6cf11ef
feat(ui): improve info dialog before updating an instance 
Adds a 'Cancel' option, and add a note about doing a backup before
updating.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:09 -03:00
flow
68facd6b93
fix(ui): hook up abort status signal in ProgressDialog 
Now we have a visual indication on when tasks are abortable!

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:09 -03:00
flow
87002fb8f8
fix: hook up setAbortStatus in instance import tasks 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:09 -03:00
flow
6a50fa35ec
feat: add canAbort() status change in Task 
By now, it's a recurring pattern of wanting to restrict aborting in
certain situations. This avoids further code duplication, and adds a
signal that external users can hook up to to respond to such change.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:09 -03:00
flow
6541570969
fix: simplify abort handling and add missing emits 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:09 -03:00
flow
4b0ceea894
fix: correctly set managed pack fields in CF pack 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:09 -03:00
flow
8c0816c166
feat: add override awareness to CF modpack updating 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:08 -03:00
flow
be769d07f1
fix: correctly set all managed pack fields in Modrinth pack 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:08 -03:00
flow
3a9d58e31c
feat: add override handling in modrinth pack update 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:08 -03:00
flow
7024acac06
feat: add override helper functions 
These help us keep track of relevant metadata information about
overrides, so that we know what they are when we update a pack.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:08 -03:00
flow
6131346e2f
refactor: change the way instance names are handled 
While working on pack updating, instance naming always gets in the way,
since we need both way of respecting the user's name choice, and a
standarized way of getting the original pack name / version.

This tries to circunvent such problems by abstracting away the naming
schema into it's own struct, holding both the original name / version,
and the user-defined name, so that everyone can be happy and world peace
can be achieved! (at least that's what i'd hope :c).

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:08 -03:00
flow
eed73c9078
refactor: clean up InstanceImportTask a bit 
Also removes a divide by two in the download progress
(why was it there???)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:08 -03:00
flow
795d6f35ee
feat: add curseforge modpack updating 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:08 -03:00
flow
ebd46705d5
refactor: move creation of CF file download task to a separate function 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:08 -03:00
flow
72d2ca234e
refactor: move flame modpack import to separate file 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:07 -03:00
flow
2246c3359b
refactor: add throw_on_blocked arg to Flame file parse 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:07 -03:00
flow
242fb156a2
feat: add 'getFiles' by fileIds route in Flame API 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:07 -03:00
flow
208ed73e59
feat: add early modrinth pack updating 
Still some FIXMEs and TODOs to consider, but the general thing is here!

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:06 -03:00
flow
4441b37338
refactor: move modrinth modpack import to separate file 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:32:36 -03:00
flow
941d75824a
refactor: add instance creation abstraction and move vanilla 
This is so that 1. Code is more cleanly separated, and 2. Allows to more
easily add instance updating :)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:32:36 -03:00
flow
ec9ddc4f22
chore: add helper function for copying managed pack data between insts. 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:32:36 -03:00
Sefa Eyeoglu
98b6f90172
fix: add more legacy architectures 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 16:01:08 +02:00
Sefa Eyeoglu
7e280de361
refactor: drop 64-bit check 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 16:01:08 +02:00
Sefa Eyeoglu
7bd8bd13fe
feat: support multiarch system classifiers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 16:01:06 +02:00
Sefa Eyeoglu
09e85e948c
refactor: introduce RuntimeContext 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 15:59:43 +02:00
Sefa Eyeoglu
9ec1c00887
fix: register JavaRealArchitecture for MinecraftInstance 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 15:58:56 +02:00
Sefa Eyeoglu
a24d589845
fix: ensure all resource folders exist 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 10:39:05 +02:00
Sefa Eyeoglu
ebbcc9f6da
fix: actually render color codes for texture packs 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 10:26:15 +02:00
Sefa Eyeoglu
23fc453fae
fix: comments and naming of texture pack stuff 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 10:26:15 +02:00
Sefa Eyeoglu
aad6f74db6
fix: tests 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 10:26:15 +02:00
Sefa Eyeoglu
07dcefabcb
feat: add texture pack parsing 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 10:26:15 +02:00
txtsd
40c68595d7
Merge pull request #1150 from flowln/fix_crash_on_game_quit 2022-09-20 09:41:59 +05:30
txtsd
fe9a4fece4
Merge pull request #1142 from flowln/better_fs 2022-09-20 09:00:19 +05:30
flow
0873b8d304
fix: prevent container detaching in ResourceFolderModel 
and use const accessors whenever we can!

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-16 20:12:31 -03:00
flow
c9eb584ac8
fix: prevent deletes by shared pointer accidental creation 
This fixes the launcher crashing when opening the game :iea:

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-16 20:12:30 -03:00
flow
10493bd44a
fix: move newly allocated resources to the main thread 
This avoids them getting deleted when the worker thread exits, due to
thread affinity on the created thread.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-16 20:12:30 -03:00
flow
9e35230467
fix: memory leak when getting mods from the mods folder 
friendly reminder to always delete your news.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-16 20:12:30 -03:00
flow
81e326571b
fix: enable demo launch only on supported instances 
e.g. >= 1.3.1 instances

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-15 19:27:42 -03:00
flow
1b2a7de4e2 fix: show 'demo' instead of 'offline' in log when in demo mode 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-15 18:44:18 -03:00
flow
11216d200c change: move demo action to "Play offline" menu 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-15 18:44:18 -03:00
jopejoe1
777be6a48d Add 'Ctrl+Alt+O' Shortcut to launch demo instance. 
Signed-off-by: jopejoe1 <johannes@joens.email>
 2022-09-15 18:44:18 -03:00
jopejoe1
29dcb9d274 Added Launch Demo button. 
Signed-off-by: jopejoe1 <johannes@joens.email>
 2022-09-15 18:44:18 -03:00
Sefa Eyeoglu
1ca2be0039
Merge pull request #982 from DavidoTek/windarkmode2 2022-09-14 13:17:17 +02:00
flow
ee0fb2d0e0
fix: use std::wstring for Windows filenames 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-12 13:07:24 -03:00
flow
c496ad1237
chore: make DirNameFromString add normal duplicate identifier 
Wrap the number in parenthesis to be similar to other software.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-12 13:07:24 -03:00
flow
277fa21f5f
refactor: remove Win32 'crap' in FileSystem 
We should use std::filesystem symlink and hardlink functions instead.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-12 13:07:23 -03:00
flow
1cf949226e
refactor: use std::filesystem for overrides 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-12 13:07:23 -03:00
flow
be3fae6511
refactor: use std::filesystem for path deletion 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-12 13:07:23 -03:00
flow
5932f36285
refactor: use std::filesystem for file copy 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-12 13:07:23 -03:00
flow
30abb65368
Merge pull request #1133 from Scrumplex/refactor-tests 
Move tests to a separate folder, to fix issues and improve maintenance
 2022-09-12 12:57:55 -03:00
Sefa Eyeoglu
4c7d3a103c
refactor: restructure tests 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-11 22:29:01 +02:00
flow
a091245793
fix: emit signals when aborting NetJob 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-10 09:10:16 -03:00
flow
7cf2c3be0f
fix: start at least one task in ConcurrentTask 
This allows us to emit all the necessary stuff when we're finished in
the case of starting a task with no subtasks. In particular, this caused
the mod updater to not work properly :)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-07 12:11:42 -03:00
flow
f65d506f26
Merge pull request #997 from flowln/fix_major_version_filter 2022-09-07 10:34:50 -03:00
flow
333dbca01e
Merge pull request #1105 from flowln/better_resource_packs 
Add basic resource pack parsing and fix issues
 2022-09-07 08:30:36 -03:00
flow
42eb265624
refactor: create mod pages and filter widget by factory methods 
This takes most expensive operations out of the constructors.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-07 08:29:58 -03:00
flow
8a65726e9d
fix: use more robust method of finding matches for major version 
This uses the proper version list to find all MC versions matching the
major number (_don't say anything about SemVer_ 🔫).

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-07 08:27:53 -03:00
flow
1b0ca47682
Merge pull request #939 from flowln/mod_downloader_improve 
Some more UI / UX improvements to the mod downloader!
 2022-09-07 08:27:11 -03:00
flow
8e3f5c3305
Merge pull request #966 from flowln/refactor_tasks 
Reduce code duplication in tasks, fix some bugs and add some tests
 2022-09-07 08:26:28 -03:00
timoreo
4817f0312d
Fixed up a warning 
Signed-off-by: timoreo <contact@timoreo.fr>
 2022-09-06 14:32:19 +02:00
Sefa Eyeoglu
b70a82c609
Merge pull request #1111 from PolyMC/revert-1067-classpath-epicness 2022-09-05 20:06:33 +02:00
Sefa Eyeoglu
25d1e0c4e6
Merge pull request #1107 from DioEgizio/smaller-about 2022-09-05 17:52:16 +02:00
Sefa Eyeoglu
8e3356f11a
Merge pull request #1034 from Scrumplex/detect-performance-features 2022-09-05 17:45:17 +02:00
Sefa Eyeoglu
1b559c7776
Revert "Move classpath definition into NewLaunch itself" 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-05 17:37:10 +02:00
DioEgizio
d5583f0f02 make the about dialog smaller 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-09-04 14:32:33 +02:00
flow
bedd3c50b6
fix: improve handling of unrecognized pack formats 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 15:05:23 -03:00
flow
43a7af3f44
fix: removing mods with their metadata as well 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 13:37:23 -03:00
flow
9db27c6acc
fix: crash when adding resource packs directly in the folder 
This fixes an issue in which, when adding a new resource pack externally
to PolyMC, when the resource pack view was open, would crash poly.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 13:37:22 -03:00
flow
42c81395b3
fix: race condition on ResourceFolderModel tests 
This (hopefully) fixes the race contiditions that sometimes got
triggered in tests.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 13:37:22 -03:00
flow
3b13e692d2
feat: move resource pack images to QPixmapCache 
This takes care of evicting entries when the cache gets too big for us,
so we can add new entries without much worries.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 13:37:22 -03:00
flow
0331f5a1eb
feat(tests): add tests for resource pack parsing 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 13:37:22 -03:00
flow
8a7e117f6b
refactor: move resource pack file parsing utilities to separate namespace 
This makes it easier to use that logic in other contexts.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 13:37:22 -03:00
flow
9b984cedac
feat: add image from pack.png to resource packs 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 13:37:22 -03:00
flow
dd9e30b24a
feat: add resource icon to InfoFrame 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 13:37:21 -03:00
flow
6a93688b2e
fix: filtering in regex search in resource packs 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 13:37:21 -03:00
flow
3ab17a97a8
fix: sorting by pack format 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 13:37:21 -03:00
flow
f21ae66265
feat: add basic resource pack parsing of pack.mcmeta 
This parses the pack format ID and the description from the local file,
from both a ZIP and a folder, and hooks it into the model.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 13:37:21 -03:00
flow
afa1a5e932
feat: modify InfoFrame and ResourcePackPage to show ResourcePack info 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 13:37:21 -03:00
flow
050768c266
feat: add more resource pack info 
Adds pack format id and description to ResourcePack, that'll be parsed
from pack.mcmeta.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 13:37:21 -03:00
flow
cda2bfc240
feat: allow specifying factory for resources in BasicFolderLoadTask 
This allows us to hook our own resource type, that possibly has more
content than the base Resource, to it.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 13:37:20 -03:00
Sefa Eyeoglu
2f167b1512
Merge pull request #1095 from flowln/ensure_file_path_in_override 2022-09-01 09:54:22 +02:00
flow
ba3ac85356
Merge pull request #1067 from Scrumplex/classpath-epicness 
Move classpath definition into NewLaunch itself
 2022-08-31 18:28:29 -03:00
flow
ec29cedeb7
Merge pull request #1080 from flowln/eternal_cache 
Never invalidate libraries cache entries by time elapsed
 2022-08-31 18:28:07 -03:00
flow
064ae49d2b
fix: make MultipleOptionsTask inherit directly from SequentialTask 
It's not a good idea to have multiple concurrent tasks running on a
sequential thing like this one.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 16:29:02 -03:00
flow
247f99ce2f
feat(test): add more tests to Tasks 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 16:29:01 -03:00
flow
7b6d269904
refactor: make NetJob inherit from ConcurrentTask as well! 
Avoids lots of code duplication

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 16:29:01 -03:00
flow
87a0482b8b
refactor: make MultipleOptionsTask inherit from ConcurrentTask too 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 16:29:01 -03:00
flow
e899699918
refactor: make SequentialTask inherit from ConcurrentTask 
In a way, sequential tasks are just concurrent tasks with only a single
task running concurrently, so we can remove LOTS of duplicated logic :)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 16:29:01 -03:00
flow
bdf464e792
fix: abort logic running subsequent tasks anyways some times 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 16:29:01 -03:00
flow
c410bb4ecb
fix: 'succeeded while not running' spam in ConcurrentTask 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 16:29:01 -03:00
flow
a720bcc637
fix: bogus progress update when the total step progress was zero 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 16:29:01 -03:00
flow
369a8cdc74
fix: only try to start tasks that are really there 
This fixes an annoying issue where concurrent tasks would try to start
multiple tasks even when there was not that many tasks to run in the
first place, causing some amount of log spam.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 16:29:00 -03:00
flow
3f4e55be4f
fix: ensure destination file paths exist when overriding folders 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 16:28:23 -03:00
flow
2186b134a4
fix: Mod type enum -> Resource type enum 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 14:47:52 -03:00
Sefa Eyeoglu
f371ec210c
Merge pull request #1052 from flowln/resource_model 2022-08-28 16:52:53 +02:00
Sefa Eyeoglu
afcd669d2f
Merge pull request #965 from flowln/fat_files_in_memory 
Refactor a bit EnsureMetadataTask and calculate hashes in a incremental manner
 2022-08-28 11:03:12 +02:00
DioEgizio
13184eb8e9 fix: fix urls on ftb legacy 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-08-24 12:31:38 +02:00
flow
ddf1e1ccee
fix: make FML libraries cache eternal 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-21 13:47:49 -03:00
flow
5ac4e73697
fix: make libraries cache eternal 
This restores the behavior prior to PR #920.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-21 13:47:49 -03:00
flow
6be59b53f1
feat: add eternal cache entries 
Those are entries that don't get stale over time, so we don't invalidate
them if they 'expire'.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-21 13:47:49 -03:00
flow
0b81b283bf
fix: LGTM warnings 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-20 10:49:56 -03:00
flow
e2ab2aea32
change: add enable/disable to resources 
TIL that zip resource packs, when disabled, actually have the effect of
not showing up in the game at all. Since this can be useful to someone,
I moved the logic for it to the resources.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-20 10:49:54 -03:00
flow
c3ceefbafb
refactor+fix: add new tests for Resource models and fix issues 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-20 10:49:23 -03:00
flow
e7cf9932a9
refactor: simplify Mod structure 
No need to keep track of pointers left and right. A single one already
gives enough headaches!

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-20 10:48:51 -03:00
flow
0c9d03f5df
fix(tests): add timeout on ModFolderModel's tests 
If the update never ends, the signal is not emitted and we become stuck
in the event loop forever. So a very lenient timer is added to prevent
that.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-20 10:48:01 -03:00
flow
92aa24ae34
fix: don't give shared pointer to obj. external to the model 
It causes some weird problems and adds refcounting overhead.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-20 10:48:00 -03:00
flow
97a74d5c1f
refactor: adapt rest of the codebase to the new resource model 
In order to access the ModFolderModel from the ModFolderPage, i created
a new m_model for the correct type, shadowing the m_model of type
ResourceFolderModel. This creates two shared_ptr references to the same object,
but since they will have the same lifetime, it doesn't generate a memory
leak.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-20 10:47:58 -03:00
flow
256f8094f5
refactor: make Resource Pack model inherit from ResourceFolderModel 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-20 10:47:11 -03:00
flow
1e2f0ab308
refactor: move more tied logic to model and move logic to the resources 
This moves the QSortFilterProxyModel to the resource model files,
acessible via a factory method, and moves the sorting and filtering to
the objects themselves, decoupling the code a bit.

This also adds a basic implementation of methods in the
ResourceFolderModel, simplifying the process of constructing a new model
from it.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-20 10:47:08 -03:00
flow
af2cf2734d
refactor: move things around in the mod model 
Makes the method order in the cpp file the same as in the header file.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-20 10:46:33 -03:00
flow
ec62d8e973
refactor: move general code from mod model to its own model 
This aims to continue decoupling other types of resources (e.g. resource
packs, shader packs, etc) from mods, so that we don't have to
continuously watch our backs for changes to one of them affecting the
others.

To do so, this creates a more general list model for resources, based on
the mods one, that allows you to extend it with functionality for other
resources.

I had to do some template and preprocessor stuff to get around the
QObject limitation of not allowing templated classes, so that's sadge :c

On the other hand, I tried cleaning up most general-purpose code in the
mod model, and added some documentation, because it looks nice :D

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-20 10:45:01 -03:00
flow
3225f514f6
refactor: move general info from Mod to Resource 
This allows us to create other resources that are not Mods, but can
still share a significant portion of code.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-20 10:41:59 -03:00
flow
2d63c86022
feat: make Task a QRunnable 
This makes it possible to run a task in another thread.

I added a variable to toggle debug prints because they seem to trigger
an assertion on Qt internals when the task in on another thread. Of
course, this isn't awesome, but can wait until we improve our logging.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-20 10:41:59 -03:00
Sefa Eyeoglu
afb9ebcd99
fix: distinguish Coremods 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-08-20 12:53:13 +02:00
Sefa Eyeoglu
92d7e44525
Merge pull request #878 from flowln/lazy_settings 2022-08-20 12:50:56 +02:00
Sefa Eyeoglu
a517f442ea
Merge pull request #1023 from flowln/better_shared_ptr 2022-08-20 12:50:50 +02:00
Sefa Eyeoglu
311758233b
Merge pull request #1044 from flowln/better_orphan_fix 2022-08-20 12:50:43 +02:00
Sefa Eyeoglu
6e086eb808
Merge pull request #992 from Scrumplex/refactor-version 2022-08-20 12:50:25 +02:00
Sefa Eyeoglu
7e8644430c
Merge pull request #1007 from Gingeh/disable-update-button 2022-08-20 12:50:19 +02:00
Sefa Eyeoglu
70a8f6743a
Merge pull request #919 from kumquat-ir/download-all-blocked 2022-08-20 12:50:01 +02:00
Sefa Eyeoglu
d5a2185030
Merge pull request #1068 from TayouVR/improvedWindowsJavaCheck 2022-08-19 14:26:36 +02:00
Tayou
26f31e9288
use qEnvironmentVariable instead of qgetenv in JavaUtils 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-08-18 23:59:35 +02:00
Sefa Eyeoglu
e654e66839
Merge pull request #1049 from flowln/waiting_for_news_-_- 2022-08-18 22:53:41 +02:00
Tayou
bb4861cf0d check for java installs in PATH on windows 
this should find java installs from scoop as well as any other installer, that registers java in the PATH environment variable.

Signed-off-by: Tayou <tayou@gmx.net>
 2022-08-18 18:24:32 +02:00
Sefa Eyeoglu
01505910f4
refactor: move classpath definition into NewLaunch itself 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-08-18 18:14:01 +02:00
Sefa Eyeoglu
ab766a0598
Merge pull request #968 from magneticflux-/utf8-logging 
Decode process lines as UTF-8
 2022-08-18 10:44:01 +02:00
Mitchell Skaggs
3c4b45c9e7
Use C locale codec for decoding 
This should correctly decode multi-byte non-UTF-8 text, such as Windows-936 (Simplified Chinese)

Signed-off-by: Mitchell Skaggs <skaggsm333@gmail.com>
 2022-08-13 10:39:05 -05:00
flow
93507a263b
fix: hide 'More news...' button if the news aren't loaded yet 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-12 17:41:11 -03:00
Sefa Eyeoglu
1175461030
refactor: switch to new versioning scheme 
The new versioning system is based on the versioning system used by the
GNOME Foundation for the GNOME desktop.

We are dropping the "major version" as defined by SemVer and move to a
version number with a most and least significant number.

The most significant number must be incremented, if there are new
features or significant changes since last major release.

Otherwise, the least significant number must be incremented, if there
are only minor changes since the last release. New features or
significant changes mustn't be introduced by a bump of the least
significant number.

If a minor change would introduce small user-facing changes (like a
message-box or slight UI changes), it could still be classified as a
minor change.
At the end of the day, a human shall decide, if a change is minor or
significant, as there is no clear line that would separate a "minor" and
a "significant" change in a GUI-application.

Definitions:

feature: New user-facing functionality
significant change: Something that changes user-facing behavior
minor change: Something that fixes unexpected behavior

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-08-12 14:22:24 +02:00
flow
2f5e55bea0
fix: only remove orphaned metadata on first opening 
This avoids deleting the metadata while one is updating their mods.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-11 13:11:56 -03:00
timoreo
c375e7b4df
Merge pull request #897 from jamierocks/atl-updating-initial 2022-08-11 08:50:05 +02:00