CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,410 Commits 10 Branches 30 Tags 34 MiB
97ce8a94e9
Commit Graph

4410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
flow
97ce8a94e9
Merge pull request #1017 from flowln/kill_orphan_metadata 
Remove orphaned metadata to avoid problems with auto-updating instances
 2022-09-08 13:10:37 +02:00
flow
85f0904872
Merge pull request #1014 from DioEgizio/downgrade-qt-macos 
chore: downgrade to Qt 6.3.0 on macos
 2022-09-08 13:10:37 +02:00
flow
cb0a5e42df
Merge pull request #1006 from DioEgizio/appimage-ubuntu-moment 
fix: work around ubuntu 22.04 openssl appimage issues by copying openssl libs
 2022-09-08 13:10:36 +02:00
Sefa Eyeoglu
a0c7fa30c0
Merge pull request #1019 from Scrumplex/fix-openbsd-root 
Add root path detection on OpenBSD
 2022-09-08 13:10:36 +02:00
LennyMcLennington
b7490b479c
Merge pull request #970 from PolyMC/Bump-1.4.1 
bump version to 1.4.1
 2022-07-28 09:42:56 +01:00
timoreo
74120fe1f3
Merge pull request #699 from Scrumplex/resolve-ftb-mods-cf 2022-07-28 09:43:39 +02:00
flow
336f1f4f50
Merge pull request #974 from flowln/accounts_qt6 
Fix adding multiple accounts in Qt6
 2022-07-26 16:08:05 -03:00
txtsd
1c256d8876
Merge pull request #958 from jopejoe1/readme 2022-07-27 00:16:35 +05:30
flow
1ce0f0e7a5
fix: progress dialog going away even if the task was not aborted 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-26 20:33:33 +02:00
flow
fbf1901d86
refactor: shuffle some things around to improve readability 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-26 20:33:33 +02:00
flow
0382f33c46
fix(ui): pump events to show "Copying modpack files..." text 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-26 20:33:33 +02:00
flow
13372f3f99
chore: clean up FTBPackInstallTask a bit and connect missing signals 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-26 20:33:33 +02:00
flow
e741cb7f0a
fix: add abort handlign in Flame's FileResolvingTask 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-26 20:33:33 +02:00
Sefa Eyeoglu
fb289c6b17
chore: add license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-26 20:33:29 +02:00
Sefa Eyeoglu
75a7ea55d4
feat: implement mod resolving for FTB 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-26 20:33:10 +02:00
Sefa Eyeoglu
86573a5ccd
Merge pull request #961 from flowln/fix_resource_filter 2022-07-26 20:14:18 +02:00
flow
6fe55a79f1
fix: use const qualifier for operator==() and allow other comparisons 
This fixes an implicit behavior changed by C++17.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-26 15:11:56 -03:00
flow
1a6cb9ee99
chore: add some debugging prints in AccountList 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-26 15:11:56 -03:00
txtsd
a495d9eca5
chore: Normalize sentence in readme 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-07-26 22:00:40 +05:30
LennyMcLennington
65a945f968
Merge pull request #956 from flowln/jar_mods_aa 
Fix segmentation fault when using jar mods
 2022-07-25 06:57:40 +01:00
LennyMcLennington
0d35edbbf3
bump version 2022-07-25 06:44:34 +01:00
flow
3aa2003951
fix: filter in external resource pages not working 
For some reason, using setFilterFixedString() doesn't seem to update the
QRegularExpression object with a new value, instead leaving it empty. It
updates QRegExp just fine, so maybe that's an Qt bug? o.O

Anyway, using regex in the filter is kinda cool actually :D

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-23 23:50:56 -03:00
flow
0e473f4570
Merge pull request #951 from flowln/performace_tab_fix 
Hide the entire performance tab on the instance settings in non-Linux OSes
 2022-07-23 18:31:04 -03:00
jopejoe1
bfa824ee71 Fix broken url in readme 
Signed-off-by: jopejoe1 <johannes@joens.email>
 2022-07-23 23:22:39 +02:00
