Sefa Eyeoglu
|
215d7dbb74
|
chore: update license headers
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-14 18:17:05 +02:00 |
|
Sefa Eyeoglu
|
91ba4cf75e
|
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-14 18:16:53 +02:00 |
|
Sefa Eyeoglu
|
779f70057b
|
Merge commit 'ce2ca1381519a2e261d7f76dffa874d559d979c2' into staging
|
2023-08-14 18:16:13 +02:00 |
|
Sefa Eyeoglu
|
ea43d0f687
|
fix: fix more warnings
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-11 10:57:57 +02:00 |
|
Sefa Eyeoglu
|
ef6f9487f4
|
Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings
|
2023-08-10 20:38:32 +02:00 |
|
Sefa Eyeoglu
|
2090f958c8
|
Merge pull request #1324 from leia-uwu/ui-tweaks
|
2023-08-10 12:24:41 +02:00 |
|
Sefa Eyeoglu
|
304e294ea7
|
Merge pull request #1102 from Ryex/refactor/net-split-headers-to-proxy-class
|
2023-08-04 20:31:43 +02:00 |
|
Sefa Eyeoglu
|
c07a857359
|
fix: remove irregular enum initialization
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 18:35:07 +02:00 |
|
Sefa Eyeoglu
|
76df836378
|
fix: simplify switch statement
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 18:35:07 +02:00 |
|
Sefa Eyeoglu
|
ea56ff255d
|
Merge pull request #1339 from TheKodeToad/remove-direct-launch
|
2023-08-02 18:31:27 +02:00 |
|
Rachel Powers
|
e64e4d7ef7
|
Fix: always false comparison
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-08-01 18:57:35 -07:00 |
|
Rachel Powers
|
2d1197f59f
|
Merge branch 'develop' into refactor/net-split-headers-to-proxy-class
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-31 22:26:20 -07:00 |
|
Rachel Powers
|
b9fe37aec1
|
Merge branch 'develop' into chore/add-compiler-warnings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-30 15:33:46 -07:00 |
|
Sefa Eyeoglu
|
566425166b
|
Merge pull request #1449 from Trial97/tehnic
Reintroduce parsing of INI files
|
2023-07-30 09:47:40 +02:00 |
|
Trial97
|
1e82cb6a7c
|
fix: add support for QByteArray inifile
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-26 23:56:01 +03:00 |
|
seth
|
af59c41713
|
fix: typo in task.h
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-26 16:20:30 -04:00 |
|
TheKodeToad
|
f505d43fc0
|
Fix token "0" being replaced
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-24 13:43:26 +01:00 |
|
TheKodeToad
|
593f452986
|
Merge pull request #1399 from Scrumplex/offline-uuid
fix: generate predictable UUIDs for offline accounts
|
2023-07-19 10:16:27 +01:00 |
|
Sefa Eyeoglu
|
f8fcb98c68
|
fix: generate predictable UUIDs for offline accounts
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-07-18 10:07:35 +02:00 |
|
Josiah Glosson
|
1fbb41f5e2
|
Make Launch Offline not launch online in 1.6+
Signed-off-by: Josiah Glosson <soujournme@gmail.com>
|
2023-07-17 17:07:06 -05:00 |
|
Sefa Eyeoglu
|
2be630904f
|
fix: don't take modloaders by reference
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-07-17 14:33:01 +02:00 |
|
Sefa Eyeoglu
|
54a091ca59
|
fix: check if any modloader is installed
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-07-17 10:09:01 +02:00 |
|
Sefa Eyeoglu
|
aaf1726965
|
Merge pull request #1357 from getchoo/quilt-beacon
feat: add toggle for quilt beacon
|
2023-07-17 06:42:46 +02:00 |
|
seth
|
a2a09ffe01
|
chore: better explain quilt loader beacon
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-15 14:25:05 -04:00 |
|
seth
|
3099a70edc
|
Merge pull request #1335 from Ryex/fix/gh-1322-old-zip-mods-in-wrong-place
fix(flame install): don't assume .zip is a resource pack. default to mod
|
2023-07-14 00:16:43 -04:00 |
|
Rachel Powers
|
cde85947c7
|
Update launcher/minecraft/mod/tasks/LocalResourceParse.cpp
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-13 21:12:12 -07:00 |
|
Rachel Powers
|
520594e529
|
Merge branch 'develop' into chore/add-compiler-warnings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-13 20:05:16 -07:00 |
|
seth
|
89aaedc06c
|
feat: add toggle for quilt beacon
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-12 21:10:48 -04:00 |
|
seth
|
640aaa8c23
|
Merge pull request #1331 from TheKodeToad/hungry-trash
Fix updating trashing resources
|
2023-07-10 16:31:43 -04:00 |
|
TheKodeToad
|
9aedb5afff
|
Merge pull request #1334 from TheKodeToad/litemod-dl
LiteMod downloading
|
2023-07-10 16:42:38 +01:00 |
|
TheKodeToad
|
e21756ea8c
|
Remove direct launch
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-10 16:22:37 +01:00 |
|
TheKodeToad
|
d53d58a5d4
|
LiteMod downloading
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-08 22:16:43 +01:00 |
|
Rachel Powers
|
e704072892
|
fix(flame install): don't assume .zip is a resource pack. default to mod
let identifier move it if needed
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-08 13:38:00 -07:00 |
|
TheKodeToad
|
0c6362f28d
|
Make trash hungry
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-08 18:51:28 +01:00 |
|
Trial97
|
bc2940e16a
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-08 00:14:05 +03:00 |
|
Tayou
|
1131038fdb
|
Merge pull request #1120 from Trial97/visit_mod_page
|
2023-07-07 22:23:59 +02:00 |
|
leo78913
|
d1cceac7d1
|
disable hiding enable and name columns on folder models
Signed-off-by: leo78913 <leo3758@riseup.net>
|
2023-07-07 12:37:24 -03:00 |
|
PandaNinjas
|
4509fde410
|
Merge branch 'develop' into fix-implicit-fallthrough
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
|
2023-07-04 16:41:34 -04:00 |
|
Rachel Powers
|
8d7dcdfc5b
|
chore: fix shadowed member and signed/unsigned mismatch
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: supress unused with [[maybe_unused]]
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: unshadow ^&^& static_cast implicit return
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: deshadow and mark unused in parse task
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: mark unused in folder models
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: deshadow and mark unused with instances
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: more deshadow and unused
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: remove uneeded simicolons
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: mark unused
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: prevent shadow
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-01 23:39:38 -07:00 |
|
Rachel Powers
|
98d6904e4a
|
chore: fix propagate mispelling
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-01 17:03:12 -07:00 |
|
Rachel Powers
|
2a5d291bd9
|
fix: toml without exceptions usage
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-01 17:03:11 -07:00 |
|
Rachel Powers
|
671d3c1c80
|
Merge branch 'develop' into chore/add-compiler-warnings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-01 17:03:11 -07:00 |
|
Trial97
|
0f64ee6a5f
|
Added warnings for running instances
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-28 18:28:25 +03:00 |
|
Trial97
|
c23bf2fd22
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings
|
2023-06-28 17:46:01 +03:00 |
|
TheKodeToad
|
8bebd7f042
|
Generate special signature ✨ composed of multiple elements instead of relying on timestamp for Java version cache invalidation
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-06-26 01:30:47 +01:00 |
|
Rachel Powers
|
df4fd7df7f
|
Merge remote-tracking branch 'upstream/develop' into refactor/net-split-headers-to-proxy-class
|
2023-06-25 12:43:48 -07:00 |
|
Rachel Powers
|
9c10965997
|
refactor: split out setting api headers for downloads
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-06-25 11:09:25 -07:00 |
|
Trial97
|
ce4a86fbcd
|
Made custom url function
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-25 10:41:29 +03:00 |
|
Trial97
|
8b576fd2bd
|
Added translation
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-24 15:59:55 +03:00 |
|
Trial97
|
7fdd68d768
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
|
2023-06-24 15:58:55 +03:00 |
|