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

279 Commits

Author SHA1 Message Date
TheKodeToad
19b5a5e00b Remove final conflict - kept by mistake 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-02 22:38:14 +01:00
TheKodeToad
1213a5ab46 Merge remote-tracking branch 'upstream/develop' into skinfix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-02 22:27:57 +01:00
Sefa Eyeoglu
85c23b26de chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-23 13:46:23 +02:00
TheKodeToad
c5bffed21e Merge branch 'PrismLauncher:develop' into skinfix 2023-08-04 16:29:30 +01:00
Sefa Eyeoglu
1d468ac35a chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-02 18:35:35 +02:00
seth
f7ffbcca6c chore(docs): correct markdownlint warnings 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-26 14:49:09 -04:00
PandaNinjas
2253100ac6 Update libnbtplusplus submodule 
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
 2023-07-22 14:26:49 -04:00
TheKodeToad
c37e1fb9f1 Merge branch 'develop' into skinfix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-20 18:11:27 +01:00
TheKodeToad
180ed0cc1a Merge branch 'PrismLauncher:develop' into skinfix 2023-06-13 11:08:21 +01:00
PandaNinjas
a90eaafa70 Make it clear that the statements are meant to fall through in Murmur hash 
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
 2023-06-07 15:18:59 -04:00
Rachel Powers
e61d8e4dc8 fix: katabasis and QStyle leaks 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-25 16:16:58 -07:00
Kode
dfc2b9c76a thanks flowln! :P 
Signed-off-by: Kode <TheKodeToad@proton.me>
 2023-04-21 20:49:47 +01:00
TheKodeToad
3390e84a9f Merge branch 'PrismLauncher:develop' into skinfix 2023-03-14 12:07:05 +00:00
Sefa Eyeoglu
a1130dace0 chore: format markdown files 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-14 10:54:50 +01:00
Kenneth Chew
5ac3e5c958 Update tomlplusplus library 
Fix build on MinGW g++ 10

Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com>
 2023-03-12 18:33:48 -04:00
TheKodeToad
2e1c123c05 Merge branch 'PrismLauncher:develop' into skinfix 2023-03-10 11:17:06 +00:00
TheKodeToad
83c5264598 Stupidly small skinfixfix as requested by DioEgizio 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-10 11:04:15 +00:00
Sefa Eyeoglu
b9dfcf6d2f chore: bump ghc-filesystem 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-05 14:21:07 +01:00
kumquat-ir
01c4ed232e license stuff 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-02-24 15:01:59 -05:00
TheKodeToad
bb62c62a03 Fix cmark again 🤦 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-02-19 11:37:59 +00:00
TheKodeToad
9cc3d9d4ce Merge remote-tracking branch 'upstream/develop' into skinfix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-02-19 11:35:26 +00:00
kumquat-ir
c07fff7503 switch to qdcss for parsing 
make it not horrible to look at

Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-02-12 17:23:15 -05:00
DioEgizio
58239ff98f fix: update cmark to fix a CVE 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-01-24 15:05:13 +01:00
Sefa Eyeoglu
22a2b7ac46 refactor: support system and bundled cmark 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-01-12 10:08:52 -05:00
Joshua Goins
aa7c910e26 build: remove hoedown vendored source 
Signed-off-by: Joshua Goins <josh@redstrate.com>
 2023-01-12 10:08:52 -05:00
TheKodeToad
d4b346b7ae Fix oversights 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-01-09 10:48:46 +00:00
TheKodeToad
52b3a54e4b Fix cloaks conflicting with join server endpoint 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-01-08 15:36:36 +00:00
TheKodeToad
be7f81421a Finishing touches 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-01-06 10:46:43 +00:00
TheKodeToad
17317ea308 Move legacy support classes to another jar 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-01-06 09:23:36 +00:00
TheKodeToad
cb32711077 Slim skin fix - thanks to @craftycodie and @DelofJ 
!

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-01-06 09:21:43 +00:00
Sefa Eyeoglu
f33f596584 refactor: use ECM logging categories instead 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-27 17:34:21 +01:00
Sefa Eyeoglu
c8d8046412 refactor: add logging category for credentials 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-27 17:04:42 +01:00
TheKodeToad
5c96b1c628 Remove MIT license from JsonParser 
I don't mind, and it's my code.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-25 09:45:42 +00:00
TheKodeToad
884bd85495 Skin fix -> online fixes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-23 09:35:29 +00:00
TheKodeToad
94067f34cf Try to make some of the suggested changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-23 09:34:26 +00:00
TheKodeToad
87bcefd08a Automatically add add-opens if Java version >= 9 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-15 15:28:24 +00:00
TheKodeToad
8a6776731a Use reflection to access DatatypeConverter 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-15 14:59:39 +00:00
TheKodeToad
bfa5fe1598 Better skin fix error handling 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-15 14:59:39 +00:00
TheKodeToad
ead59c0246 Improve the skin fix code 
- Spoof 404 instead of keeping original URL.
- Move JsonParseException to the package.
- Pass proxy as null to reduce code duplication.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-15 14:59:39 +00:00
TheKodeToad
cfeadf858e Add workaround to warning 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-15 14:59:39 +00:00
TheKodeToad
7534eaf006 Only use DatatypeConverter as a fallback 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-15 14:59:39 +00:00
TheKodeToad
8a81aaaa0a Add separate util class 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-15 14:59:39 +00:00
TheKodeToad
b544661e81 Experimental skin fix, inspired by craftycodie's 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-15 14:59:38 +00:00
Sefa Eyeoglu
30607c34a1 Merge pull request #291 from TheKodeToad/betterjavalauncher 2022-11-19 18:45:15 +01:00
TheKodeToad
70fa92f22c Remove dirty printStackTrace hacks 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-19 13:59:22 +00:00
TheKodeToad
669eef92eb Make requested changes and utilise AssertionError 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-19 08:54:17 +00:00
Sefa Eyeoglu
ee096edfff chore: bump tomlplusplus 
Should fix issues with builds on aarch64

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-15 20:58:07 +01:00
Sefa Eyeoglu
392452d422 Merge pull request #397 from flowln/windows_mod_updater_fixes_maybe 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/226
 2022-11-10 14:34:15 +01:00
TheKodeToad
32c2ad2bbd A lot more cleanup 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 17:51:18 +00:00
TheKodeToad
f2ca9a6b31 Revert switch to JUL for better colours 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 17:38:23 +00:00