flow
1157436a24
fix: sigsegv when trying to use jar mods 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-23 14:24:24 -03:00
LennyMcLennington
4596e78df0
Merge pull request #952 from Scrumplex/fix-pre-post-launch 
Fix variable substitution in pre launch/post exit hooks
 2022-07-23 18:06:12 +01:00
flow
813dfbd2d3
fix: hide the entire performance tab on instance settings in non-Linux 
"just woke up after a major release has just been made" coding style

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-23 13:29:39 -03:00
Sefa Eyeoglu
ba7dfb360c
fix: actually substitute variables in pre/post launch 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-23 17:51:58 +02:00
timoreo
6aad750fe0
Merge pull request #893 from Scrumplex/refactor-env-handling 2022-07-23 14:08:10 +02:00
Sefa Eyeoglu
5e443ae347
fix(nix): change license to gpl3Only 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-23 14:00:11 +02:00
Sefa Eyeoglu
c65f5f7728
Merge pull request #877 from Scrumplex/refactor-offline-accounts 2022-07-23 13:54:36 +02:00
timoreo
74b62727af
Merge pull request #947 from flowln/unicode_uhh 2022-07-23 13:38:48 +02:00
Sefa Eyeoglu
2e94562f79
fix: treat accounts as offline, if auth servers are down 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-23 12:38:01 +02:00
txtsd
061ea5648e
Merge pull request #922 from DioEgizio/qt6-tarballs 
feat(actions): package and deliver qt6 tarballs
 2022-07-23 14:18:00 +05:30
flow
439e7bbf4e
change: unicode chars for folders and disabled mods in mod list 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-22 17:45:27 -03:00
Sefa Eyeoglu
0f1d51f866
Update .github/workflows/build.yml 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-22 22:11:53 +02:00
txtsd
75cfaf0672
Merge pull request #938 from Scrumplex/fix-i18n3 2022-07-22 22:45:53 +05:30
txtsd
ceaa732e5f
Merge pull request #932 from Scrumplex/fix-nix 2022-07-22 22:43:57 +05:30
txtsd
deb2a2bd14
Merge pull request #930 from TheOPtimal/develop 2022-07-22 22:43:00 +05:30
flow
33853b6107
fix: use single-space unicode char for checkmark in mod list 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-22 11:48:08 -03:00
Jacob Gogichaishvili
220e823c8d DCO Remediation Commit for Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com> 
I, Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com>, hereby add my Signed-off-by to this commit: 3746a2566d

Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com>
 2022-07-20 23:27:07 +04:00
Sefa Eyeoglu
9cc1773fa7
fix: move HTML code outside of translation 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-20 10:15:21 +02:00
Sefa Eyeoglu
e78c7af715
Merge pull request #936 from Scrumplex/fix-windows-crap-2 2022-07-20 10:07:10 +02:00
Sefa Eyeoglu
b96e76134a
fix(nix): switch to LD_LIBRARY_PATH 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-19 18:09:48 +02:00
Sefa Eyeoglu
fd2b206997
fix: support LD_* for OpenBSD 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-19 18:07:58 +02:00
Sefa Eyeoglu
2d53c7c5b2
refactor: filter values in environment variables 
Before this change, you had to specify custom LD_* variables using the
prefix GAME_LD_*. Now instead of dropping all LD_* variables by default,
we should just filter them and remove the values we *know* are from our
start script.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-19 18:07:58 +02:00
Sefa Eyeoglu
28ae5d710e
fix: fix translations for mod updater 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-19 18:03:45 +02:00
DioEgizio
7a13412ec7 feat(actions): package and deliver qt6 tarballs 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-07-19 17:07:34 +02:00
flow
c86610b917
Merge pull request #934 from virchau13/fix-non-nixos-libraries 
fix(nix): only load stdenv.cc.cc.lib on NixOS
 2022-07-19 11:28:08 -03:00
Sefa Eyeoglu
502750492c
Merge pull request #929 from flowln/dark_theme_dark_font 2022-07-19 11:17:40 +02:00