Trial97
|
4a1d85f999
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
|
2023-08-17 14:23:37 +03:00 |
|
Trial97
|
9546c77113
|
Some warnings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 00:52:34 +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
|
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 |
|
Trial97
|
939a2d67ed
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop12
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-05 18:21:09 +03:00 |
|
Sefa Eyeoglu
|
1d638e018a
|
chore: update license headers
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-04 19:41:47 +02:00 |
|
Sefa Eyeoglu
|
1d468ac35a
|
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 18:35:35 +02: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
|
1e82cb6a7c
|
fix: add support for QByteArray inifile
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-26 23:56:01 +03: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
|
640aaa8c23
|
Merge pull request #1331 from TheKodeToad/hungry-trash
Fix updating trashing resources
|
2023-07-10 16:31:43 -04: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
|
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 |
|
Trial97
|
ce4a86fbcd
|
Made custom url function
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-25 10:41:29 +03:00 |
|
Trial97
|
158b07a39e
|
moved getRequiredBy
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-25 00:24:08 +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 |
|
leo78913
|
750209b8bb
|
fix: fix crash when hiding columns on resource packs page
Signed-off-by: leo78913 <leo3758@riseup.net>
|
2023-06-23 16:55:51 -03:00 |
|
Trial97
|
69c709b05a
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-23 20:01:17 +03:00 |
|
Rachel Powers
|
f1ebec641a
|
Merge pull request #1058 from Ryex/feature/images-for-resource-page
Feature: image coumn for Mod, Resource Pack, and Texturepack pages
|
2023-06-22 13:26:47 -07:00 |
|
Trial97
|
0d2105dec4
|
Made buttons on ModsFolderPage enabled all the time
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-21 21:34:40 +03:00 |
|
Rachel Powers
|
470518eb3a
|
fix: resize columns on hide ^& uniform heights
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-06-21 02:31:40 -07:00 |
|
Trial97
|
3e3be9ae6f
|
Added fallback for quilt if the API or Kotilin is not present
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-20 13:28:57 +03:00 |
|
Trial97
|
b62e4c0cc7
|
Fixed build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-19 21:32:19 +03:00 |
|
Trial97
|
f6f0fbbd9f
|
Fixed removeIf
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-19 21:23:48 +03:00 |
|
Trial97
|
c13a90540c
|
Added overide for Quilt/Fabric
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-19 21:20:35 +03:00 |
|
Trial97
|
6fd729e285
|
Fixed regresion regarding modrinth project_id in dependence array
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-19 17:42:16 +03:00 |
|
Trial97
|
8ad9692daa
|
Changed qWarning to qDebug for raw data
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-19 14:10:29 +03:00 |
|
Trial97
|
1bdde1f947
|
Small fixes
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-19 00:36:37 +03:00 |
|
Trial97
|
182e19eae3
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
|
2023-06-15 10:35:26 +03:00 |
|
PandaNinjas
|
318d11481d
|
Resolve other switch fallthrough issues
|
2023-06-07 19:37:54 -04:00 |
|
leo78913
|
a9302468e7
|
update resource and data pack pack_format_versions
Signed-off-by: leo78913 <leo3758@riseup.net>
|
2023-06-06 16:10:15 -03:00 |
|
Rachel Powers
|
cc41b039e6
|
chore: clean up after new compiler warnings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-06-04 14:59:48 -07:00 |
|
Rachel Powers
|
5fe9e30f39
|
fix: use instance settings, make image column user resizeable, fix memory leak
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-05-28 14:53:15 -07:00 |
|
Rachel Powers
|
4eb9083ddc
|
refactor: column names as class property, use string names in setting
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-05-28 13:00:08 -07:00 |
|
Rachel Powers
|
b28f682ad9
|
Merge branch 'develop' into feature/images-for-resource-page
|
2023-05-28 12:01:49 -07:00 |
|