Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,786 Commits 1 Branch 19 Tags 35 MiB
9f457e0ce6
Commit Graph

4786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lenny McLennington
9f457e0ce6
fix(MMCZip): ignore invalid file paths in extractSubDir 
Ignores files that have an absolute path or a path beginning with ..

Signed-off-by: Lenny McLennington <lenny@sneed.church>
 2023-02-09 20:04:24 +00:00
Lenny McLennington
7b547c842c
Merge pull request #1539 from LennyMcLennington/fix-windows-builds-for-real 
Fix Windows Qt6 builds
 2023-02-04 15:31:19 +00:00
Lenny McLennington
03552edbb7
Fix Windows Qt6 builds 
- Fix warning about no return on main
- Fix program not starting when built with Qt6

Signed-off-by: Lenny McLennington <lenny@sneed.church>
 2023-02-04 15:31:00 +00:00
Lenny McLennington
01b52ea6be
Merge pull request #1537 from LennyMcLennington/security-fix 
fix(ModrinthInstanceCreationTask): ignore files with invalid paths
 2023-02-04 12:20:56 +00:00
Lenny McLennington
c16cc2d8bb
Merge pull request #1538 from LennyMcLennington/fix-windows-build 
fix windows ci builds
 2023-02-04 12:08:32 +00:00
Lenny McLennington
20edcb1a2b
fix windows ci builds 
Signed-off-by: Lenny McLennington <lenny@sneed.church>
 2023-02-04 11:21:52 +00:00
Lenny McLennington
67bb016623
fix(ModrinthInstanceCreationTask): ignore files with invalid paths 
Signed-off-by: Lenny McLennington <lenny@sneed.church>
 2023-02-04 00:10:54 +00:00
Lenny McLennington
fe2624bf1a
Merge pull request #1531 from oluceps/fix-nixbuild 
Fix build fail on nix flake
 2023-01-13 00:10:20 +00:00
oluceps
eb390814d8
Fix build fail on nix flake. 
This should fix nix build fail caused by introduced new qt module.

Signed-off-by: oluceps <i@oluceps.uk>
 2023-01-05 21:55:05 +08:00
Lenny McLennington
21e6093520
Merge pull request #1504 from xslendix/storage 
Add storage page to instances.
 2023-01-04 20:23:12 +00:00
xSlendiX
91c7a700a9 Fix GitHub workflow broken. 
This patch adds the needed QtCharts dependency to GitHub workflow.

Signed-off-by: xSlendiX <slendi@socopon.com>
 2022-12-27 22:34:48 +02:00
Lenny McLennington
7839bd0e54
Merge pull request #1508 from xslendix/move_pussy 
Add a way to change the position of the cat.
 2022-12-08 06:49:58 +00:00
xSlendiX
58bc61ccbd Add a way to change the position of the cat. 
This simple commit adds the ability to further customize the cat by
allowing the user to change its position.

Signed-off-by: xSlendiX <slendi@socopon.com>
 2022-12-06 15:25:09 +02:00
Lenny McLennington
7f226eba9c
Merge pull request #1503 from jdpatdiscord/develop 
fix recursive crash on win64
 2022-12-06 00:28:15 +00:00
Lenny McLennington
3340d2c814
Merge pull request #1510 from xslendix/oh_yeah_big_floppa_time_sunglasses_emoji 
Add Floppa :^)
 2022-12-06 00:26:00 +00:00
xSlendiX
59c280309d Add Floppa :^) 
How can we have a cat selection combo box without a floppa option?!
This is unacceptable, and this patch fixes it. Now the launcher can flop
all day long :^)

Signed-off-by: xSlendiX <slendi@socopon.com>
 2022-11-26 22:04:14 +02:00
xSlendiX
3187b5c1c2 Add pie chart to StoragePage and improve UX :^) 
This patch adds a nice little pie chart to visually show which parts of
the instance take most space. It also refactors some code and improve
the UX a bit more.

