e885f3c26a
Merge pull request #65 from he3als/develop
2022-10-28 18:43:30 +02:00
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
03b48554b1
fix(style): convert tabs to spaces
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-10-29 00:01:22 +08:00
f229574758
Merge pull request #322 from DioEgizio/64bit-it
2022-10-28 18:43:32 +05:30
7b446dd30f
Merge pull request #319 from Scrumplex/fix-avoid-mr-segfault
2022-10-28 13:40:52 +02:00
a5be974f1a
feat: use clang64 on qt6 builds
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-10-28 08:05:31 +02:00
952615eadb
Merge pull request #301 from DioEgizio/clang-attempt
...
feat(actions): use clang32 for building on windows
2022-10-28 07:54:17 +02:00
93894f62ff
fix: avoid segfault for unexpected API reponse
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-28 00:08:15 +02:00
2051de51b5
Merge pull request #318 from TheLastRar/manifest-platform
...
Fix: Don't specify x86 in manifest
2022-10-27 22:53:15 +02:00
2ba3de79d8
chore: add comment about copy bug
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-27 21:23:17 +02:00
d35c985d2e
feat(actions): use clang32 for building on windows
...
*way* faster
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-10-27 21:23:17 +02:00
b18466da84
Fix: Don't specify x86 in manifest
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-10-27 18:37:08 +01:00
90714a93f3
Merge pull request #315 from AshtakaOOf/develop
...
Remove appveyor from README
2022-10-27 13:15:53 -03:00
990cfb7b33
Remove appveyor
...
I forgor 💀
But seriously I forgor to remove the &logo=appveyor thing AAAAAH!!!
Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com >
2022-10-27 18:08:56 +02:00
aacf7938ae
Add CI build for Snap
...
Signed-off-by: Piper McCorkle <contact@piperswe.me >
2022-10-26 09:25:58 -05:00
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
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
610b971117
Improve a bit README.md ( #305 )
...
Add Open Collective and fix some stuff.
2022-10-25 21:09:45 -03:00
318f657c31
Merge pull request #231 from tobimori/patch-1
2022-10-25 20:15:31 +02:00
482d3a1d76
update macos copyright year
...
Signed-off-by: tobimori <tobias@moeritz.cc >
2022-10-25 15:24:41 +02:00
b516dd970f
Merge pull request #206 from flowln/changelog_height_fix
2022-10-25 11:29:14 +02:00
d9463620e6
move .app rename to packaging process, update mac copyright string
...
Signed-off-by: tobimori <tobias@moeritz.cc >
2022-10-25 09:34:07 +02:00
385c452ddf
remove checkBool function, add updateSelectAllCheckbox function
...
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com >
2022-10-24 20:49:40 -04:00
a89df42561
Simplify bool check in CopyInstanceDialog.cpp
...
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com >
2022-10-24 19:31:40 -04:00
08cd5d52fa
Merge pull request #283 from flowln/fix_abort_on_autosearch
2022-10-24 23:00:02 +02:00
d0e668e1d8
Merge pull request #211 from Hibiii/show-instace-arg
2022-10-24 22:51:30 +02:00
eeb95f89e1
add .mrpack mime type
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-10-25 00:12:27 +08:00
e4e0c27e1c
Merge pull request #281 from Scrumplex/fix-nsis-displayname
2022-10-24 11:09:23 -03:00
6a5db12c6a
Apply some more suggestions from @flowln
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 15:00:33 +02:00
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
74b98af8e5
fix: use display name in NSIS
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-24 12:43:13 +02:00
6a474a0125
fix: update icon generate script
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-24 11:18:53 +02:00
224304813a
Merge pull request #274 from Protrikk/patch-1
2022-10-24 11:13:42 +02:00
dcbd6cc1af
More Json:: everywhere !
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:28 +02:00
a65f20a789
Fix a tiny formatting issue
...
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:28 +02:00
86e3518430
Apply most of the suggestions from @flowln
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:28 +02:00
89f1b60538
Delete out non-needed functions from SysInfo
...
Delete LaunchContext
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:28 +02:00
dc84a61999
Added failed and aborted handlers
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:28 +02:00
a902f29ccf
Changed to a temporary file
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:28 +02:00
24dc154856
Add download button to more pages + UI fixes
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:27 +02:00
68446c2a54
Obligatory formatting fix commit
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:27 +02:00
f946964490
Regrab a few changes on SysInfo
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:27 +02:00
53ddba8077
Made JavaDownloader a task and added some quick UI
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:27 +02:00
54ad91c3b7
Anti-scrumped
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:27 +02:00
89ce80b279
Fix Java downloader bugs + Add a test button in JavaPage
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:27 +02:00
98a82cd484
Fix MMCZip bugs
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:27 +02:00
a97387b692
Cherry-pick SysInfo from #680
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:26 +02:00
9a4a92de4f
Clang format
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:26 +02:00
3433c102b7
Remove old comment and change to piston-meta
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:26 +02:00
f95856d062
Add the base of java downloading
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:18 +02:00
