ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity
9,192 Commits 4 Branches 5 Tags 40 MiB
b4b9051793
Commit Graph

59 Commits

Author SHA1 Message Date
Luna
b4b9051793 Merge in Changes from Prism 9.2 2025-01-11 13:58:12 -06:00
Trial97
b5bbe93775 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-17 00:20:40 +03:00
Trial97
ca5df3ea60
ensure minimal folder permissions when extracting files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-30 01:32:46 +03:00
Trial97
cfdf4a9e1f
Merge branch 'develop' of github.com:Trial97/PrismLauncher into feature/java-downloader 2024-06-14 22:50:20 +03:00
Alexandru Ionut Tripon
7d418a32e7
Merge pull request #2425 from Trial97/win_char 
improve invalid path name
 2024-06-10 12:11:21 +03:00
Trial97
ca369ac2b0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-09 19:52:37 +03:00
Trial97
b096ee6a0c
fix file permisions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-06 14:12:55 +03:00
Trial97
a7a1b28765
improve invalid path name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 13:49:23 +03:00
Trial97
7a5348a179
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-05-18 14:14:31 +03:00
Trial97
3a4f82ffd1
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-24 00:21:39 +03:00
timoreo
5bc415d512
Merge pull request #2225 from TheKodeToad/zip-utf8 2024-04-06 14:43:35 +02:00
TheKodeToad
8056a2fa46
Replace invalid characters when extracting ZIP 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-04-05 23:31:18 +01:00
Trial97
ab7fc2e46c
Fixed archive java download 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-21 00:42:04 +02:00
TheKodeToad
d72bd70c05
Use UTF-8 for ZIP creation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-03-19 20:34:55 +00:00
Trial97
1322277ae6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-03-17 20:57:53 +02:00
AtomHare
853e4a13ab
fix: Compressing typo 
Signed-off-by: AtomHare <29772841+AtomHare@users.noreply.github.com>
 2024-03-16 12:44:55 +01:00
Trial97
b4f3a969b3
Updated strings that are displayed to user 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-18 14:30:38 +02:00
Trial97
031a9f4738
Replaced QFile::remove with FS::deletePath 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-10 11:03:51 +02:00
Trial97
25bca28707
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-01-24 18:26:48 +02:00
Trial97
a0e7729aa6
Started workin on stuff 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-24 18:26:43 +02:00
Trial97
c2fc2d330b
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2023-11-23 12:57:31 +02:00
Trial97
cbb453a0ed
minimize the permisions for extracted files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-03 22:55:10 +02:00
LocalSpook
0de4d8902e Remove top-level const qualifiers in function declarations 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-28 22:12:09 -07:00
Trial97
9400879242
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-16 23:32:24 +03:00
Trial97
b8d9c3d779
format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-26 20:19:35 +03:00
Rachel Powers
5d68a4c992
fix: religate export zip to launcher app only 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

fix(MMCZip): include QUrl

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

fix(FileLink): drop FreeConsole

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

fix(filelink exe): add console sources

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 15:24:50 -07:00
Rachel Powers
7c1a465ec9
Merge branch 'develop' into feat/launcher-updater 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 14:19:31 -07:00
Trial97
43cc04433d
feat: refactored Instance ImportTask 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-19 11:58:27 +03:00
Trial97
b0940d696b
Added QFutureWatcher 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

abort

forgot

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-17 17:52:00 +03:00
Trial97
2ea4a78541
Upgraded ExportToZipTask 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-17 17:24:23 +03:00
Alexandru Ionut Tripon
4df9df03ab
Update launcher/MMCZip.cpp 
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-07-16 23:47:47 +03:00
Trial97
79222a56e3
use shared pointer 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

use shared pointer
 2023-07-16 21:14:39 +03:00
Trial97
cadb7142f0
Added progress bar to Prism instance export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-16 20:57:57 +03:00
Trial97
251055302e
format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-16 20:53:58 +03:00
Rachel Powers
10266f65e4
fix: include ^<optional^> updater doesn't need to know about mods 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 16:10:06 -07:00
Rachel Powers
2837236d81 fix: intelegent recursive links & symlink follow on export 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
c9105e525e fix: follow symlinks when exporting 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
flow
06de728aa7 fix: use toLocalFile() instead of path() 
QUrl::path() adds a '/' at the beginning of the path on Windows, causing
the world to explode every once in a while.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-03-05 08:24:56 -03:00
flow
fda9ca1e34
fix+refactor: fix fail to import modpacks and clean up a bit 
QDir::cleanPath called by FS::PathCombine removes the trailing '/'...

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-24 20:09:02 -03:00
Sefa Eyeoglu
e70a5a47ee
fix: ignore absolute paths when extracting 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-02-10 10:46:21 +01:00
Sefa Eyeoglu
6be7eed878
fix: don't extract files outside of target path 
This should fix a security issue regarding path traversal in zip files.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-02-10 09:17:48 +01:00
flow
a116778402
fix(Inst.Import): don't search inside 'overrides/' for the manifest 
It will never be there anyways, and saves a **bunch** of time when the
overrides folder is big and we traverse all the tree when searching for
the MMC 'instance.cfg' file.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-01 15:15:15 -03:00
flow
3225f514f6
refactor: move general info from Mod to Resource 
This allows us to create other resources that are not Mods, but can
still share a significant portion of code.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-20 10:41:59 -03:00
LennyMcLennington
94a63e3859
Merge pull request #941 from Scrumplex/bump-cxx-standard 
Bump to C++17
 2022-07-30 17:10:59 +01:00
flow
1157436a24
fix: sigsegv when trying to use jar mods 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-23 14:24:24 -03:00
Sefa Eyeoglu
c666c3e251
refactor!: bump to C++17 and C17 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-20 14:22:10 +02:00
flow
c4316e81e6
change: make Mod a QObject used as a pointer 
Prevents problems when copying it around!

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-17 11:33:44 -03:00
Sefa Eyeoglu
c363423718
refactor: fix deprecation up to Qt 6 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +02:00
flow
7f62de3854
fix: don't create unnecessary folders when extracting ZIPs 2022-06-19 22:03:02 -03:00
flow
fab4a7a602
refactor: abstract metadata handling and clarify names 2022-05-23 14:42:28 -03:00