4500e345b3
Merge branch 'PrismLauncher:develop' into toolbar-icons
2022-10-28 15:46:02 -03:00
e885f3c26a
Merge pull request #65 from he3als/develop
2022-10-28 18:43:30 +02: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
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
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
e4e0c27e1c
Merge pull request #281 from Scrumplex/fix-nsis-displayname
2022-10-24 11:09:23 -03: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
224304813a
Merge pull request #274 from Protrikk/patch-1
2022-10-24 11:13:42 +02:00
43bf601f12
add icons to the instance toolbar
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-10-23 20:04:19 -03:00
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
7f441f5b87
Merge pull request #228 from bensuperpc/change_cast
2022-10-23 14:28:33 -03:00
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
4777a45722
Fix new flat white icons
...
Signed-off-by: he3als <65787561+he3als@users.noreply.github.com >
2022-10-23 14:32:35 +01:00
29e6e170cc
Merge pull request #240 from jn64/fix/version-label-width
2022-10-23 02:07:29 +02:00
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
8b28ed67ae
Merge pull request #234 from AliceDTRH/fix/dedupejava
2022-10-22 13:14:26 -03:00
9bb62e1bba
Merge pull request #233 from jamierocks/atl-fix-aborting-installs
2022-10-22 12:19:58 -03:00
b2789fef0f
Use correct variable for Windows
...
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com >
2022-10-22 17:19:34 +02:00
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
99e1c13e80
fix: add flat_white to code
2022-10-22 15:50:06 +01:00
a6e65dfc7a
Add new flat white icons
2022-10-22 15:40:39 +01:00
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
89fd84d916
Merge branch 'PrismLauncher:develop' into develop
2022-10-22 15:30:40 +01:00
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
81f1305270
Merge pull request #215 from forkiesassds/develop
2022-10-22 10:48:00 -03:00
2ec4310104
Merge pull request #230 from Scrumplex/add-pr-template
2022-10-22 15:32:00 +02:00
24e4db676a
Merge pull request #224 from jamierocks/atl-abort-close-optional-mods-dialog
2022-10-22 15:31:53 +02:00
6e21a9829d
Merge pull request #225 from Scrumplex/fix-segfault-fileresolver
2022-10-22 15:31:46 +02:00
4e99e10cbd
Merge pull request #218 from getchoo/change-jars-path
2022-10-22 10:18:58 -03:00
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
1dad35ca76
update macos plist contents ( fixes #132 )
...
Signed-off-by: Tobias Möritz <tobias@moeritz.cc >
2022-10-22 15:00:52 +02:00
8b3093e758
chore: add PR template
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-22 14:59:57 +02:00
970e4b020e
fix: fix segfault when resolving Flame resources
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-22 14:11:51 +02:00
a4f4f2891c
DCO Remediation Commit for a6b13487
...
I, Jamie Mansfield <jmansfield@cadixdev.org >, hereby add my
Signed-off-by to this commit: a6b13487f0e27c8bea1917720a0c5c1eb1eb206c
Signed-off-by: Jamie Mansfield <jmansfield@cadixdev.org >
2022-10-22 12:58:56 +01:00
