fede/prismlauncher-crack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,259 Commits 1 Branch 0 Tags
abd482db4a3cdfef7bd2d948fbefde61f823cb4e
Commit Graph

5010 Commits

Author SHA1 Message Date
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
timoreo 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
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
timoreo dcbd6cc1af More Json:: everywhere ! 
Signed-off-by: timoreo <contact@timoreo.fr>
 2022-10-24 08:02:28 +02:00
timoreo 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
timoreo 86e3518430 Apply most of the suggestions from @flowln 
Signed-off-by: timoreo <contact@timoreo.fr>
 2022-10-24 08:02:28 +02:00
timoreo 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
timoreo dc84a61999 Added failed and aborted handlers 
Signed-off-by: timoreo <contact@timoreo.fr>
 2022-10-24 08:02:28 +02:00
timoreo a902f29ccf Changed to a temporary file 
Signed-off-by: timoreo <contact@timoreo.fr>
 2022-10-24 08:02:28 +02:00
timoreo 24dc154856 Add download button to more pages + UI fixes 
Signed-off-by: timoreo <contact@timoreo.fr>
 2022-10-24 08:02:27 +02:00
timoreo 68446c2a54 Obligatory formatting fix commit 
Signed-off-by: timoreo <contact@timoreo.fr>
 2022-10-24 08:02:27 +02:00
timoreo f946964490 Regrab a few changes on SysInfo 
Signed-off-by: timoreo <contact@timoreo.fr>
 2022-10-24 08:02:27 +02:00
timoreo 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
timoreo 54ad91c3b7 Anti-scrumped 
Signed-off-by: timoreo <contact@timoreo.fr>
 2022-10-24 08:02:27 +02:00
timoreo 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
timoreo 98a82cd484 Fix MMCZip bugs 
Signed-off-by: timoreo <contact@timoreo.fr>
 2022-10-24 08:02:27 +02:00
timoreo a97387b692 Cherry-pick SysInfo from #680 
Signed-off-by: timoreo <contact@timoreo.fr>
 2022-10-24 08:02:26 +02:00
timoreo 9a4a92de4f Clang format 
Signed-off-by: timoreo <contact@timoreo.fr>
 2022-10-24 08:02:26 +02:00
timoreo 3433c102b7 Remove old comment and change to piston-meta 
Signed-off-by: timoreo <contact@timoreo.fr>
 2022-10-24 08:02:26 +02:00
timoreo f95856d062 Add the base of java downloading 
Signed-off-by: timoreo <contact@timoreo.fr>
 2022-10-24 08:02:18 +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