Commit Graph

338 Commits

Author SHA1 Message Date
Alexandru Ionut Tripon
8014283bf4
Merge pull request #2536 from Trial97/refactor_hash
Refactor hash task
2024-06-18 22:55:32 +03:00
Alexandru Ionut Tripon
5f3d3c3294
Merge pull request #2534 from DioEgizio/dataresourceupdate
fix: update datapack and resourcepack versions
2024-06-18 21:06:31 +03:00
DioEgizio
a63842c727 fix: add more datapack formats and clang-format it
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2024-06-18 18:05:34 +02:00
Trial97
766ddc80e3
refactored hassing task
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-18 16:51:26 +03:00
DioEgizio
c07e791d7f chore: clang-format ResourcePack.cpp
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2024-06-18 10:17:48 +02:00
DioEgizio
6af52c97c2 fix: update datapack and resourcepack versions
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2024-06-18 09:47:07 +02:00
Cart
c9827f8085
Spelling mistake
in m_column_names and translated it is Miecraft and not Minecraft

Signed-off-by: Cart <81428538+Cartrigger@users.noreply.github.com>
2024-06-17 23:12:07 -04:00
Trial97
f1d1c9e22c
forget sort keys
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-15 11:06:20 +03:00
Trial97
a121bfbb15
add size back to texture view
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-15 10:43:21 +03:00
Trial97
2ffabbdc6d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-10 10:00:52 +03:00
Trial97
29d32f0d9a
Update size order for folders
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-10 00:18:21 +03:00
Trial97
242ddbb7e1
fix size column sorting
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-09 23:53:40 +03:00
Trial97
34e1a5e660
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size 2024-06-09 22:18:40 +03:00
Trial97
6a99312df5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-06-09 19:57:16 +03:00
Alexandru Ionut Tripon
55b6490530
Merge pull request #1617 from cullvox/components-resource-pack-fix
added functionality for components in resource pack descriptions.
2024-06-09 16:03:19 +03:00
Trial97
5bd28e2cc8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-05-18 17:11:41 +03:00
Trial97
477d1408ad
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size 2024-05-18 16:53:14 +03:00
Trial97
ba947993c2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2024-05-18 12:47:01 +03:00
Alexandru Ionut Tripon
c8ff768d64
Merge pull request #1827 from Trial97/shader
fixed shader packs detection
2024-05-18 12:02:13 +03:00
TheKodeToad
d2568333ed
Merge pull request #2048 from erikLundstedt/develop
fix a minor spelling error in Mod.cpp
2024-04-29 18:22:22 +01:00
Trial97
e07e182e95
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-04-24 23:51:43 +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
TheKodeToad
252406ba3e
Support neoforge.mods.toml
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-04-19 21:19:36 +01:00
Trial97
a0eba1ace6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-03-31 21:15:49 +03:00
Trial97
f6572c1244
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader 2024-03-27 18:55:34 +02:00
Trial97
3c12e27226
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-03-23 23:53:25 +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
erik.lundstedt
30913fdb2b fix a minor spelling misstake in Mod.cpp
closes https://github.com/PrismLauncher/PrismLauncher/issues/2047

Signed-off-by: erik.lundstedt <erik@lundstedt.it>
2024-01-21 00:31:00 +01:00
Trial97
a7d293b3f2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into deps_improve
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-01-10 09:17:52 +02:00
Trial97
13d29ac6f4
Updated the size sort code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-12-22 23:35:48 +02:00
lumiscosity
8cbdecc454
Update GetModDependenciesTask.cpp
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
2023-12-16 12:52:59 +01:00
Trial97
763eab6b96
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2023-12-13 14:48:31 +02:00
Trial97
463ff4c6ae
Removed assert permanantly
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-27 11:30:07 +02:00
Trial97
20e0cb43b9
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent 2023-11-23 23:58:47 +02:00
Trial97
2db5677281
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2023-11-23 23:57:44 +02:00
Trial97
b47ec7f2dc
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size 2023-11-23 17:14:50 +02:00
Trial97
3234bb5a8c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into deps_improve 2023-11-23 17:05:37 +02:00
Trial97
2318a83881
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader 2023-11-23 16:33:57 +02:00
Sefa Eyeoglu
a2aa303770
Merge pull request #1843 from Trial97/fix_not_found_dep 2023-11-23 11:02:16 +01:00
Sefa Eyeoglu
a966289944
Merge pull request #1852 from Trial97/war_ning 2023-11-23 11:01:53 +01:00
Trial97
f18f7147b5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into war_ning 2023-11-23 10:44:49 +02:00
Sefa Eyeoglu
b42434bcb6
Merge remote-tracking branch 'upstream/develop' into const-in-declarations 2023-11-23 09:06:23 +01:00
Trial97
85b4e1f24f
Made column hidden by default
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-22 19:23:24 +02:00
Trial97
26931475ae
made folder size reflect the number of elements
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-19 15:58:30 +02:00
Trial97
6b777653a5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-17 22:38:17 +02:00
Trial97
2bfb5fc138
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-17 22:26:17 +02:00
Trial97
215465e833
added subdirectories to iteration
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-15 14:11:34 +02:00
Trial97
4d93f4adb1
Fixed folder size
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-15 12:10:47 +02:00
Trial97
890965746f
Added warning on mods update while running
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-15 11:07:46 +02:00
Trial97
361329d5d1
Made resource columns resizable
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-14 23:21:53 +02:00