aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft
AgeCommit message (Collapse)Author
2023-06-20Remove inconsistent/unneeded question marks in UIAlfio
Signed-off-by: P2 <tomarchioalfio5@gmail.com>
2023-06-15fix: add JavaVendor as an instance overrideSefa Eyeoglu
This should suppress a critical error that gets printed every time an instance gets launched, as JavaCheck wants to store the vendor in the instance settings. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-06-07Merge pull request #1111 from Trial97/requiresTayou
2023-06-06update resource and data pack pack_format_versionsleo78913
Signed-off-by: leo78913 <leo3758@riseup.net>
2023-06-06Renamed requires fieldsTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-05-28fix(memory leak): don't give shared pointers out to foldermodels (causes ↵Rachel Powers
cyclic refrence) Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-12Merge branch 'develop' into fix/network_and_signalsRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-07Merge remote-tracking branch 'upstream/develop' into better-tasksRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-02Merge pull request #833 from Ryex/advanced_copy_instanceSefa Eyeoglu
2023-05-01feat: add `details` signal to `Task`Rachel Powers
feat: add details to mod pack downloading feat: add logging rule sloading form `ligging.ini at data path root feat: add `launcher.task` `launcher.task.net` and `launcher.task.net.[down|up]load` logging categories fix: add new subtask progress to the end of the lay out not the beginning (cuts down on flickering) Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-01feat: Propogated subtask progressRachel Powers
Oh boy this is big. > TaskStepProgress struct is now QMetaObject compatabile and can be sent through signals > Task now has a method to propogates sub task progress it must be signal bound by each task containing a task wishing to report progress of it's children. > Downloads report speed > Tasks now have UUIDS to track them - use when reporting - use when logging - use when storeing them or objects related to them Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-01fix: set `x-xbl-contract-version` header during xbox auth stepRachel Powers
Refrencing GDlauncher and ATLauncher code for auth as well as https://learn.microsoft.com/en-us/gaming/gdk/_content/gc/reference/live/rest/additional/httpstandardheaders it is possible some of microsoft's server's are rejecting our request because of this missing header? Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-04-29refactor: pass instance ptr to resource models. use it to find instance root.Rachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-04-29refactor: Move ini to use QSettings && drop get/setList functionsRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-04-26Fixed typoJapa
Signed-off-by: Japa <japa4551@protonmail.com>
2023-04-21Update launcher/minecraft/MinecraftInstance.cppJapa
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: Japa <japa4551@protonmail.com>
2023-04-21Update launcher/minecraft/MinecraftInstance.cppJapa
Co-authored-by: Rachel Powers <508861+Ryex@users.noreply.github.com> Signed-off-by: Japa <japa4551@protonmail.com>
2023-04-21Instance Description displays the last launch dateJapa
Initial Draft using the Standard C++ Library, still requires testing. Signed-off-by: Japa <japa4551@protonmail.com>
2023-04-17Fix: signal/slot macro -> func pointer & network fixesRachel Powers
- convert qt connect calls to use function pointers instead of the signal/slot macros wherever practical (UI classes were mostly left alone, target was tasks and processes) - give signals an explicit receivers to use the static method over the instance method wherever practical - ensure networks tasks are using the `errorOccured` signal added in Qt5.15 over the deprecated `error` signal - ensure all networks tasks have an sslErrors signal connected - add seemingly missing `MinecraftAccount::authSucceeded` connection for `MSAInteractive` login flow Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-03-20cleanup: code review sugestionsRachel Powers
clean up translation strings Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-03-20fix: typosRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-03-20feat: warnings when instance resources are linkedRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-03-05Merge pull request #853 from kumquat-ir/nilSefa Eyeoglu
NilLoader mod metadata support
2023-03-01fix: use makeShared for importing componentsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-03-01Merge pull request #735 from Scrumplex/import-componentSefa Eyeoglu
2023-02-22review fixeskumquat-ir
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-19fix metadata for mods with `.nilmod` extensionkumquat-ir
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-16minor cleanupkumquat-ir
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-13do not create nilmods folderkumquat-ir
"it cant be that easy" - me, clueless Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-12switch to qdcss for parsingkumquat-ir
make it not horrible to look at Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-11nilmods instance pagekumquat-ir
mostly copied from the coremod page impl Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-11parse nil metadatakumquat-ir
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-04ensure command env vars use native path seperatorsRachel Powers
fix #824 Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-02-03fix: fix component uid regexSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-02-02fix: give error when components have bad uidsflow
This allows other code to reject proceeding when the UID is bad, which is generally a good idea. :p Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: flow <flowlnlnln@gmail.com>
2023-01-25refactor: make shared_qobject_ptr ctor explicitflow
This turns issues like creating two shared ptrs from a single raw ptr from popping up at runtime, instead making them a compile error. Signed-off-by: flow <flowlnlnln@gmail.com>
2023-01-25refactor: add error handling to component importSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-01-25Merge pull request #784 from flowln/fix_resource_folder_double_smart_ptrsSefa Eyeoglu
2023-01-24fix(ResourceFolder): don't create two smart ptrs for the same raw ptrflow
Signed-off-by: flow <flowlnlnln@gmail.com>
2023-01-24Merge branch 'develop' into remove-updaterSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-01-23Merge pull request #675 from flowln/generalize_mod_modelSefa Eyeoglu
2023-01-16Merge pull request #696 from Ryex/import-all-the-thingsSefa Eyeoglu
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/581 Fixes https://github.com/PrismLauncher/PrismLauncher/issues/700
2023-01-14chore: update license headersSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-01-14Merge pull request #743 from flowln/fix_mods_with_wrong_modListVersionflow
2023-01-13fix: don't fail mod parsing when encountering invalid modListVersionflow
The spec (admitely a very old one) states that this entry should always have the value "2". However, some mods do not follow this convention, causing issues. One notable example is the 1.6 version of Aether II for 1.7.10, that has this value set at "5" for whatever reason. Signed-off-by: flow <flowlnlnln@gmail.com>
2023-01-13refactor: generalize mod models and APIs to resourcesflow
Firstly, this abstract away behavior in the mod download models that can also be applied to other types of resources into a superclass, allowing other resource types to be implemented without so much code duplication. For that, this also generalizes the APIs used (currently, ModrinthAPI and FlameAPI) to be able to make requests to other types of resources. It also does a general cleanup of both of those. In particular, this makes use of std::optional instead of invalid values for errors and, well, optional values :p This is a squash of some commits that were becoming too interlaced together to be cleanly separated. Signed-off-by: flow <flowlnlnln@gmail.com>
2023-01-12Merge branch 'PrismLauncher:develop' into instance-accountsAaron Sonin
2023-01-11feat: add button to import component JSONsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-01-09chore: cleanup review suggestionsRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-01-07feat: Import all the things!Rachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
generated by cgit (git 2.46.0) at 2025-02-03 22:56:09 +0000