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

5102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
81333515e0
feat(tests): add test for FS::copy with files 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-28 20:55:25 -03: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
Sefa Eyeoglu
150a3adaaf
Merge pull request #267 from leo78913/toolbar-icons 2022-10-28 21:28:44 +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
Ryan Cao
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
txtsd
f229574758
Merge pull request #322 from DioEgizio/64bit-it 2022-10-28 18:43:32 +05:30
Sefa Eyeoglu
7b446dd30f
Merge pull request #319 from Scrumplex/fix-avoid-mr-segfault 2022-10-28 13:40:52 +02:00
DioEgizio
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
DioEgizio
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
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
2051de51b5
Merge pull request #318 from TheLastRar/manifest-platform 
Fix: Don't specify x86 in manifest
 2022-10-27 22:53: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
DioEgizio
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
TheLastRar
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
flow
90714a93f3
Merge pull request #315 from AshtakaOOf/develop 
Remove appveyor from README
 2022-10-27 13:15:53 -03:00
Adrien
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
Piper McCorkle
aacf7938ae Add CI build for Snap 
Signed-off-by: Piper McCorkle <contact@piperswe.me>
 2022-10-26 09:25:58 -05: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
Adrien
610b971117
Improve a bit README.md (#305) 
Add Open Collective and fix some stuff.
 2022-10-25 21:09:45 -03:00
Sefa Eyeoglu
318f657c31
Merge pull request #231 from tobimori/patch-1 2022-10-25 20:15:31 +02:00
tobimori
482d3a1d76 update macos copyright year 
Signed-off-by: tobimori <tobias@moeritz.cc>
 2022-10-25 15:24:41 +02:00
DioEgizio
b516dd970f
Merge pull request #206 from flowln/changelog_height_fix 2022-10-25 11:29:14 +02:00
tobimori
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
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
Ryan Cao
eeb95f89e1
add .mrpack mime type 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-10-25 00:12:27 +08:00
flow
e4e0c27e1c
Merge pull request #281 from Scrumplex/fix-nsis-displayname 2022-10-24 11:09:23 -03: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
74b98af8e5
fix: use display name in NSIS 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-24 12:43:13 +02: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
Sefa Eyeoglu
224304813a
Merge pull request #274 from Protrikk/patch-1 2022-10-24 11:13:42 +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
Sefa Eyeoglu
29e6e170cc
Merge pull request #240 from jn64/fix/version-label-width 2022-10-23 02:07:29 +02: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