Signed-off-by: xSlendiX <slendi@socopon.com>
 2022-11-26 14:39:41 +02:00
xSlendiX
16a4a4f811 Add icon for storage page. 
Signed-off-by: xSlendiX <slendi@socopon.com>
 2022-11-24 20:46:50 +02:00
Lenny McLennington
90bbde3631
build: only increase stack size in non-debug builds 
Signed-off-by: Lenny McLennington <lenny@sneed.church>
 2022-11-24 18:20:18 +00:00
Lenny McLennington
211c423da1
Merge pull request #1493 from urFate/develop 
Implement account per instance feature
 2022-11-17 23:37:21 +00:00
Lenny McLennington
51de23d83c
Merge pull request #1505 from LennyMcLennington/fix-concurrenttask-stack-overflow 
fix: prevent stack overflow in ConcurrentTask
 2022-11-17 23:36:50 +00:00
xSlendiX
cf317ca3d4 Add storage page to instances. 
This patch adds a new page to instance settings which allows users to
manage storage. This commit represents the start of it. Right now, only
some base features are implemented.

Signed-off-by: xSlendiX <slendi@socopon.com>
 2022-11-17 20:38:45 +02:00
Lenny McLennington
a3d1e88d44
Merge pull request #1499 from HeyaGlitz/develop 
Add Jinx
 2022-11-17 04:34:04 +00:00
Lenny McLennington
4cccb693f2
fix: prevent stack overflow in ConcurrentTask 
Signed-off-by: Lenny McLennington <lenny@sneed.church>
 2022-11-17 04:13:30 +00:00
Lenny McLennington
6ff87f773b
fix: add missing placeholder text for account override 
Also changes the "No accounts available" message to be placeholder text
instead of a combobox item, if the current Qt version supports it.

Signed-off-by: Lenny McLennington <lenny@sneed.church>
 2022-11-17 03:21:39 +00:00
Lenny McLennington
462e0ef56d
fix: disable account override if no account selected 
Signed-off-by: Lenny McLennington <lenny@sneed.church>
 2022-11-17 02:12:23 +00:00
Lenny McLennington
de1de47940
fix: use profile id for per-instance account override 
Signed-off-by: Lenny McLennington <lenny@sneed.church>
 2022-11-17 02:08:19 +00:00
jdp_
22fb301d88 fix recursive crash on win64 
one of the contributors to PolyMC that moved over to Prism (TheLastRar) ended up finding this.
I didn't understand what it was for until I fixed & ran a 64-bit Windows build myself, and got a 0xC00000FD (Stack overflow).
This is caused by the massive recursive load of ATLauncher packs.
This is a pretty jank fix as it is, and later should be re-engineered to not be recursive.

Signed-off-by: jdp_ <42700985+jdpatdiscord@users.noreply.github.com>
 2022-11-16 12:08:10 -05:00
HeyaGlitz
ddbc80e1ef
Add Jinx 
Signed-off-by: HeyaGlitz <heyaglitz0x99@proton.me>
 2022-11-14 21:23:50 +01:00
Lenny McLennington
cfe8f6ce9b
Merge pull request #1501 from binex-dsk/patch-1 
fix windows build
 2022-11-14 04:08:10 +00:00
swirl
78ec58dbf1
fix windows build 
Signed-off-by: swirl <swurl@swurl.xyz>
 2022-11-13 22:15:49 -05:00
Lenny McLennington
64aa817c80
Merge pull request #1500 from unix-supremacist/bsdmemfix 
fix *bsd support
 2022-11-13 19:22:51 +00:00
Unix
75756a5b9e fix *bsd max memory 
Signed-off-by: Unix <100294596+unix-supremacist@users.noreply.github.com>
 2022-11-13 11:09:17 -06:00
