Trial97
|
907c2fd19c
|
added missing header
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-18 09:16:17 +03:00 |
|
Trial97
|
42b06674bb
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-17 15:29:11 +03:00 |
|
Trial97
|
5e2d1ffdfb
|
removed line
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-17 00:23:53 +03:00 |
|
Trial97
|
38d92bbcf1
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 12:59:25 +03:00 |
|
Trial97
|
c94ee67077
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curseforge-url-handle3
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 12:16:00 +03:00 |
|
Sefa Eyeoglu
|
1939e3e6ed
|
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-15 09:02:15 +02:00 |
|
Trial97
|
9546c77113
|
Some warnings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 00:52:34 +03:00 |
|
Trial97
|
0ba88ff138
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into staging
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 00:33:24 +03:00 |
|
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
|
35358f8180
|
Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings
|
2023-08-12 11:17:11 +02:00 |
|
Sefa Eyeoglu
|
6423edaa76
|
Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle
|
2023-08-12 10:58:27 +02:00 |
|
Sefa Eyeoglu
|
396f812496
|
Merge pull request #1230 from TheKodeToad/better-component-installation
Revamp loader installation UI
|
2023-08-11 08:24:14 +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
|
74fe2fb2a6
|
Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle
|
2023-08-06 21:54:00 +02:00 |
|
Sefa Eyeoglu
|
a83e5be8f2
|
fix: makeShared for QByteArray
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-06 21:51:03 +02:00 |
|
Trial97
|
57692d6ce6
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-05 19:13:08 +03:00 |
|
Trial97
|
91eb30f037
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into pack_changelog
|
2023-08-05 19:04:53 +03:00 |
|
Trial97
|
377fc0352a
|
Merge branch 'staging' of https://github.com/PrismLauncher/PrismLauncher into icons
|
2023-08-05 19:00:12 +03: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
|
1d638e018a
|
chore: update license headers
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-04 19:41:47 +02:00 |
|
TheKodeToad
|
afaf6f894c
|
Merge branch 'PrismLauncher:develop' into better-component-installation
|
2023-08-02 20:27:37 +01:00 |
|
Sefa Eyeoglu
|
1d468ac35a
|
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 18:35:35 +02:00 |
|
Sefa Eyeoglu
|
01d3eea379
|
Merge pull request #1359 from Trial97/import
|
2023-08-02 18:25:51 +02:00 |
|
Alexandru Ionut Tripon
|
f13eccb03d
|
Update launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-08-02 19:24:58 +03: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 |
|
Trial97
|
97ff7afbe7
|
keep the icon suffix
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-28 08:37:45 +03:00 |
|
Trial97
|
6768501db1
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-27 00:09:18 +03:00 |
|
tjw123hh
|
280f041acb
|
Delete some incorrect notr="true" tags
Signed-off-by: tjw123hh <tjw123hh@outlook.com>
|
2023-07-25 17:35:31 +08:00 |
|
tjw123hh
|
6a01c277e8
|
Delete some incorrect tags
|
2023-07-24 20:41:22 +08:00 |
|
TheKodeToad
|
0be4db30eb
|
Merge branch 'PrismLauncher:develop' into better-component-installation
|
2023-07-21 11:02:57 +01:00 |
|
Trial97
|
43cc04433d
|
feat: refactored Instance ImportTask
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-19 11:58:27 +03:00 |
|
Trial97
|
015f88bf83
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-18 23:46:19 +03:00 |
|
Tayou
|
e8c44e700d
|
Merge pull request #1286 from TayouVR/better-instance-group-separator
|
2023-07-17 11:55:31 +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
|
5e0df9b696
|
Merge pull request #1276 from Scrumplex/print-build-platform
Print build platform on launch
|
2023-07-16 17:15:55 -04:00 |
|
Trial97
|
a3ffa64550
|
Upgraded pack changelog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-16 01:59:08 +03: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 |
|
seth
|
a2a09ffe01
|
chore: better explain quilt loader beacon
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-15 14:25:05 -04:00 |
|
Trial97
|
7befd63cce
|
fixed settings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-15 00:28:58 +03: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 |
|
Trial97
|
843c2d67eb
|
Added FTBAPP Import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-13 18:41:29 +03:00 |
|
seth
|
89aaedc06c
|
feat: add toggle for quilt beacon
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-12 21:10:48 -04: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 |
|
Rachel Powers
|
149bc8e9ce
|
cleanup: pull out data object so I'm not repeating myself
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-11 21:42:34 -07:00 |
|
Rachel Powers
|
9957aeb003
|
Merge branch 'develop' into curseforge-url-handle
|
2023-07-11 21:42:29 -07:00 |
|
TheKodeToad
|
4c69290381
|
Merge branch 'develop' into better-component-installation
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-11 11:14:06 +01:00 |
|
TheKodeToad
|
91c9082d19
|
Merge pull request #1249 from Trial97/curse
Curseforge modpack export
|
2023-07-10 14:20:29 +01:00 |
|