CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,882 Commits 10 Branches 30 Tags
Commit Graph

6882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sefa Eyeoglu
24060291c8
refactor: improve code readability 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-24 23:25:05 +02:00
Sefa Eyeoglu
61f938546d
refactor: rename column enum 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-24 23:25:05 +02:00
Sefa Eyeoglu
39c582297e
fix: algin instance icon 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-24 23:25:05 +02:00
Sefa Eyeoglu
3009356c8a
feat: add Cat support 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-24 23:25:05 +02:00
Sefa Eyeoglu
5c02265325
chore: fix formatting 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-24 23:25:05 +02:00
Sefa Eyeoglu
6527604b93
feat: reimplement contextmenu 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-24 23:25:05 +02:00
Sefa Eyeoglu
e786f2ea62
refactor: make last played last column 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-24 23:25:05 +02:00
Sefa Eyeoglu
319b816d79
feat: save instance view state 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-24 23:25:05 +02:00
Sefa Eyeoglu
d9b265d7ac
feat: show instance version 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-24 23:25:05 +02:00
Sefa Eyeoglu
ee1d4acb51
fix: handle last play of 0 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-24 23:25:05 +02:00
Sefa Eyeoglu
1e8c0ac36a
fix: improve code readability 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-24 23:25:05 +02:00
Sefa Eyeoglu
493a951ecb
refactor: switch instance view to QTableView 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-24 23:25:04 +02: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
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
Ryan Cao
1a8de111a3
add linux support 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-10-22 23:46:53 +08:00
flow
9bb62e1bba
Merge pull request #233 from jamierocks/atl-fix-aborting-installs 2022-10-22 12:19:58 -03: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: d87f743a2bd2fac761b94de77ed7255d7a983f03
I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 92dfd659f1a3e11accdbf0ebbdc7cb91f74d9a21
I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: a6e65dfc7a7e8080297b59ecf322b788d1c9bad2
I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 99e1c13e80d12764f57a993661656d9ed7de27bb

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
Jamie Mansfield
0e17eee096
ATLauncher: Fix pack installation always aborting 
I made a mistake during when cherry picking a previous commit, this
applies the change - and fixes installing ATLauncher packs.
 2022-10-22 15:22:30 +01:00
flow
81f1305270
Merge pull request #215 from forkiesassds/develop 2022-10-22 10:48:00 -03:00
Sefa Eyeoglu
2ec4310104
Merge pull request #230 from Scrumplex/add-pr-template 2022-10-22 15:32:00 +02:00
Sefa Eyeoglu
24e4db676a
Merge pull request #224 from jamierocks/atl-abort-close-optional-mods-dialog 2022-10-22 15:31:53 +02:00
Sefa Eyeoglu
6e21a9829d
Merge pull request #225 from Scrumplex/fix-segfault-fileresolver 2022-10-22 15:31:46 +02:00
flow
4e99e10cbd
Merge pull request #218 from getchoo/change-jars-path 2022-10-22 10:18:58 -03:00
Tobias Möritz
500a7eceab
update macOS build process to work with new .app 
Signed-off-by: Tobias Möritz <tobias@moeritz.cc>
 2022-10-22 15:10:32 +02:00
Tobias Möritz
1dad35ca76
update macos plist contents (fixes #132) 
Signed-off-by: Tobias Möritz <tobias@moeritz.cc>
 2022-10-22 15:00:52 +02:00
Sefa Eyeoglu
8b3093e758
chore: add PR template 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-22 14:59:57 +02:00
Ryan Cao
a406aeb3ea
feat: register as zip/mrpack handler on macOS 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-10-22 20:51:46 +08:00