0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,107 Commits 1 Branch 0 Tags
develop
Commit Graph

6107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcelo Hernandez
5d1aac3c53 added option to not copy screenshots 
+ moved select all checkbox to top row, centered.

Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-29 22:27:31 -04:00
txtsd
392bf7a97b Merge pull request #342 from fn2006/prism-svg-fix 2022-10-29 23:11:37 +02:00
txtsd
87b0d3fe11 Merge pull request #342 from fn2006/prism-svg-fix 2022-10-30 01:51:14 +05:30
fn2006
98891a036d use existing variables 
Signed-off-by: fn2006 <usernamefn2006alreadyused@protonmail.com>
 2022-10-29 17:35:37 +01:00
fn2006
b142a6da5b fix hardcoded svg 
Signed-off-by: fn2006 <usernamefn2006alreadyused@protonmail.com>
 2022-10-29 16:42:37 +01:00
Sefa Eyeoglu
1c0139c5f4 Merge pull request #340 from PrismLauncher/repology 2022-10-29 16:16:12 +02:00
Sefa Eyeoglu
34687049b1 Merge pull request #338 from Scrumplex/fix-credits-1 2022-10-29 16:15:58 +02:00
Sefa Eyeoglu
1b7ae4321d Merge pull request #338 from Scrumplex/fix-credits-1 2022-10-29 16:15:34 +02:00
txtsd
7f991ed897 feat: Add Repology badge to README 
Signed-off-by: txtsd <code@ihavea.quest>
 2022-10-29 19:37:00 +05:30
fn2006
0f581efda5 fix hardcoded svg path 2022-10-29 14:16:14 +01:00
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
9337ec6706 Merge pull request #173 from Scrumplex/fix-icons 2022-10-29 00:36:15 +02:00
Sefa Eyeoglu
177f17450a Merge pull request #173 from Scrumplex/fix-icons 2022-10-29 00:35:48 +02:00
Sefa Eyeoglu
5bcb6962c4 chore: bump version 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-28 21:54:10 +02:00
txtsd
0617b43190 Merge pull request #322 from DioEgizio/64bit-it 2022-10-28 21:34:59 +02:00
Sefa Eyeoglu
ed28234cfb Merge pull request #319 from Scrumplex/fix-avoid-mr-segfault 2022-10-28 21:34:59 +02:00
DioEgizio
9c4455ca03 Merge pull request #301 from DioEgizio/clang-attempt 
feat(actions): use clang32 for building on windows
 2022-10-28 21:34:59 +02:00
Sefa Eyeoglu
9ec7837275 Merge pull request #318 from TheLastRar/manifest-platform 
Fix: Don't specify x86 in manifest
 2022-10-28 21:34:59 +02:00
Sefa Eyeoglu
549b5a6488 Merge pull request #231 from tobimori/patch-1 2022-10-28 21:34:59 +02:00
DioEgizio
2652f37453 Merge pull request #206 from flowln/changelog_height_fix 2022-10-28 21:34:59 +02:00
Sefa Eyeoglu
0eaff22145 Merge pull request #283 from flowln/fix_abort_on_autosearch 2022-10-28 21:34:59 +02:00
flow
2f5393b9d0 Merge pull request #281 from Scrumplex/fix-nsis-displayname 2022-10-28 21:34:59 +02:00
Sefa Eyeoglu
e28480a8e4 Merge pull request #274 from Protrikk/patch-1 2022-10-28 21:34:59 +02:00
flow
fcef6321fc Merge pull request #228 from bensuperpc/change_cast 2022-10-28 21:34:59 +02:00
Sefa Eyeoglu
35e792c5de Merge pull request #240 from jn64/fix/version-label-width 2022-10-28 21:34:59 +02:00
flow
c08b632b51 Merge pull request #234 from AliceDTRH/fix/dedupejava 2022-10-28 21:34:59 +02:00
flow
cac800bfd8 Merge pull request #233 from jamierocks/atl-fix-aborting-installs 2022-10-28 21:34:59 +02:00
Sefa Eyeoglu
2eb8173951 Merge pull request #224 from jamierocks/atl-abort-close-optional-mods-dialog 2022-10-28 21:34:59 +02:00
Sefa Eyeoglu
75abf2c124 Merge pull request #225 from Scrumplex/fix-segfault-fileresolver 2022-10-28 21:34:59 +02:00
flow
d40a18d6c5 Merge pull request #218 from getchoo/change-jars-path 2022-10-28 21:34:59 +02:00
Sefa Eyeoglu
a74fdc588c Merge pull request #185 from flowln/fix_blocked_mods_crash 2022-10-28 21:34:59 +02:00
flow
25b0ec6eff Merge pull request #147 from Minion3665/enhancement/update-nix-derivation 2022-10-28 21:34:59 +02:00
txtsd
04e8982d33 Merge pull request #198 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x 2022-10-28 21:34:59 +02:00
txtsd
58bd449db8 Merge pull request #197 from PrismLauncher/renovate/actions-cache-3.x 2022-10-28 21:34:59 +02:00
Sefa Eyeoglu
c984e9b5d6 Merge pull request #202 from Heath123/patch-1 2022-10-28 21:34:59 +02:00
Sefa Eyeoglu
ddd319369a Merge pull request #39 from Sebbl0508/mod_dialog_fontsize 2022-10-28 21:34:59 +02:00
Sefa Eyeoglu
de3c336213 Merge pull request #184 from Chrono-byte/develop 2022-10-28 21:34:59 +02:00
Sefa Eyeoglu
6e94e9bff1 Merge pull request #148 from ZombieNub/prismlauncher-rename 2022-10-28 21:34:59 +02:00
flow
93b8d9e454 Merge pull request #123 from MMK21Hub/patch-1 2022-10-28 21:34:59 +02:00
flow
6d46081864 Merge pull request #100 from TheEvilSkeleton/improve-approachability 2022-10-28 21:34:59 +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