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
cc92e1b0b6
Merge pull request #521 from Scrumplex/missing-icons
2022-11-26 19:02:03 +01:00
c90f2c3ac6
fix: use monochrome icon for breeze
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-11-26 15:05:08 +01:00
6bdd27a08e
Merge pull request #493 from Scrumplex/cachix
...
Closes https://github.com/PrismLauncher/PrismLauncher/issues/491
2022-11-26 14:24:06 +01:00
80ff0b1418
Merge pull request #492 from Scrumplex/update-nix
2022-11-26 14:03:51 +01:00
a8943ce1ee
remove unused ftb icon
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-25 15:15:08 -03:00
71d35dc70b
meat is now round
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-25 15:15:08 -03:00
9daf2a2996
resize to 24x24
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-25 15:15:07 -03:00
f5d6aea942
forgot ftb
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-25 15:15:07 -03:00
5850447fd0
merge with upstream
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-25 15:14:52 -03:00
e12a7a4415
gradients!
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-25 14:22:49 -03:00
81d84b8d02
initial icons
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-25 14:22:49 -03:00
bae0a0530b
fix(RPImportDialog): allow changing item size to accomodate wrapped text
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-25 11:51:08 -03:00
cbf4159c7e
fix: add missing shortcut icons
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-25 14:03:10 +01:00
4a1d082614
reafctor(WideBar): connect to signal instead of overriding menu method
...
This makes stuff more standard and closer to what we do in other places
in the codebase.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-25 09:33:05 -03:00
fd8b4c5368
Merge pull request #227 from Leo40Git/feature/instance-shortcuts
...
Closes https://github.com/PrismLauncher/PrismLauncher/issues/210
2022-11-25 13:11:00 +01:00
5872c34315
Merge pull request #412 from leo78913/legacy-icons
...
add the missing icons to the legacy icon theme
2022-11-25 08:36:42 +01:00
b60fe08d44
Merge pull request #514 from DioEgizio/force-bundled-libs-win
2022-11-23 15:11:45 -08:00
6a51eda361
fix: force bundled libs on win msvc
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-11-23 19:53:55 +01:00
96e8217b00
Button to add agent
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-23 09:46:55 +00:00
e6cb6cae11
Merge pull request #508 from TheLastRar/ForceBundledLibs
2022-11-23 09:49:24 +01:00
980f03dd20
Fix: Launcher_FORCE_BUNDLED_LIBS Failing to find bundled zlib
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-22 19:23:09 +00:00
20c281d6f8
fix: reset wide bar settings when the list of actions changes
...
This prevents changes to the actions to cause non-intuitive issues in
the Wide bar, hiding items that previously weren't hidden.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-22 14:30:54 -03:00
66f9fed2f2
Remove blue-ish tint from flat white icons
...
Signed-off-by: Trisave <42098407+Protrikk@users.noreply.github.com >
2022-11-22 18:30:21 +01:00
