CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,469 Commits 10 Branches 30 Tags
5b54475d3e6c101f2bdd645350f3c81ad4fc12a3
Commit Graph

6469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
seth
5b54475d3e Merge pull request #1385 from orowith2os/flatpak-updates 
Update Flatpak manifest
 2023-07-18 20:12:39 +00:00
Dallas Strouse
2eff1de560 Update Flatpak manifest 
Signed-off-by: Dallas Strouse <dastrouses@gmail.com>
 2023-07-17 22:38:12 -05:00
TheKodeToad
01afa8957f Merge pull request #1387 from Scrumplex/fix-quilt-beacon 
Check if any modloader is installed
 2023-07-17 17:40:42 +01: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
Tayou
e8c44e700d Merge pull request #1286 from TayouVR/better-instance-group-separator 2023-07-17 11:55:31 +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
6b970954d6 Merge pull request #1381 from getchoo/backporting-docs 
chore(docs): add backporting info to CONTRIBUTING.md
 2023-07-16 18:36:51 -04:00
seth
ed2f680202 chore(docs): add backporting info to CONTRIBUTING.md 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-16 17:28:52 -04:00
seth
5e0df9b696 Merge pull request #1276 from Scrumplex/print-build-platform 
Print build platform on launch
 2023-07-16 17:15:55 -04:00
Sefa Eyeoglu
b54d1651ab Merge pull request #1373 from Scrumplex/backport-bot 2023-07-16 19:42:09 +02:00
Sefa Eyeoglu
b9568279dc Merge pull request #1010 from TayouVR/add_default_editorconfig 2023-07-16 12:30:22 +02:00
Sefa Eyeoglu
fcdd9ea986 Merge pull request #1246 from Trial97/export 2023-07-16 12:24:42 +02:00
Sefa Eyeoglu
c145bfa524 Merge pull request #1369 from Trial97/autoselect 2023-07-16 12:21:17 +02:00
Sefa Eyeoglu
18ebc858fd feat(actions): add backport action 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-07-16 11:47:54 +02:00
Tayou
a6305ac891 Merge pull request #1368 from Trial97/crash_curse_import 2023-07-15 23:13:00 +02:00
Trial97
06fc8358d9 auto focus search line on resource download 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-15 23:57:32 +03:00
Trial97
c346d875a2 make FileResolvingTask accept empty modlist 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-15 23:26:52 +03:00
seth
a2a09ffe01 chore: better explain quilt loader beacon 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-15 14:25:05 -04:00
Alexandru Ionut Tripon
da87e825a1 Update launcher/ui/dialogs/ExportToModListDialog.ui 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-07-15 15:59:19 +03:00
Trial97
ab10524cd7 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:45:40 +03:00
Trial97
1ccfba13eb renames 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:41:51 +03:00
Trial97
b9ed8283b7 Added buttons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:41:45 +03:00
Trial97
1495bfb73e Made custom template enabled all time 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:41:37 +03:00
Trial97
9b02c31f8d escaped text for html export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:35:18 +03:00
Trial97
50dae9d4f3 Moved to separate functions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:34:28 +03:00
Trial97
9a3931dac6 Added json and csv format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:34:21 +03:00
Trial97
515197fba2 fix: html sintax for modlist export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:34:03 +03:00
Rachel Powers
37fb52aada Merge pull request #1351 from Trial97/ftb_import 
fixed substatus on ftb_import
 2023-07-14 12:41:21 -07:00
seth
094af0f78f Merge pull request #1336 from Ryex/packaging/fix-duplicate-share-directories 
packaging: fix duplicate share directories (use only lowercase)
 2023-07-14 14:19:44 -04:00
Rachel Powers
3487e1cb64 Update launcher/Application.cpp 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-14 03:56:18 -07:00
Trial97
c8533c0b0d fixed substatus on ftb_import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 12:29:03 +03:00
Trial97
b0a018d823 format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 12:28:23 +03:00
Sefa Eyeoglu
3becd4386b Merge pull request #1306 from Ryex/ci/address-sanitiser_on_debug_builds 2023-07-14 10:11:34 +02: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
5d10045cc8 Merge pull request #1352 from Trial97/crash_after_abort 
Do not reset shared pointer if it's already empty
 2023-07-13 21:11:47 -07:00
Rachel Powers
95b300f1ea packaging: use PascalCase folder name instead 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-13 19:56:36 -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
Tayou
94d4d12ee0 Merge pull request #1345 from Trial97/time2 
feat:Added option to use system locale
 2023-07-13 01:56:12 +02:00
Trial97
76cc8ce043 renamed setting 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-12 21:05:13 +03:00
Rachel Powers
9499066375 Merge pull request #1350 from Trial97/fix_managed_pack_crash 
fixed crash if no version is loaded on managed page
 2023-07-12 09:55:31 -07:00
Trial97
25f7cf23d3 the other place 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-12 19:55:11 +03:00
Trial97
9ee68b9268 small pointer check 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-12 18:12:31 +03:00
Sefa Eyeoglu
06a7d447f6 Merge pull request #1333 from Ryex/fix/null_instance_edit_crash 2023-07-12 15:53:46 +02:00
Trial97
766e833a73 fixed crash if no version is loaded 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-12 16:25:05 +03:00
Trial97
634612ae81 added missing header 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-11 18:20:44 +03:00
Trial97
f0d2aab784 feat:Added option to use system locale 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-11 18:05:43 +03:00
seth
640aaa8c23 Merge pull request #1331 from TheKodeToad/hungry-trash 
Fix updating trashing resources
 2023-07-10 16:31:43 -04:00
Rachel Powers
1aa5fa03f9 Update launcher/ui/MainWindow.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-10 12:05:01 -07:00