Lenny McLennington
1b52829e6c
Merge pull request #1494 from jdpatdiscord/develop 
Have API key validators tolerate whitespace
 2022-11-09 14:53:10 +00:00
Lenny McLennington
b3fb52ce51
chore: add jdp_'s copyright header 
Signed-off-by: Lenny McLennington <lenny@sneed.church>
 2022-11-08 22:09:30 +00:00
Lenny McLennington
6b8e6774a0
refactor: clean up PMCKeyValidator 
Renamed PMCKeyValidator to TrimmedRegExpValidator
Removed redundant variable
Removed erroneous forward-declaration in Ui namespace definition
Fixed indentation for Ui namespace definition

Signed-off-by: Lenny McLennington <lenny@sneed.church>
 2022-11-08 22:08:06 +00:00
jdp_
c2a703b3d6
have key validation tolerate whitespace (fixes #1168) 
Signed-off-by: Lenny McLennington <lenny@sneed.church>
 2022-11-08 18:28:51 +00:00
urFate
5d9ff3767a Set tab index to 0 & fix english translation 
Signed-off-by: urFate <georgiylakidon@gmail.com>
 2022-11-07 19:09:30 +03:00
urFate
ce1a48be5d Use indexes instead of account name. Added "no accounts" indication. Added account type to combo box string. 
Signed-off-by: urFate <georgiylakidon@gmail.com>
 2022-11-02 12:18:14 +03:00
urFate
2a7c666932 Implement account per instance feature 
Signed-off-by: urFate <georgiylakidon@gmail.com>
 2022-11-01 19:10:34 +03:00
Lenny McLennington
21db985b54
Merge pull request #1490 from LennyMcLennington/update-readme 
Remove closed matrix rooms from README
 2022-10-28 06:02:11 +01:00
Lenny McLennington
15f9e102c6
docs: remove closed matrix rooms from README 
Signed-off-by: Lenny McLennington <lenny@sneed.church>
 2022-10-28 06:01:26 +01:00
Lenny McLennington
e9f7280027
Merge pull request #1482 from LennyMcLennington/cf-workarounds-2 
Minor changes to curseforge workarounds
 2022-10-27 17:22:55 +01:00
Lenny McLennington
5229cb8c12
feat: add ability to disable cf api key fetching 
by setting the cf api key api url to a blank string

Signed-off-by: Lenny McLennington <lenny@sneed.church>
 2022-10-27 01:42:32 +01:00
Lenny McLennington
e7853533b4
chore: update cf api key api url 
Sascha says the domain name we're using is not gonna be renewed, so I'm
switching it to a domain controlled by me instead so that this won't be
a problem in the future.

Signed-off-by: Lenny McLennington <lenny@sneed.church>
 2022-10-26 23:01:09 +01:00
LennyMcLennington
46adfda5a6
Merge pull request #1477 from LennyMcLennington/cf-workarounds 
Curseforge workarounds and fixes
 2022-10-25 02:02:18 +01:00
Lenny McLennington
361ef5eb9b
fix: update capabilities when key changed 
Signed-off-by: Lenny McLennington <lenny@sneed.church>
 2022-10-25 00:46:00 +01:00
LennyMcLennington
2bf9c0dcf4
Merge pull request #1480 from LennyMcLennington/oauth2-token-error-diagnostic 
change: Added diagnostic logging for OAuth 2.0 token reply errors, an…
 2022-10-24 23:14:52 +01:00
Lenny McLennington
b752875325
fix: make loadDialog close after failure in runModalTask 
Signed-off-by: Lenny McLennington <lenny@sneed.church>
 2022-10-24 23:05:30 +01:00
Lenny McLennington
33634764e9
fix: handle json exception in FileResolvingTask 
Also needed to add a call to loop.exit() in FlameInstanceCreationTask so
that it would handle the failure of FileResolvingTask properly

Signed-off-by: Lenny McLennington <lenny@sneed.church>
 2022-10-24 23:05:29 +01:00