d61323aa6d
fix: improve resize behavior of BlockedModsDialog
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-06 20:51:18 +01:00
5ae044db93
Merge pull request #556 from DioEgizio/modrinth-icon-larger
2022-12-06 11:50:35 -08:00
c6e4fdac7e
Merge pull request #557 from Scrumplex/fix-fswatcher-segfault
...
Closes https://github.com/PrismLauncher/PrismLauncher/issues/555
2022-12-06 11:50:03 -08:00
9669377b06
Merge pull request #560 from edgarogh/fix-minutes-unit
...
Closes https://github.com/PrismLauncher/PrismLauncher/issues/553
2022-12-06 14:45:46 +01:00
c8c3fe1023
chore: add license headers
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-06 13:18:50 +01:00
85bddbed86
chore: reformat code
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-06 13:16:27 +01:00
318a2a429c
Fix minutes unit
...
Replaced "m" with "min" in `Time::prettifyDuration`
Signed-off-by: Edgar Onghena <dev@edgar.bzh >
2022-12-06 13:01:43 +01:00
07359865c6
fix: don't allocate BlockedsModsDialog
...
Fixes temporary memory leak!
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-05 21:39:26 +01:00
2fd7338cd3
dix: disable FS watcher after closing BlockedModsDialog
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-05 21:39:24 +01:00
ce3cfa212c
fix: make modrinth icon larger
...
before it was considerably smaller than the other modpack platform icons which looked weird
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-12-05 20:27:29 +01:00
b29c99656e
Merge pull request #546 from DioEgizio/add-server-icon
...
feat: add a proper server icon
2022-12-05 07:49:55 +01:00
45b0762096
Merge pull request #547 from flowln/fix_copying_instance
...
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/545
2022-12-04 23:47:09 +01:00
aceafb28f6
feat: add server icon to simple colored icons too
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
Co-Authored-By: leo78913 <leo3758@riseup.net >
2022-12-04 21:29:00 +01:00
928939cbe3
fix(Inst.Copy): create FS::copy object inside the secundary thread
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-04 12:29:38 -03:00
2462b8e524
feat+fix: better flat icon
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-12-04 13:30:24 +01:00
263a72879d
fix: oyxgen is lgpl3!
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-12-04 12:50:40 +01:00
70620d5137
feat: add a proper server icon
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-12-04 12:45:39 +01:00
79d5beff8d
Merge pull request #541 from ryanccn/warn-before-trash-instance
...
Closes https://github.com/PrismLauncher/PrismLauncher/issues/192
closes https://github.com/PrismLauncher/PrismLauncher/issues/462
2022-12-03 15:20:49 +01:00
fa3caf091a
fix: warn before trashing instances
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-12-03 21:54:41 +08:00
93707560cb
Merge pull request #506 from Protrikk/develop
2022-12-02 22:04:33 +01:00
5c6f325071
Remove blue-ish tint from remaining flat white icons
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-02 20:47:11 +01:00
b9a17f5999
Merge branch 'upstream/develop' into develop
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-02 20:46:04 +01:00
ab23f542c6
Merge pull request #423 from TheKodeToad/addagent
...
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/414
2022-12-02 06:40:18 -08:00
fa98bf1ee7
Merge pull request #481 from ryanccn/import-resource-pack-dialog-uwu
2022-12-02 06:39:54 -08:00
3cc987a5b4
fix: explicitly set scheme for local file in -I argument
...
Otherwise isLocalFile() will return false for local files without the
file:// thingy.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-01 22:54:03 -03:00
d1a1b8b6e8
Merge pull request #524 from DioEgizio/woa
...
add windows on arm builds
2022-12-01 23:09:37 +01:00
0d08e082be
Merge pull request #538 from flowln/fix_some_cf_imports
...
A couple fixes for CF instance imports
2022-12-01 23:06:35 +01:00
386fb28a35
fix(FileResolvingTask): Fail instead of crash when there's API errors
...
Also remove non-used variable (rip).
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-01 15:33:35 -03:00
79b79b752c
fix(Inst.Import): Show error reason in fail dialog
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-01 15:32:26 -03:00
a116778402
fix(Inst.Import): don't search inside 'overrides/' for the manifest
...
It will never be there anyways, and saves a **bunch** of time when the
overrides folder is big and we traverse all the tree when searching for
the MMC 'instance.cfg' file.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-01 15:15:15 -03:00
4c1c26a0e6
chore: drop Windows-MinGW-w64-Legacy
...
this brings back the number of builds as the same as before the pr
this is one of the slowest builds + windows 7/8.1 users can just use Windows-MSVC-Legacy
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-11-30 18:45:34 +01:00
9e1653ebb4
Merge pull request #436 from Scrumplex/feat-change-maxmem
...
Closes https://github.com/PrismLauncher/PrismLauncher/issues/426
2022-11-30 18:22:55 +01:00
99dd9874df
refactor+fix: refactor the windows part of the release workflow and add arm to it
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-11-30 13:46:55 +01:00
24193163e1
Maybe fix ResourceFolderModel Clang64 test failure
...
Previously this test would fail sometimes without including ECMQueryQt
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-30 13:46:55 +01:00
94d164c0f2
Remove unused QT_DATA_DIR/QT_MKSPECS_DIR
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-30 13:46:55 +01:00
efef2e95ab
Use ECMQueryQt Only with Qt5
...
Qt6 provides CMake variables for the paths we need
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-30 13:46:55 +01:00
5efa725e92
feat(actions) add arm64 build
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-11-30 13:46:55 +01:00
42c00213ce
Merge pull request #238 from santiagocezar/new-icons
2022-11-29 14:30:29 -08:00
b7d1b9ac61
Merge pull request #527 from DioEgizio/revert-6.4.1-winmsvc
2022-11-29 14:27:29 -08:00
52d06ed814
chore: move instance_icons.svg
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-29 20:07:00 +01:00
46a1c855a9
Merge pull request #528 from Scrumplex/fix-resourcepages-runningstate
2022-11-29 19:50:00 +01:00
31dc82b1a6
Make requested changes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-29 09:43:08 +00:00
4e27e132a0
fix: don't disable interaction on non-mod models when inst. is running
...
It is still useful for mods though, since we don't wnt to allow
disabling mods when the instance is running, as that wouldn't affect the
running instance, possibly causing confusion
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-28 12:02:38 -03:00
a5b0b4800a
fix: make resource buttons work when instance is running
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-27 23:10:32 +01:00
e6244c937a
Merge branch 'develop' into new-icons
...
Signed-off-by: Santiago Cézar <48573316+santiagocezar@users.noreply.github.com >
2022-11-27 16:28:42 -03:00
3cbf8d4993
resolving reviews
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-27 16:24:45 -03:00
f3279a0697
Merge remote-tracking branch 'upstream/develop' into import-resource-pack-dialog-uwu
2022-11-27 20:05:21 +01:00
8cac61f0be
fix: check resource pack validity solely using pack format
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-27 18:41:52 +01:00
236c196e68
fix: improve code readability
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-27 18:38:56 +01:00
6c09efd630
fix: use qt 6.4.0 on windows msvc for now
...
qt 6.4.1 has a very bad scaling regression
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-11-27 15:24:15 +01:00
