Alexandru Ionut Tripon
b69dbc2224
MSAStep: Log server errors ( #4895 )
2026-01-29 14:51:18 +02:00
Octol1ttle
665aa4c546
change(MSAStep): log server errors
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-29 17:11:30 +05:00
Alexandru Ionut Tripon
70cbbf5b07
Trim whitespace from path values in settings ( #4886 )
2026-01-28 08:48:53 +02:00
Seth Flynn
301d978d9c
chore(nix): update lockfile ( #4600 )
2026-01-27 18:39:53 -05:00
Seth Flynn
cf63bccfd7
fix(MinecraftSettingsWidget): trim whitespace from path values
...
Should help in mitigating common mistakes in copy/pasting
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2026-01-27 17:59:12 -05:00
Alexandru Ionut Tripon
ec709e339b
fix: remove flatpak submodule ( #4878 )
2026-01-27 18:32:11 +02:00
Octol1ttle
5de150b8dd
fix: remove flatpak submodule
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-27 20:35:53 +05:00
Alexandru Ionut Tripon
915626de9d
Allow overriding URL for downloading legacy FML libs ( #4862 )
2026-01-27 16:48:01 +02:00
Octol1ttle
caec4ef96c
feat: allow overriding URL for downloading legacy FML libs
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-27 19:26:02 +05:00
Octol1ttle
f0a17d82d9
refactor: FMLLibrariesTask -> LegacyFMLLibrariesTask
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-27 19:24:13 +05:00
Alexandru Ionut Tripon
7945a7c626
Make Minecraft resource URL override consistent with other overrides ( #4860 )
2026-01-27 14:04:24 +02:00
Alexandru Ionut Tripon
e4a4d42bca
Remove in-tree flatpak ( #4856 )
2026-01-27 14:01:53 +02:00
Alexandru Ionut Tripon
4f3c778b4d
PackProfile: don't reset dirty if component list saving failed ( #4870 )
2026-01-27 13:57:54 +02:00
Alexandru Ionut Tripon
9e4dc64fa9
properly redraw viewport when scroll happens ( #4857 )
2026-01-27 13:56:01 +02:00
Octol1ttle
c6072ff434
fix(PackProfile): don't reset dirty if component list saving failed
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-26 21:53:51 +05:00
Alexandru Ionut Tripon
9776fb8d68
Actions: Use low-cost runner for simple workflows ( #4863 )
2026-01-25 19:24:54 +02:00
Octol1ttle
70f9b88e45
change(Actions): use low-cost runner for simple workflows
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-25 21:09:36 +05:00
Octol1ttle
1cdddd93ad
style: don't use keyword as variable name
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-25 17:05:43 +05:00
Octol1ttle
3f0af19ed3
refactor: make Minecraft resource URL override consistent with other overrides
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-25 16:45:52 +05:00
Alexandru Ionut Tripon
33deb1da3f
MinecraftSettingsWidget: Swap window width/height spinboxes ( #4853 )
2026-01-25 10:28:23 +02:00
Alexandru Ionut Tripon
1184a28a05
MSAStep: Tighten isSchemeHandlerRegistered check ( #4841 )
2026-01-25 10:28:13 +02:00
Trial97
7baaa05683
properly redraw viewport when scroll happens
...
fixes #1504
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2026-01-25 10:23:10 +02:00
Seth Flynn
3833b1e292
build(flatpak): remove
...
See https://github.com/PrismLauncher/flatpak
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2026-01-25 00:44:28 -05:00
github-actions[bot]
6348eafbda
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'https://releases.nixos.org/nixos/25.11/nixos-25.11.2222.b3aad468604d/nixexprs.tar.xz?lastModified=1766201043&narHash=sha256-v9nbQe0BgwBx%2BKcxRf6i2kbS8EwKjBFRjAawA91B/OE%3D&rev=b3aad468604d3e488d627c0b43984eb60e75e782 ' (2025-12-20)
→ 'https://releases.nixos.org/nixos/25.11/nixos-25.11.4506.078d69f03934/nixexprs.tar.xz?narHash=sha256-Xu%2B7iYcAuOvsI2wdkUcIEmkqEJbvvE6n7qR9QNjJyP4%3D ' (2026-01-22)
2026-01-25 00:33:45 +00:00
Octol1ttle
dd220e61be
"British roots ending with '-our' usually have '-or' in American English" thanks clion
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-24 17:13:48 +05:00
Octol1ttle
b4f892cf42
fix(MinecraftSettingsWidget): swap width and height spinboxes to be in their expected positions
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-24 17:13:15 +05:00
Alexandru Ionut Tripon
60a3745e50
Print custom environment variables during instance launch ( #4832 )
2026-01-22 22:49:33 +02:00
Alexandru Ionut Tripon
1a135af7de
refactor: replace std::list with std::vector ( #4833 )
2026-01-22 22:48:52 +02:00
Alexandru Ionut Tripon
79b76726db
chore(config): migrate Renovate config ( #4827 )
2026-01-22 22:47:10 +02:00
Alexandru Ionut Tripon
2554c37964
Add asserts to invalid Task states ( #4835 )
2026-01-22 22:40:43 +02:00
Alexandru Ionut Tripon
8abaea382d
Add missing returns after task signal activation ( #4836 )
2026-01-22 22:39:43 +02:00
Alexandru Ionut Tripon
2c59b3342c
ModrinthCheckUpdate: Don't send a request that is doomed to fail ( #4840 )
2026-01-22 22:39:20 +02:00
Octol1ttle
87b3a2ef99
fix(MSAStep): tighten isSchemeHandlerRegistered check
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-23 01:00:01 +05:00
Octol1ttle
fa040fc959
rename Assert.h because it causes conflicts???
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-23 00:34:34 +05:00
Octol1ttle
29afecdbde
ModrinthCheckUpdate: don't send a request that is doomed to fail
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-22 22:34:44 +05:00
Octol1ttle
6cb07e203b
fix(ResourceFolderModel): don't read state from off-thread task
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-22 22:10:13 +05:00
Octol1ttle
1cd78bf94a
code review
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-21 19:15:12 +05:00
Octol1ttle
e27246c3f9
fix: add missing returns after emitSucceeded
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-21 18:30:31 +05:00
Octol1ttle
507de0fcbd
fix: add missing returns after emitFailed/Aborted
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-21 18:30:31 +05:00
Octol1ttle
490df18fd5
Introduce macro to assert and return the assertion condition
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-21 18:02:38 +05:00
Octol1ttle
9ac0314d7a
Add asserts to invalid Task states
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-21 17:10:14 +05:00
Octol1ttle
06d9079be1
fix: don't manually check for instance overrides
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-21 16:11:25 +05:00
Alexandru Ionut Tripon
b276ede6e5
initilize world size ( #4784 )
2026-01-21 12:45:05 +02:00
Octol1ttle
19b9557c19
refactor: replace std::list with std::vector
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-21 12:19:55 +05:00
Octol1ttle
ca5e1e0f1b
feat: print custom environment variables in log
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-21 11:46:59 +05:00
Octol1ttle
2842defe7f
refactor: use variables for string literals
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-21 11:46:31 +05:00
renovate[bot]
de4d8429be
chore(config): migrate config renovate.json
2026-01-20 17:46:23 +00:00
Alexandru Ionut Tripon
ef747055af
Do not delete LaunchController before we're done using it ( #4822 )
2026-01-20 16:24:57 +02:00
Octol1ttle
4b72870d49
refactor+fix: do not delete LaunchController before we're done using it, unify code for handling LaunchController finishing
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-20 15:57:52 +05:00
Alexandru Ionut Tripon
f60535dd68
Reformat with editorconfig, add clang-format target ( #4556 )
2026-01-18 22:57:05 +02:00
Seth Flynn
14df798d78
chore(deps): update azure/trusted-signing-action action to v1 ( #4775 )
2026-01-18 15:54:55 -05:00
Seth Flynn
70a6d11059
chore(deps): update actions/cache action to v5.0.2 ( #4789 )
2026-01-18 15:54:16 -05:00
Seth Flynn
5fcd11bec3
hack: resolve dependencies for imageformats on mingw ( #4739 )
2026-01-18 15:53:55 -05:00
Seth Flynn
fd91f87c21
style: re-format tree with editorconfig
...
```
find $PWD \
-type f \
! -path '*/.git/*' ! -path '*/flatpak/shared-modules/*' \
! -path '*/libraries/*' ! -path '*/testdata/*' ! -name '*.patch' \
! -name '*.svg' ! -name '*.scd' ! -path '*/program_info/LICENSE' \
! -path '*/COPYING.md' ! -path '*/cmake/*' ! -name '.gitmodules' \
-exec eclint -fix {} \;
```
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2026-01-18 15:48:07 -05:00
Seth Flynn
686ad72e03
build: add clang-format target
...
Through the power of CMake itself, we can format our files
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2026-01-18 15:48:01 -05:00
Tayou
1c4d378fc4
fix: improve we couldn't launch after 3 tries message ( #4805 )
2026-01-18 20:25:34 +01:00
Alexandru Ionut Tripon
e8b5d49154
Take $GRADLE_USER_HOME into account when looking for JDKs ( #4790 )
2026-01-18 01:17:46 +02:00
DioEgizio
d5da7c9bde
fix: improve we couldn't launch after 3 tries message
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2026-01-17 22:05:57 +01:00
DioEgizio
a98ec194be
hack: resolve dependencies for imageformats on mingw
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2026-01-17 20:45:33 +01:00
Trial97
09f548f688
initilize world size
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2026-01-17 17:34:47 +02:00
Alexandru Ionut Tripon
2e8256e322
fix ftb import for old packs ( #4787 )
2026-01-17 17:03:59 +02:00
Sefa Eyeoglu
ff34760868
fix build ( #4795 )
2026-01-17 15:41:57 +01:00
Trial97
d05b996c8a
fix build
...
also fixed some warninigs of unused vars and formated the code again
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2026-01-17 02:28:56 +02:00
Alexandru Ionut Tripon
78bc6657f4
Allow moving accounts in list ( #4647 )
2026-01-17 02:08:19 +02:00
Alexandru Ionut Tripon
edf1840225
Add icons in settings account list ( #4684 )
2026-01-17 02:08:02 +02:00
Trial97
3496b7b3a0
fix ftb import for old packs
...
fixes #4786
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2026-01-17 01:22:25 +02:00
TheKodeToad
6848d60cad
refactor!!!: migrate from shared pointers ( #4673 )
2026-01-16 20:32:17 +00:00
SandaruKasa
267e8f1d33
Take $GRADLE_USER_HOME into account when looking for JDKs
...
Signed-off-by: SandaruKasa <sandarukasa@ya.ru >
2026-01-16 21:16:14 +03:00
renovate[bot]
70de524c3a
chore(deps): update actions/cache action to v5.0.2
2026-01-16 17:59:15 +00:00
renovate[bot]
3ce765fba0
chore(deps): update azure/trusted-signing-action action to v1
2026-01-15 02:07:09 +00:00
Alexandru Ionut Tripon
5f89187719
Fix instance and settings window minimum size ( #4769 )
2026-01-14 23:24:12 +02:00
Alexandru Ionut Tripon
07100658a8
Allow opting out of pre-compiled headers ( #4768 )
2026-01-14 23:21:26 +02:00
TheKodeToad
d283726494
Fix new instance window being too large
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2026-01-14 17:07:58 +00:00
TheKodeToad
40c6f79b5f
Fix settings window being too large
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2026-01-14 17:07:58 +00:00
TheKodeToad
90e3c59bd8
Fix JavaWizardWidget compilation without PCH
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2026-01-14 16:20:32 +00:00
TheKodeToad
3a16cf3081
Allow toggling pre-compiled headers
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2026-01-14 16:20:26 +00:00
Alexandru Ionut Tripon
9ced66e990
Fix for Prism failing to recognize some shader pack ZIP archives added manually by the user ( #4745 )
2026-01-14 13:51:47 +02:00
Alexandru Ionut Tripon
2f1ab0162b
IconList: Make sure we always set new path ( #4753 )
2026-01-14 13:50:46 +02:00
Alexandru Ionut Tripon
5a9382d29b
chore: make appimage use portals for file picking ( #4759 )
2026-01-14 13:50:29 +02:00
Alexandru Ionut Tripon
35e64ae2c6
accept libarchive warning result ( #4761 )
2026-01-14 13:50:01 +02:00
Trial97
a6d6ff9926
accept libarchive warning result
...
this is the intended behavior to treat warnings as ok, because
teoretically the file was extracted, even if the time of the file can't
be set
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2026-01-14 00:17:17 +02:00
DioEgizio
1b15643fcd
chore: make appimage use portals for file picking
...
much better than Qt's ugly default one
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2026-01-13 15:35:58 +01:00
Seth Flynn
c2fc0a30b7
Free up disk space on Flatpak builds so they don't crash ( #4755 )
2026-01-13 01:14:57 -05:00
Octol1ttle
eafce5d5f6
hack: try to free up disk space on Flatpak builds so they don't crash
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-12 23:30:14 +05:00
Alexandru Ionut Tripon
92a2e3b894
auth: improve status messages ( #4750 )
2026-01-12 20:11:52 +02:00
Octol1ttle
6cbedbe184
fix(IconList): make sure we always set new path
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-12 23:00:45 +05:00
SwitchAxe
809e766aec
Fixed formatting
...
Signed-off-by: SwitchAxe <sofiacerasuoli@gmail.com >
2026-01-12 16:44:01 +01:00
SwitchAxe
7f0f90fcce
Improved the check for the assets dir
...
Signed-off-by: SwitchAxe <sofiacerasuoli@gmail.com >
2026-01-12 14:43:54 +01:00
Octol1ttle
6cddc28e9b
auth: improve status messages
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-12 16:48:46 +05:00
SwitchAxe
8aba994312
Made the loop more efficient
...
Signed-off-by: SwitchAxe <sofiacerasuoli@gmail.com >
2026-01-12 03:36:52 +01:00
Sofia
6321db5942
Update launcher/minecraft/mod/tasks/LocalShaderPackParseTask.cpp
...
Co-authored-by: Octol1ttle <l1ttleofficial@outlook.com >
Signed-off-by: Sofia <75943257+SwitchAxe@users.noreply.github.com >
2026-01-12 03:25:43 +01:00
SwitchAxe
6ac9de7a11
Fixed Indentation
...
Signed-off-by: SwitchAxe <sofiacerasuoli@gmail.com >
2026-01-12 02:35:36 +01:00
SwitchAxe
9a93696915
Added support for shader packs with a top-level parent directory
...
Signed-off-by: SwitchAxe <sofiacerasuoli@gmail.com >
2026-01-12 02:13:56 +01:00
Alexandru Ionut Tripon
5a6f94fe79
Update copyright year ( #4740 )
2026-01-12 00:22:13 +02:00
Alexandru Ionut Tripon
b7e508870d
Set current auth step description in correct method ( #4733 )
2026-01-12 00:22:01 +02:00
Alexandru Ionut Tripon
73dc92cedd
Fix auto-join getting stuck disabled ( #4711 )
2026-01-12 00:21:51 +02:00
Trial97
508a66aedd
Update copyright year
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2026-01-12 00:00:56 +02:00
Octol1ttle
01c1840531
refactor(InstanceList): use vector<unique_ptr> to store instances
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-11 21:00:04 +05:00
Octol1ttle
c24fd2f570
refactor(instance creation): use RAII lock to suspend instance settings saving
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-11 21:00:04 +05:00
Octol1ttle
3937819305
CapeChange: use dummy sink
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-11 21:00:04 +05:00
Octol1ttle
549405ab2f
refactor!!!: migrate from shared pointers
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-11 21:00:03 +05:00
Octol1ttle
f0813b578e
fix(AuthFlow): set current step description in correct method
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-11 20:05:00 +05:00
Alexandru Ionut Tripon
c64d871a28
Network: log server response on error ( #4726 )
2026-01-11 15:19:26 +02:00
Alexandru Ionut Tripon
136ad59fad
Fix environment variables always being discarded and custom commands always being overriden ( #4718 )
2026-01-11 15:19:17 +02:00
Alexandru Ionut Tripon
2b04da0c36
Fix shaderpacks folder being hidden ( #4707 )
2026-01-11 15:19:00 +02:00
Octol1ttle
7f3790bf73
change(NetRequest): log server response on error
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-11 00:19:10 +05:00
Alexandru Ionut Tripon
62e17cd19e
fix modrinth environments filter ( #4704 )
2026-01-10 18:36:38 +02:00
TheKodeToad
cbe77872fa
Bump to 10.0.2 ( #4713 )
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2026-01-09 15:57:24 -07:00
Sefa Eyeoglu
100b2aa6da
format the code ( #4717 )
2026-01-09 22:36:35 +01:00
TheKodeToad
01228cc0b7
Fix broken EnvironmentVariables and CustomCommands when tab is inactive
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2026-01-09 21:13:12 +00:00
Trial97
53acc60983
format the code
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2026-01-09 22:28:25 +02:00
Mark Deneen
133842d6a8
Disable tooltips if using gamescope / Steam Deck. ( #4096 )
...
* Disable tooltips if using gamescope / Steam Deck.
On a Steam Deck, Prism Launcher's window is scaled to fit the screen.
Whenever a tool tip is shown, it is often display outside of the window,
causing the compositor to scale the view to fit the new bounding box.
This effect is quite jarring, and I don't like it. This patch adds a
small global event filter which swallows up the tool tip events. It is
currently not configurable, although I suppose that could be an option.
Signed-off-by: Mark Deneen <mdeneen@gmail.com >
* Move tooltip filter addition from the Main Window to the Application.
Signed-off-by: Mark Deneen <mdeneen@gmail.com >
* Add license information to new files
Signed-off-by: Mark Deneen <mdeneen@gmail.com >
* Remove other authors, they should not have been added in the first place
Signed-off-by: Mark Deneen <mdeneen@gmail.com >
* Correct the years as well
Signed-off-by: Mark Deneen <mdeneen@gmail.com >
* Update launcher/ui/ToolTipFilter.cpp
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
Signed-off-by: Mark Deneen <mdeneen@gmail.com >
* Update launcher/ui/ToolTipFilter.h
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
Signed-off-by: Mark Deneen <mdeneen@gmail.com >
---------
Signed-off-by: Mark Deneen <mdeneen@gmail.com >
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2026-01-09 22:13:45 +02:00
Alexandru Ionut Tripon
99c5c7b990
remove curseforge api key validation ( #4700 )
2026-01-09 22:13:08 +02:00
Alexandru Ionut Tripon
1d659b5c68
fix jpg icons ( #4706 )
2026-01-09 22:12:58 +02:00
TheKodeToad
c7501b747e
fix curseforge import ( #4699 )
2026-01-09 19:24:21 +00:00
TheKodeToad
e856f60804
Fix auto-join getting stuck disabled
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2026-01-09 18:42:46 +00:00
Trial97
3f53670cc2
fix jpg icons
...
fixes #4686 and fixes #4666
Forces jpg and jpeg to go through QPixmap first then to Icon.
The original behaivior used the QIcon internal engine to build the
QPixmap causing some inconsitencies.
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2026-01-09 16:36:05 +02:00
TheKodeToad
3e7ef5ee17
Fix shaderpacks folder being hidden on Windows
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2026-01-09 13:54:14 +00:00
Trial97
a97c15d0fb
fix modrinth environments filter
...
fixes #4630
reversed the conditions to check for side because somewhere the mod side
is no initilized(easier to check one line than search where it is not
initialized)
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2026-01-09 12:07:03 +02:00
Trial97
7f952d9fdf
remove curseforge api key validation
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2026-01-08 23:34:06 +02:00
Trial97
398689637d
fix curseforge import
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2026-01-08 23:12:31 +02:00
Alexandru Ionut Tripon
3b1a5dd3c0
Remove prismlauncher-qt5-git badge from README ( #4696 )
2026-01-08 18:24:13 +02:00
Elliott Tallis
ada0401137
Remove prismlauncher-qt5-git badge from README
...
AUR has been deleted since Qt 5 builds are no longer possible
Signed-off-by: Elliott Tallis <tallis.elliott@gmail.com >
2026-01-08 15:54:24 +00:00
Alexandru Ionut Tripon
3e5990f8ec
Update build instructions links in README ( #4688 )
2026-01-07 21:34:27 +02:00
Dylan Renwick
e91d05922a
Update build instructions links in README
...
Signed-off-by: Dylan Renwick <skidsirongenesisdev@gmail.com >
2026-01-07 14:08:01 -05:00
Octol1ttle
fa88edf8c3
Use real move instead of remove-then-insert
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-07 20:21:03 +05:00
TheKodeToad
9be292b845
Use AccountList as model in ProfileSelectDialog
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2026-01-07 11:28:41 +00:00
TheKodeToad
fc1e29111b
Add icons to account list
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2026-01-07 11:28:38 +00:00
Alexandru Ionut Tripon
d191f83a62
Check that mouse press is inside view rectangle of CheckComboBox ( #4681 )
2026-01-07 12:26:22 +02:00
Alexandru Ionut Tripon
6ae06249cb
Skip asking for offline name when using offline account ( #4680 )
2026-01-07 12:25:53 +02:00
Octol1ttle
39e283169e
fix(CheckComboBox): check that mouse press is inside view rectangle
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-07 14:03:38 +05:00
Octol1ttle
2e6efab913
fix: skip asking for offline name when using offline account
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-07 13:27:04 +05:00
Seth Flynn
c3bcfec5e4
Fix AppImage zsync information ( #4671 )
2026-01-06 18:52:32 -05:00
Seth Flynn
4037446051
build(appimage): use tag for version when available
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2026-01-06 18:40:20 -05:00
Octol1ttle
40af45bb1c
feat: allow moving accounts in list
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-07 04:17:47 +05:00
Seth Flynn
20055aa2fa
Automatically use vcpkg to build on macOS and Windows ( #4670 )
2026-01-06 17:38:07 -05:00
Seth Flynn
44bf3aad29
build(macos/windows): automatically use vcpkg
...
Previously `CMAKE_TOOLCHAIN_FILE` needed to be set manually, which was
kinda pointless when vcpkg is already installed and meant to be used
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2026-01-06 17:08:44 -05:00
Alexandru Ionut Tripon
31da9f51f0
Don't use .index for shaderpacks ( #4658 )
2026-01-06 23:53:17 +02:00
Alexandru Ionut Tripon
3b967ee195
Bump to 10.0.1 ( #4662 )
2026-01-06 23:36:55 +02:00
TheKodeToad
3a7366a998
Fix oversights and make requested changes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2026-01-06 20:16:46 +00:00
TheKodeToad
e4991d81d7
Avoid some errors (less noisy log)
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2026-01-06 17:55:44 +00:00
TheKodeToad
398305eb66
Less destructive delete
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2026-01-06 17:54:16 +00:00
TheKodeToad
ea7122b641
Bump to 10.0.1
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2026-01-06 17:49:45 +00:00
TheKodeToad
d625a28112
Properly show shaderpacks in export
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2026-01-06 16:47:05 +00:00
TheKodeToad
1cf48dfd85
Don't use .index for shaderpacks
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2026-01-06 15:05:23 +00:00
Alexandru Ionut Tripon
639268798b
fix manifest generation for linux ( #4649 )
2026-01-06 17:01:44 +02:00
Alexandru Ionut Tripon
db0bdc6bed
Modified the plist to categorize it as a game [Mac] ( #4619 )
2026-01-06 14:19:11 +02:00
Alexandru Ionut Tripon
318a12cee6
change(program_info): more brand unhardcoding ( #4648 )
2026-01-06 14:16:17 +02:00
Alexandru Ionut Tripon
9b7630485f
use libarchive to extract release files ( #4641 )
2026-01-06 14:15:35 +02:00
Trial97
681c635f0e
fix manifest generation for linux
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2026-01-06 14:01:51 +02:00
Octol1ttle
abd482db4a
change(program_info): unhardcode brand from macOS bundle GUI identifier
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-06 16:54:46 +05:00
Octol1ttle
c46eaec046
change(program_info): unhardcode brand from Windows files
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-06 16:54:13 +05:00
Alexandru Ionut Tripon
d6942089cd
Change enum style guideline to PascalCase ( #4623 )
2026-01-06 12:57:23 +02:00
Alexandru Ionut Tripon
009b65cc1d
refactor: remove broken Qt includes ( #4643 )
2026-01-06 12:54:42 +02:00
Octol1ttle
56392a20ed
refactor: remove broken Qt includes
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2026-01-06 15:51:47 +05:00
Trial97
7b0896a0b9
use libarchive to extract release files
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2026-01-06 12:51:23 +02:00
Alexandru Ionut Tripon
b32bc08b34
ci: actually sign windows builds in Release env ( #4632 )
2026-01-05 20:34:47 +02:00
Seth Flynn
939093d648
ci: actually sign windows builds in Release env
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2026-01-05 13:32:03 -05:00
TheKodeToad
55102d4113
Change enum style guideline to PascalCase
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2026-01-04 10:16:28 +00:00
David Kaluta
094425552b
Modified the plist to categorize it as a game
...
Signed-off-by: David Kaluta <mail@dkaluta.com >
2026-01-02 13:42:41 +02:00
Alexandru Ionut Tripon
fe2e171fa1
feat: use Qt 6.10.1 outside mac and use sharun for portable builds too ( #4599 )
2025-12-31 14:25:26 +02:00
DioEgizio
36ffd6b4ee
chore: bump to ubuntu 24.04
...
no reason to keep using 22.04 with sharun
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2025-12-31 09:18:15 +01:00
DioEgizio
015ee05311
chore: simplify Launcher.in quite a bit
...
not necessary anymore with sharun
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2025-12-31 09:18:15 +01:00
DioEgizio
20f9784881
feat: Qt 6.10.1 outside macOS
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2025-12-31 09:18:15 +01:00
Alexandru Ionut Tripon
840bed0666
Include ARM Linux portable builds in releases ( #4609 )
2025-12-31 08:46:41 +02:00
Alexandru Ionut Tripon
7e4e1de68e
Remove some CI jobs ( #4608 )
2025-12-31 08:43:07 +02:00
Alexandru Ionut Tripon
3aab71ea3d
ci: use Release env for releases ( #4605 )
2025-12-31 08:36:39 +02:00
Alexandru Ionut Tripon
b9e8ddac2b
Add qtimageformats to Nix wrapper ( #4606 )
2025-12-31 08:35:13 +02:00
Seth Flynn
c059e812a0
ci: fail releases on unmatched files
...
This previously let bugs slip in, like not uploading the Linux ARM
tarball
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-12-30 20:47:58 -05:00
Seth Flynn
d4230349e3
ci: upload portable linux arm tarball to releases
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-12-30 20:47:35 -05:00
Seth Flynn
abe0c8e687
ci(flatpak): only build for x86_64
...
The flatpaks from CI aren't very usable in the first place, but also
take longer to complete than regular builds, as well as contribute to
our concurrent job limit. Dropping ARM builds shouldn't have much
impact, but this can obviously be reversed if people want it
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-12-30 20:07:56 -05:00
Seth Flynn
698e1dd7cf
ci(nix): don't build for intel macs
...
These are being dropped by Nixpkgs itself soon in the near future, with
few users (on top of reduced usage of our flake/cache). We also already
have coverage for macOS builds through the aarch64-darwin target, so
this doesn't have a big impact on our end either
Obviously can be reverted if enough people want it
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-12-30 20:07:41 -05:00
Seth Flynn
df1573abfd
chore: use go-appimage soft fork until the pgp pr is merged ( #4588 )
2025-12-30 19:56:01 -05:00
Seth Flynn
99d00957b7
fix(nix): add qtimageformats to wrapper
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-12-30 19:52:11 -05:00
Seth Flynn
44e927a69e
ci: only sign windows artifacts in Release environment
...
`CI_HAS_ACCESS_TO_AZURE` is only set in our Release env
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-12-30 19:35:30 -05:00
Seth Flynn
d1313cbd2d
ci: use Release env for releases
...
This ensures we have access to Azure on CI runs for tags
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-12-30 19:32:38 -05:00
DioEgizio
16635ca9fc
feat: use sharun for portable builds too
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2025-12-29 08:42:14 +01:00
DioEgizio
57c4b71c61
fix: improve a bit the FTB packs are also on cf notice
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2025-12-27 15:10:30 +01:00
DioEgizio
31dd8cd9f8
chore: add new ftb packs are also on cf notice
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2025-12-27 15:10:30 +01:00
Alexandru Ionut Tripon
993da92199
feat: Use precompiled headers for 130-180% speedup ( #4494 )
2025-12-26 23:41:37 +02:00
Alexandru Ionut Tripon
e3c79b3427
CMakeLists: fix ASan compile options ( #4590 )
2025-12-26 23:40:31 +02:00
Alexandru Ionut Tripon
91bd74198e
fix(APIPage.ui): resolve duplicate name ( #4591 )
2025-12-26 23:40:11 +02:00
Octol1ttle
de092922d7
fix(APIPage.ui): resolve duplicate name
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2025-12-26 20:06:05 +05:00
Octol1ttle
1fdc33669b
CMakeLists: fix ASan compile options
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2025-12-26 19:57:44 +05:00
DioEgizio
a4b142681d
chore: use go-appimage soft fork until the pgp pr is merged
...
revert this once it's merged!
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2025-12-26 15:27:18 +01:00
Alexandru Ionut Tripon
8e3be68c65
Force disable xrandr if it is unavailable ( #4578 )
2025-12-26 12:10:39 +02:00
Blake Batson
e0c2fbbcde
Force disable xrandr if it is unavailable
...
lwjgl2 optionally requires the xrandr command line utility on linux, but
does not check if the executable actually exists before trying to use
it. We can force it to fall back to the xf86videomode implementation
by checking for the executable ourselves, and force disabling xrandr
with this boolean [1] if it does not exist.
Link: 2df01dd762/src/java/org/lwjgl/opengl/LinuxDisplay.java (L214) [1]
Signed-off-by: Blake Batson <bbatson101@gmail.com >
2025-12-25 14:09:50 -05:00
Alexandru Ionut Tripon
76d1cd1b4e
fix mod update remaining disabled on second open ( #4573 )
2025-12-24 00:10:32 +02:00
Alexandru Ionut Tripon
072eaa32ec
preserve original file extension when importing modpack icon ( #4565 )
2025-12-23 22:44:53 +02:00
Trial97
7f68f2fe3b
fix mod update remaining disabled on second open
...
fixes
https://discord.com/channels/1031648380885147709/1450161125172707390/1453013386144124929
basically when opening the edit window a second time the model doesn't
get any updates as the data is already loaded into the memory.
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-12-23 22:32:52 +02:00
Alexandru Ionut Tripon
c59db39e06
match disabled mods on uninstall ( #4544 )
2025-12-22 23:55:25 +02:00
Alexandru Ionut Tripon
d18a6909c1
fix Pre-release filter ( #4563 )
2025-12-22 23:45:37 +02:00
Trial97
8e96beeda0
preserve original file extension when importing modpack icon
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-12-22 22:50:43 +02:00
Alexandru Ionut Tripon
9504ed500a
build(mingw): use dwarf debug info ( #4554 )
2025-12-22 20:12:16 +02:00
Trial97
b1408775b3
fix Pre-release filter
...
introduced here https://github.com/PrismLauncher/PrismLauncher/pull/3260
fixes #4415
reason: some snapshot have Pre-Release in our meta but when searching in
Modrinth this needs to be translated to -pre and the reverse needed to
be done for filtering after we fetched the version.
Now there are snapshots with -pre in name and that works with Modrinth
but when we translate it back we replace it with Pre-Release so the
easeiest patch is just to double the version(one with -pre one with
Pre-Release)
The correct one would be to complicate the code and identify the
versions that need the transition and only apply this for those.
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-12-22 19:55:47 +02:00
Alexandru Ionut Tripon
8a84f5fc1d
fix legacy skin model ( #4511 )
2025-12-22 19:32:25 +02:00
Alexandru Ionut Tripon
c723b3abe8
Update launcher/minecraft/skins/SkinModel.cpp
...
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2025-12-22 18:22:32 +02:00
Trial97
4b96c5736c
add copyright for modrinth code
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-12-22 18:20:06 +02:00
timoreo
c7bf324e64
build(nix): use nixos-25.11 channel for nixpkgs ( #4559 )
2025-12-22 17:00:36 +01:00
Seth Flynn
5ee33814b6
build(nix): use nixos-25.11 channel for nixpkgs
...
This makes `clangd` work again, thanks to
https://github.com/NixOS/nixpkgs/pull/462747
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/c6245e83d836d0433170a16eb185cefe0572f8b8' (2025-12-18)
→ 'https://releases.nixos.org/nixos/25.11/nixos-25.11.2222.b3aad468604d/nixexprs.tar.xz?lastModified=1766201043&narHash=sha256-v9nbQe0BgwBx%2BKcxRf6i2kbS8EwKjBFRjAawA91B/OE%3D&rev=b3aad468604d3e488d627c0b43984eb60e75e782 ' (2025-12-20)
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-12-22 10:27:11 -05:00
Seth Flynn
ea84621d2f
Make blocked/stacked pr detection more flexible with capitalization ( #4557 )
2025-12-22 09:54:56 -05:00
Seth Flynn
d85ff94f03
build(mingw): use dwarf debug info
...
As it turns out, LLDB can load Windows crash dumps!
This allows us go back to the regular (better supported) DWARF debuginfo
format used by MinGW, as now we have a tool that can both parse those
symbols *and* Windows' crash dumps. The biggest advantage here is that
once again, MinGW crash dumps can be easily inspected on Linux
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-12-22 09:53:42 -05:00
Seth Flynn
39c4e7c79b
fix(build): handle CMAKE_BUILD_TYPE with generator expressions ( #4553 )
2025-12-22 09:50:19 -05:00
Rachel Powers
586364e3b6
Make blocked/stacked pr detection more flexible with capitalization
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-12-22 02:51:58 -07:00
Seth Flynn
85849fea41
fix(build): handle CMAKE_BUILD_TYPE with generator expressions
...
Since we've started using ninja's multi-config generator, evaluating
CMAKE_BUILD_TYPE at configure-time is no longer reliable. Thankfully,
CMake offers "generator expressions" that are evaluated during build
system generation, which allows us to continue using these conditional
flags without much headache
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-12-22 03:21:10 -05:00
Alexandru Ionut Tripon
ee21ad836f
fix modrinth modpack allways download latest ( #4549 )
2025-12-22 10:09:42 +02:00
Trial97
d7745d97f2
fix modrinth modpack allways download latest
...
fixes #4547
introduced by #3828
made a mistake to use addonId instead ov fileId
this only applies to modrinth
on curseforge I could not reproduce this bug
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-12-21 22:45:57 +02:00
Alexandru Ionut Tripon
49b66d8a54
chore(nix): update lockfile ( #4545 )
2025-12-21 09:50:46 +02:00
timoreo
52240cc64c
fix accounts crash ( #4543 )
2025-12-21 05:33:14 +01:00
github-actions[bot]
6732d7f99c
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/2fbfb1d73d239d2402a8fe03963e37aab15abe8b?narHash=sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0%3D' (2025-12-11)
→ 'github:NixOS/nixpkgs/c6245e83d836d0433170a16eb185cefe0572f8b8?narHash=sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc%3D' (2025-12-18)
2025-12-21 00:31:41 +00:00
Trial97
08c45684de
match disabled mods on uninstall
...
fixes #4537
This ensures that when looking to uninstall a resource prism will
consider the disabled ones to.
Right now we have a guard in place to prevent resources using the same
name so this check will allways match with the correct resouce.
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-12-20 23:54:31 +02:00
Trial97
f4b22dae90
fix accounts crash
...
fixes #4541
introduced in
3c46d8a412
The original commit introduced m_name but never used it.
When the endActivity would be called with a count of 0 this would crash
the laucnher.
How to reproduce: try to switch your skin in quick succession until you
get 429 too many requests as response to the login.
I will also presume this is not the only crash caused by this(hopefully
it is as it was not catched for four years)
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-12-20 23:23:27 +02:00
Alexandru Ionut Tripon
d3f59a8a43
fix(skin-preview): smoother chessboard background contrast ( #4534 )
2025-12-20 18:51:04 +02:00
Tayou
5c6c92f286
fix skin preview leg rendering ( #4538 )
2025-12-20 13:00:06 +01:00
Tayou
fcf201755c
fix skin preview leg rendering
...
Signed-off-by: Tayou <git@tayou.org >
2025-12-20 08:50:49 +01:00
Rachel Powers
42b72d676c
fix(skin-preview): smoother chessboard background contrast
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-12-19 16:53:31 -07:00
Alexandru Ionut Tripon
877b824c3b
fix skin depth ( #4524 )
2025-12-19 20:26:51 +02:00
Alexandru Ionut Tripon
2f540ffc61
fix elytra preview ( #4525 )
2025-12-19 20:26:35 +02:00
Seth Flynn
53fbc39ad1
Use sharun to bundle AppImage ( #4515 )
2025-12-19 03:43:51 -05:00
Alexandru Ionut Tripon
d1df515bcc
Updated App icon for macOS 26 ( #4160 )
2025-12-19 10:37:25 +02:00
Trial97
e360a95c23
fix elytra preview
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-12-19 01:14:19 +02:00
Trial97
624d506fac
fix skin depth
...
The skin overlay was drawn together with the original skin making it
blend weirdly. By drawing the overlay after the skin this blends with
the body corectly.
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-12-19 00:01:39 +02:00
Alexandru Ionut Tripon
53e090f035
Trim unexpected info from pack.mcmeta ( #4522 )
2025-12-18 23:51:15 +02:00
Dylan Schooner
51b47050f9
Check specifically for GarbageAtEnd error
...
- Out parameter for garbage data\n- Rename parseUntilMalformed to parseUntilGarbage
Signed-off-by: Dylan Schooner <dschooner05@gmail.com >
2025-12-18 15:23:48 -05:00
Dylan Schooner
9c7fe72f9c
Use Json::parseUntilMalformed in McClient::parseResponse
...
Signed-off-by: Dylan Schooner <dschooner05@gmail.com >
2025-12-18 14:14:29 -05:00
Dylan Schooner
e1eee6e3ca
Add Json::parseUntilMalformed helper
...
Signed-off-by: Dylan Schooner <dschooner05@gmail.com >
2025-12-18 13:33:13 -05:00
Dylan Schooner
43fce3ae46
Trim unexpected info from pack.mcmeta
...
Signed-off-by: Dylan Schooner <dschooner05@gmail.com >
2025-12-18 12:34:41 -05:00
Alexandru Ionut Tripon
018ff600f6
Use static image when opengl context is not available ( #4509 )
2025-12-18 13:21:00 +02:00
Seth Flynn
5d5f22e672
ci(linux): verify appstream info for appimages
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-12-17 23:53:47 -05:00
Seth Flynn
e39e59acb6
revert: "fix(launcher): set correct bin path for self-contained appimages"
...
Refs: b1b4b5d
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-12-17 23:53:47 -05:00
Seth Flynn
1d8bf82ef8
revert: "fix(appimage): launch external processes with bundled linker"
...
Refs: c305ed4
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-12-17 23:53:46 -05:00
Seth Flynn
06e99e2990
build(linux): use sharun for appimage bundling
...
This should fix issues with OpenGL, as well as help as avoid using some
annoying (and fragile) hacks to locate our actual binary/other resources
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-12-17 23:53:42 -05:00
Trial97
f7111b6ec1
fix legacy skin model
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-12-17 00:03:19 +02:00
Alexandru Ionut Tripon
3c570f9e9c
Update launcher/ui/dialogs/skins/SkinManageDialog.cpp
...
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2025-12-16 20:56:41 +02:00
Alexandru Ionut Tripon
1dd8c9606f
server player req: parse malformed json ( #4512 )
2025-12-16 16:35:20 +02:00
Tayou
5ebd386797
server player req: parse malformed json
...
ATM10 server seems to send a extra json object after the default response, that we need to cut off.
Signed-off-by: Tayou <git@tayou.org >
Co-authored-by: Trial97 <alexandru.tripon97@gmail.com >
2025-12-16 14:51:01 +01:00
Trial97
177e7b272b
Use static image when opengl context is not available
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-12-16 13:36:28 +02:00
Alexandru Ionut Tripon
8cfed54399
fix: actually fix toml++ on fedora ( #4506 )
2025-12-16 10:27:25 +02:00
DioEgizio
9aa1a4d11b
fix: actually fix toml++ on fedora
...
oops
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2025-12-16 08:44:56 +01:00
Alexandru Ionut Tripon
92a12b5617
chore(deps): update korthout/backport-action action to v4.0.1 ( #4500 )
2025-12-16 08:50:49 +02:00
renovate[bot]
981b3fc48e
chore(deps): update korthout/backport-action action to v4.0.1
2025-12-15 18:07:32 +00:00
Seth Flynn
fc3c5cba30
Use multibyte encoding aware libarchive functions when dealing with filenames ( #4457 )
2025-12-15 08:09:25 -05:00
Rachel Powers
b40544dc55
fix: remove locale forcing as unnecessary
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-12-14 22:43:22 -07:00
Rachel Powers
e53093c4b4
feat: Use pre-compiled headers
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-12-14 21:15:23 -07:00
Alexandru Ionut Tripon
bf0d0a1d5b
change(Actions): cancel outdated builds ( #4483 )
2025-12-14 19:32:04 +02:00
Richard Voigtmann
e7f801c4c4
Add suggestion from code review
...
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
Signed-off-by: Richard Voigtmann <71901885+ShadowPaint-SP@users.noreply.github.com >
2025-12-14 11:07:19 +01:00
Richard Voigtmann
e46b0335ab
xCode version check
...
Signed-off-by: Richard Voigtmann <richard.v.voigtmann@gmail.com >
2025-12-14 09:46:53 +01:00
Alexandru Ionut Tripon
fd338ce273
chore(nix): update lockfile ( #4488 )
2025-12-14 08:44:18 +02:00
Rachel Powers
c33d104dc3
fix leak of cloned entry ( #4487 )
2025-12-13 18:52:49 -07:00
Richard Voigtmann
e125f4767f
removed unnecessary Option from actool command and failsafe attempt for older versions
...
Signed-off-by: Richard Voigtmann <richard.v.voigtmann@gmail.com >
2025-12-14 02:14:27 +01:00
github-actions[bot]
7e9324be20
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/f61125a668a320878494449750330ca58b78c557?narHash=sha256-BmPWzogsG2GsXZtlT%2BMTcAWeDK5hkbGRZTeZNW42fwA%3D' (2025-12-05)
→ 'github:NixOS/nixpkgs/2fbfb1d73d239d2402a8fe03963e37aab15abe8b?narHash=sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0%3D' (2025-12-11)
2025-12-14 00:31:50 +00:00
Rachel Powers
59313204b2
chore(deps): update korthout/backport-action action to v4 ( #4485 )
2025-12-13 16:06:14 -07:00
Rachel Powers
95d2789199
fix archive detection ( #4486 )
2025-12-13 16:02:50 -07:00
Alexandru Ionut Tripon
960c3a56b0
fix: bundle cmark in portable build ( #4476 )
2025-12-14 00:56:40 +02:00
Alexandru Ionut Tripon
66c9fafbe8
Use old ProjectItem highlight on Windows styles ( #4466 )
2025-12-14 00:56:30 +02:00
Alexandru Ionut Tripon
ed63a355b0
fix partial java download ( #4472 )
2025-12-14 00:55:05 +02:00
Alexandru Ionut Tripon
aa3d78b3dc
Fix server columns text other than name being invisible ( #4475 )
2025-12-14 00:54:42 +02:00
TheKodeToad
caa69ee204
Allow http://localhost for meta ( #4477 )
2025-12-13 22:53:05 +00:00
Trial97
f05fd4da2b
fix leak of cloned entry
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-12-14 00:20:24 +02:00
Trial97
e775629e1f
fix archive detection
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-12-14 00:03:34 +02:00
Alexandru Ionut Tripon
7eaaf6a224
chore(deps): update actions/cache action to v5.0.1 ( #4478 )
2025-12-13 23:41:19 +02:00
Alexandru Ionut Tripon
6955c14a4b
chore(deps): update github artifact actions (major) ( #4479 )
2025-12-13 23:40:54 +02:00
Richard Voigtmann
7f740e4ad6
added mono to brew because macos 26 runner doesnt include it
...
Signed-off-by: Richard Voigtmann <richard.v.voigtmann@gmail.com >
2025-12-13 21:50:40 +01:00
Richard Voigtmann
7cb623e800
bumped macos runner version to 26
...
Signed-off-by: Richard Voigtmann <richard.v.voigtmann@gmail.com >
2025-12-13 15:57:58 +01:00
renovate[bot]
c865c5b820
chore(deps): update korthout/backport-action action to v4
2025-12-13 13:14:26 +00:00
DioEgizio
891eb825d9
fix: bundle cmark in portable build
...
fixes portable not working outside ubuntu
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2025-12-13 08:51:55 +01:00
Octol1ttle
5d48e13d21
change(Actions): cancel outdated builds
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2025-12-13 12:41:11 +05:00
renovate[bot]
3b715ada07
chore(deps): update github artifact actions
2025-12-12 21:58:12 +00:00
renovate[bot]
a159b64e72
chore(deps): update actions/cache action to v5.0.1
2025-12-12 21:58:08 +00:00
TheKodeToad
d818f232e3
Allow http://localhost for meta
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-12-12 17:21:00 +00:00
Richard Voigtmann
d53b785a1c
implemented recommended changes -reverted .icns file instellation
...
Signed-off-by: Richard Voigtmann <richard.v.voigtmann@gmail.com >
2025-12-12 16:12:00 +01:00
Alexandru Ionut Tripon
9a505a07c0
Make page sidebar look less disjointed on breeze ( #4465 )
2025-12-12 14:51:36 +02:00
TheKodeToad
0d7244d56f
Remove unused code
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-12-12 12:18:56 +00:00
TheKodeToad
7baac92f56
Fix server columns being totally invisible
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-12-12 12:07:19 +00:00
Seth Flynn
f155269f6d
fix(InstanceImportTask): stream archive reads ( #4459 )
2025-12-12 02:41:31 -05:00
Trial97
0f7320ff1d
fix partial java download
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-12-12 09:34:54 +02:00
timoreo
f5e122bda2
chore(deps): update cachix/install-nix-action digest to 4e002c8 ( #4467 )
2025-12-12 08:21:13 +01:00
Trial97
9cd199a49e
fix use-afrer-free crash caused by QtConcurrent
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-12-12 09:00:30 +02:00
Alexandru Ionut Tripon
f024251e12
chore(deps): update actions/cache action to v5 ( #4471 )
2025-12-12 08:54:16 +02:00
renovate[bot]
52fe83f3c4
chore(deps): update actions/cache action to v5
2025-12-12 02:03:11 +00:00
renovate[bot]
6fe989d043
chore(deps): update cachix/install-nix-action digest to 4e002c8
2025-12-11 20:35:10 +00:00
TheKodeToad
81f34be053
Use old ProjectItem highlight on Windows styles
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-12-11 15:46:31 +00:00
TheKodeToad
2b949d5fdd
Make page container hug edges of dialog <3
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-12-11 14:07:02 +00:00
Richard Voigtmann
a7dd3aeaab
replaced binary with in ci building of Icons
...
Signed-off-by: Richard Voigtmann <richard.v.voigtmann@gmail.com >
2025-12-11 11:58:11 +01:00
Trial97
808b09c403
improve archive detection
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-12-11 12:54:49 +02:00
Alexandru Ionut Tripon
40d1dccb9b
chore: Re-simplify IndexVersionType and MessageLevel with c++20 ( #4455 )
2025-12-11 12:51:31 +02:00
Rachel Powers
28d27d4f19
refactor(MessageLevel): move and rename 'FromLine*' functions
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-12-11 09:59:33 -07:00
Rachel Powers
d1b6d7c402
chore: Re-simplify IndexVersionType and MessageLevel with c++20
...
This sets our compiler requirements to gcc 11 and clang 13. If we
forgo the use of `using enum` we can drop to gcc 10 and clang 10 but
that means using `MessageLevel::Enum::Unknown` for direct enum access
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-12-11 09:59:33 -07:00
Rachel Powers
5e7de6bc53
Apply suggestions from code review
...
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-12-10 22:01:36 -07:00
Seth Flynn
30f24dae11
fix(appimage): launch updater with bundled linker ( #4425 )
2025-12-10 23:30:21 -05:00
Seth Flynn
66f1ca25ae
Update in-tree flatpak to use KDE Platform 6.10 ( #4452 )
2025-12-10 23:27:50 -05:00
Seth Flynn
afe99948c2
fix(updater): re-use binPath to determine launcher binary path
...
Previously this would use the un-adjusted value from Qt, allowing it to
fail in edge cases like self-contained AppImages
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-12-10 22:23:09 -05:00
Seth Flynn
c305ed4506
fix(appimage): launch external processes with bundled linker
...
This ensures that external processes (including our updater and
Minecraft itself) maintain the same compatibility guarantees as the main
binary
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-12-10 22:23:01 -05:00
Alexandru Ionut Tripon
bc68192895
Expand variables in JVM args and add library_dir variable ( #4427 )
2025-12-09 21:09:03 +02:00
Alexandru Ionut Tripon
f72db9843d
Properly rename shader config on update/version change ( #4454 )
2025-12-09 21:08:19 +02:00
TheKodeToad
66c8afe4d3
Simplify implementation by removing some unused code
...
Only applies to cauldron loader which doesn't exist on Modrinth or
CurseForge, and doesn't even make sense for shaders.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-12-09 11:42:17 +00:00
TheKodeToad
2477c4f021
Use FS::move instead; check new config does not exist
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-12-09 11:04:01 +00:00
Rachel Powers
87286fa6a3
fix(libarchive): use multibyte encoding aware libarchive functions when dealing with filenames
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-12-08 21:31:58 -07:00
TheKodeToad
826da57944
Properly rename shader config on update/version change
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-12-08 22:43:29 +00:00
Rachel Powers
c10681831c
Fix typo in contributors section of README ( #4448 )
2025-12-08 14:09:15 -07:00
DioEgizio
33547c639c
chore: Update in-tree flatpak to use kde platform 6.10
...
6.8 is eol. Also 6.10 requires codecs-extra so it fixes compatibility with replaymod.
flathub should also get updated to 6.10 but it's not as important because 6.9 isnt eol
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2025-12-08 15:00:26 +01:00
Alexandru Ionut Tripon
2e3097d5ca
fix log window margins ( #4428 ) ( #4451 )
2025-12-08 14:44:05 +02:00
Tayou
0e68ba900f
fix log window margins ( #4428 )
...
closes #4428
Signed-off-by: Tayou <git@tayou.org >
2025-12-08 13:20:46 +01:00
Alexandru Ionut Tripon
45fd2a89ad
Only continue log level if line starts with whitespace ( #4430 )
2025-12-08 12:42:31 +02:00
TheKodeToad
4f5e348b66
Merge branch 'develop' into fix-log-level-bleed
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-12-08 09:21:27 +00:00
Sheldon Corkery
67aa140fae
Fix typo in contributors section of README
...
Signed-off-by: Sheldon Corkery <sheldonmcorkery@gmail.com >
2025-12-07 19:32:31 -06:00
Alexandru Ionut Tripon
551382d0f6
EditorConfig essentials ( #4445 )
2025-12-08 01:12:08 +02:00
Alexandru Ionut Tripon
ff98c350a1
Simplify MessageLevel and IndexedVersionType enums ( #4446 )
2025-12-07 23:39:57 +02:00
TheKodeToad
0853afe274
Fix tests
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-12-07 16:40:18 +00:00
Alexandru Ionut Tripon
ec129eeee8
chore(nix): update lockfile ( #4438 )
2025-12-07 17:04:50 +02:00
TheKodeToad
22df159a9b
clang-format: specify access modifier offset used in codebase ( #4442 )
2025-12-07 14:44:18 +00:00
TheKodeToad
de5c7bac72
Simplify IndexedVersionType::VersionType -> IndexedVersionType
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-12-07 14:34:00 +00:00
TheKodeToad
fd3ae85d45
Simplify MessageLevel::Enum -> MessageLevel
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-12-07 13:15:22 +00:00
TheKodeToad
c9d3f050a1
EditorConfig essentials
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-12-07 12:09:41 +00:00
TheKodeToad
0fd945b3db
EditorConfig: set continuation indent size in CMakeLists for IntelliJ ( #4443 )
2025-12-07 11:08:17 +00:00
Octol1ttle
1344dcb27e
EditorConfig: set continuation indent size in CMakeLists for IntelliJ
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2025-12-07 12:45:35 +05:00
Octol1ttle
904e8ef1ed
clang-format: specify access modifier offset used in codebase
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2025-12-07 12:30:49 +05:00
github-actions[bot]
61f94f50c8
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/2fad6eac6077f03fe109c4d4eb171cf96791faa4?narHash=sha256-sKoIWfnijJ0%2B9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI%3D' (2025-11-27)
→ 'github:NixOS/nixpkgs/f61125a668a320878494449750330ca58b78c557?narHash=sha256-BmPWzogsG2GsXZtlT%2BMTcAWeDK5hkbGRZTeZNW42fwA%3D' (2025-12-05)
2025-12-07 00:31:09 +00:00
TheKodeToad
aa0bd45d6c
LaunchController: fix offline launches always failing ( #4436 )
2025-12-06 21:32:14 +00:00
Octol1ttle
86fd58e6cb
Apply suggestions from code review
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2025-12-06 16:34:59 +05:00
Octol1ttle
04a405067d
fix(LaunchController): correctly communicate if asking for offline name was successful
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2025-12-06 14:37:39 +05:00
TheKodeToad
c018b60816
Only continue log level if line starts with whitespace; reintroduce exception detection
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-12-05 12:38:21 +00:00
TheKodeToad
4ae0b3d898
Replace QDir("libraries/").absolutePath() with metacache solution
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-12-05 11:56:56 +00:00
TheKodeToad
cbf2f14b3f
Add library_dir var
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-12-05 11:26:58 +00:00
TheKodeToad
069dacd464
Expand variables in JVM args
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-12-05 10:47:11 +00:00
Seth Flynn
92738feeba
build: manually specify appimage update information ( #4423 )
2025-12-04 06:44:52 -05:00
Seth Flynn
e8d33e5af1
build: manually specify appimage update information
...
Previously this targeted the wrong filename from our releases
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-12-03 19:59:08 -05:00
Alexandru Ionut Tripon
fbe239eb3d
fix: Add back fallback to pkgconfig for tomlplusplus ( #4416 )
2025-12-02 08:45:12 +02:00
DioEgizio
5532976ea7
fix: Add back fallback to pkgconfig for tomlplusplus
...
fixes a regression in #4405
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2025-12-01 21:47:18 +01:00
Rachel Powers
5e54f9e223
chore(nix): update lockfile ( #4409 )
2025-12-01 13:09:50 -07:00
Seth Flynn
3dee0ef6dd
fix(launcher): set correct bin path for self-contained appimages ( #4408 )
2025-12-01 11:57:00 -05:00
github-actions[bot]
428f8d6d80
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/117cc7f94e8072499b0a7aa4c52084fa4e11cc9b?narHash=sha256-%2BhBiJ%2BkG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s%3D' (2025-11-20)
→ 'github:NixOS/nixpkgs/2fad6eac6077f03fe109c4d4eb171cf96791faa4?narHash=sha256-sKoIWfnijJ0%2B9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI%3D' (2025-11-27)
2025-11-30 00:31:21 +00:00
Seth Flynn
b1b4b5d38a
fix(launcher): set correct bin path for self-contained appimages
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-29 15:13:38 -05:00
Seth Flynn
603da29f28
Use go-appimage to create AppImages ( #4314 )
2025-11-29 12:05:51 -05:00
Seth Flynn
be25d3a6a5
fix(launcher/updater): call architecture-agnostic AppImageUpdate
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-29 11:35:03 -05:00
Seth Flynn
2cf5fe5097
build: use go-appimage to create appimages
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-29 11:34:05 -05:00
Seth Flynn
0704027e6c
build: install 256x256 png icons
...
This is required by `go-appimage` - and apparently(?) a requirement by
XDG, with SVGs being optional
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-29 11:09:24 -05:00
Seth Flynn
5c8b18098f
Remove in-tree third party dependencies ( #4405 )
2025-11-28 07:59:20 -05:00
Seth Flynn
38afa3a94c
build: remove vendored gamemode code
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-28 04:02:08 -05:00
Seth Flynn
e2c31569dc
build: remove third party submodules
...
Most of these are extremely common in distributions now, so packagers
don't have much need for our in-tree versions - most don't even use them
as is
With our move to vcpkg for Windows/macOS, we also don't have a need for
them. So time to say goodbye!
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-28 04:01:59 -05:00
Seth Flynn
5cb09d6ae8
De-vendor Qt and ECM CMake files ( #4404 )
2025-11-27 19:01:21 -05:00
Seth Flynn
dc774aa424
build(cmake): remove Launcher_FORCE_BUNDLED_LIBS option
...
As we won't be providing "bundled" libraries anymore, this option is
basically pointless
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-27 16:51:16 -05:00
Seth Flynn
030dc4e7b1
ci(setup-dependencies/linux): use deps from system
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-27 16:51:10 -05:00
Seth Flynn
1caf2cc7d5
Drop Qt5Compat ( #4176 )
2025-11-27 16:32:40 -05:00
Alexandru Ionut Tripon
32303d6351
Improve no loader dialog ( #4374 )
2025-11-27 22:56:11 +02:00
Seth Flynn
690a61a9e0
build(cmake): de-vendor versionless qt commands
...
These are already shipped in all versions of Qt 6
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-27 15:54:29 -05:00
Seth Flynn
3459e5bb52
build(cmake): de-vendor ecm files
...
These are now present in virtually all modern versions of ECM shipped by
distributions, so we don't really need to keep them around
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-27 15:52:34 -05:00
Trial97
074846d72a
remove qt5compat
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-27 22:37:31 +02:00
Seth Flynn
bf5b03b4ff
Replace QuaZip (and other archiving operations) with libarchive ( #3959 )
2025-11-27 14:53:59 -05:00
Seth Flynn
9a75d8f73f
chore(deps): update actions/checkout action to v6 ( #4379 )
2025-11-27 14:40:47 -05:00
Seth Flynn
d852947895
chore(deps): update determinatesystems/update-flake-lock action to v28 ( #4402 )
2025-11-27 14:40:05 -05:00
Seth Flynn
da8c3b973d
chore(deps): update hendrikmuhs/ccache-action action to v1.2.20 ( #4401 )
2025-11-27 14:39:48 -05:00
renovate[bot]
5b037793ff
chore(deps): update determinatesystems/update-flake-lock action to v28
2025-11-26 22:10:33 +00:00
renovate[bot]
2dcc89aa00
chore(deps): update hendrikmuhs/ccache-action action to v1.2.20
2025-11-26 22:10:29 +00:00
Seth Flynn
ff40679d0f
refactor(launcher/archive): ensure correct filetype for archived files
...
We can rely on stat for most things but this
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-26 17:01:09 -05:00
Trial97
ea05eb951a
add back kdePackages.qt5compat
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 19:16:31 +02:00
Trial97
792b1d6648
apply suggestions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 19:12:13 +02:00
Trial97
c787f4e291
fix merge
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:42:25 +02:00
Alexandru Ionut Tripon
67a5cc9b8d
Update launcher/archive/ArchiveWriter.cpp
...
Co-authored-by: Seth Flynn <getchoo@tuta.io >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2025-11-26 18:41:57 +02:00
Trial97
a17908e078
use file stat to get time information
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:41:57 +02:00
Seth Flynn
06c3bb89ff
build(vcpkg): minimize libarchive build
...
This avoids pulling in libxml2 for xar support, which we don't use and
was giving us some trouble in CI
Signed-off-by: Seth Flynn <getchoo@tuta.io >
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:41:57 +02:00
Trial97
df3ff60751
update the vcpkg baseline
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:41:57 +02:00
Trial97
44b36312be
nothing but zip writes
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:41:57 +02:00
Trial97
5100588c8b
ensure secure extraction
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:41:57 +02:00
Trial97
561187b18a
fix: utf8 pathname encoding
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:41:57 +02:00
Trial97
8acc52b1ab
fix: CF import and Modrinth export
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:41:57 +02:00
Trial97
b119cc04df
update license readme
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:41:57 +02:00
Trial97
085183d530
fix license headers
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:41:57 +02:00
Seth Flynn
bc90327d44
build(vcpkg): remove bzip2 dependency
...
This was previously required by Quazip
Signed-off-by: Seth Flynn <getchoo@tuta.io >
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:41:57 +02:00
Trial97
c456e35e41
build(cmake): better detect libarchive
...
Co-authored-by: Octol1ttle <l1ttleofficial@outlook.com >
Co-authored-by: Seth Flynn <getchoo@tuta.io >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
Signed-off-by: Seth Flynn <getchoo@tuta.io >
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:41:57 +02:00
Trial97
7962e223ab
fix merge conflicts
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:41:57 +02:00
Trial97
aa265a45ee
fix nix build
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:41:56 +02:00
Trial97
27259ff52d
Improve mod parsing
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:41:22 +02:00
Trial97
8cace06df9
move libarchive outside bundle libs
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:41:22 +02:00
Trial97
d036bba341
add libarchive as actions dependency
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:41:22 +02:00
Trial97
2a99bb534f
add missing copyrights
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:41:22 +02:00
Trial97
84efa6814d
remove quazip
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:41:20 +02:00
Trial97
30ef158716
finish moving all code to libarchive
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:40:41 +02:00
Trial97
f38a0c8f98
move more zip parsings
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:40:40 +02:00
Trial97
8c36be048c
move ExtractZipTask
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:39:18 +02:00
Trial97
60b2585711
move some functions from MMCZip to use libarchive
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:39:18 +02:00
Trial97
fa930afe4b
move ExportToZipTask
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-26 18:39:18 +02:00
Seth Flynn
64e923e977
chore(nix): update lockfile ( #4390 )
2025-11-26 11:24:50 -05:00
Seth Flynn
63e6fc28dc
change packwiz extra warnings to debug ( #4388 )
2025-11-26 11:24:24 -05:00
Seth Flynn
5d1e457b39
nix: use default apple-sdk ( #4398 )
2025-11-26 10:16:53 -05:00
Pagwin
331c1de9cd
Edited a comment for clarity
...
Signed-off-by: Pagwin <git@pagwin.xyz >
2025-11-25 13:34:31 -05:00
Tayou
117e0d7b24
nix: remove explicit apple-sdk
...
Signed-off-by: Tayou <git@tayou.org >
2025-11-25 12:40:26 +01:00
Alexandru Ionut Tripon
f77871a580
fix FTBA instance loading ( #4347 )
2025-11-24 15:23:35 +02:00
Edvin Bryntesson
9e614f94cd
fix FTBA instance loading
...
Signed-off-by: Edvin Bryntesson <epost@edvinbryntesson.se >
2025-11-24 13:33:54 +01:00
TheKodeToad
f9331a1d43
Implement find wrapping in LogView ( #4392 )
2025-11-24 09:40:52 +00:00
Pagwin
55a212f3c4
Grammar/Spelling nit fix for Missing Mod loader dialog
...
Co-authored-by: Seth Flynn <getchoo@tuta.io >
Signed-off-by: Pagwin <git@pagwin.xyz >
2025-11-23 14:06:06 -05:00
TheKodeToad
17c4ad0f01
Implement find wrapping in LogView
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-11-23 16:15:43 +00:00
Trial97
9de2f96341
change packwiz extra warnings to debug
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-23 09:24:51 +02:00
github-actions[bot]
c22592d74c
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/c5ae371f1a6a7fd27823bc500d9390b38c05fa55?narHash=sha256-4PqRErxfe%2B2toFJFgcRKZ0UI9NSIOJa%2B7RXVtBhy4KE%3D' (2025-11-12)
→ 'github:NixOS/nixpkgs/117cc7f94e8072499b0a7aa4c52084fa4e11cc9b?narHash=sha256-%2BhBiJ%2BkG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s%3D' (2025-11-20)
2025-11-23 00:31:37 +00:00
Pagwin
5e2c8bdcf7
Fixed Loader Install Cancel crash
...
Fixed a crash which occurred when the mod loader dialog was cancelled
after being reached from the no loader dialog
Signed-off-by: Pagwin <dev@pagwin.xyz >
2025-11-22 17:10:22 -05:00
Alexandru Ionut Tripon
8abf5ed7b1
add support for neoforge in atl packs ( #4383 )
2025-11-22 18:32:24 +02:00
Pagwin
fca8ac40ff
Minor remaining fixes for PR ( #4374 )
...
- changed case of `handleNoModLoader` to match project style
- made default case in switch statement for `handleNoModLoader` return
true for safety
Signed-off-by: Pagwin <dev@pagwin.xyz >
2025-11-21 16:19:41 -05:00
Trial97
f832a361e2
add support for neoforge in atl packs
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-21 22:51:43 +02:00
DioEgizio
3ba24f3f09
Use security-scoped bookmarks for directory settings on macOS ( #3616 )
2025-11-21 18:34:43 +01:00
Pagwin
1dae1a210b
Made changes to address feedback from code review ( #4374 )
...
Signed-off-by: Pagwin <dev@pagwin.xyz >
2025-11-20 20:48:53 -05:00
renovate[bot]
2f8a9fb6a2
chore(deps): update actions/checkout action to v6
2025-11-20 18:32:56 +00:00
timoreo
8b43ea486b
chore(nix): update lockfile ( #4357 )
2025-11-20 15:44:56 +01:00
DioEgizio
c7fa69cfd0
ci: fix cmake --install on release & macos code signing ( #4375 )
2025-11-19 21:44:08 +01:00
Seth Flynn
6a46484895
ci: fix macos code signing secret names
...
oopsie
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-19 14:53:37 -05:00
Seth Flynn
dc88866d85
ci: ensure --config is always passed with cmake --install
...
lol
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-19 14:52:25 -05:00
Seth Flynn
b86f47d79b
chore(deps): update cachix/install-nix-action digest to 0b0e072 ( #4368 )
2025-11-19 14:47:04 -05:00
Pagwin
9ce7738912
Implemented #4369
...
Signed-off-by: Pagwin <dev@pagwin.xyz >
2025-11-19 10:48:34 -05:00
renovate[bot]
90ea9af1cb
chore(deps): update cachix/install-nix-action digest to 0b0e072
2025-11-19 00:29:00 +00:00
Sefa Eyeoglu
4c437a839c
nix: Disable deprecated PIE flags ( #4365 )
2025-11-17 22:10:55 +01:00
Sefa Eyeoglu
48c91c13ad
nix: Disable deprecated PIE flags
...
Fixes the following warning with nixos-unstable (and upcoming 25.11)
evaluation warning: The 'pie' hardening flag has been removed in
favor of enabling PIE by default in compilers and should no longer
be used. PIE can be disabled with the -no-pie compiler flag, but
this is usually not necessary as most build systems pass this if
needed. Usage of the 'pie' hardening flag will become an error in
future.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2025-11-17 19:09:58 +01:00
Alexandru Ionut Tripon
8b4ad7aa49
Create a unified dialog to ask user for offline name ( #4209 )
2025-11-16 18:30:37 +02:00
Alexandru Ionut Tripon
e5629bb08a
Refactor ReviewMessageBox::appendResource ( #4320 )
2025-11-16 18:13:32 +02:00
Alexandru Ionut Tripon
7ca8556211
Fix issues with log level handling ( #4254 )
2025-11-16 18:13:12 +02:00
Alexandru Ionut Tripon
f93e21fa2d
deduplicate includes and reformat ( #4228 )
2025-11-16 18:12:52 +02:00
github-actions[bot]
57397c377d
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/ae814fd3904b621d8ab97418f1d0f2eb0d3716f4?narHash=sha256-YRqMDEtSMbitIMj%2BJLpheSz0pwEr0Rmy5mC7myl17xs%3D' (2025-11-05)
→ 'github:NixOS/nixpkgs/c5ae371f1a6a7fd27823bc500d9390b38c05fa55?narHash=sha256-4PqRErxfe%2B2toFJFgcRKZ0UI9NSIOJa%2B7RXVtBhy4KE%3D' (2025-11-12)
2025-11-16 00:29:46 +00:00
TheKodeToad
16066c9a15
fix(ModrinthPackIndex): set logo name correctly ( #4356 )
2025-11-15 18:50:51 +00:00
Octol1ttle
7cbec465cd
fix(ModrinthPackIndex): set logo name correctly
...
Fixes: f90c0a59a7
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2025-11-15 22:42:16 +05:00
Alexandru Ionut Tripon
86b39b2771
Remove icon from PageContainer header ( #4332 )
2025-11-14 12:08:37 +02:00
TheKodeToad
f90c0a59a7
Remove Json ensure helpers ( #4330 )
2025-11-13 19:45:01 +00:00
Alexandru Ionut Tripon
dd295aaf1e
Use multi-config generator for CMake presets ( #4301 )
2025-11-13 20:21:40 +02:00
Seth Flynn
b5964b0c3a
ci(package/windows): use absolute paths for signed files ( #4350 )
2025-11-13 06:43:54 -05:00
Seth Flynn
4b6fab06d8
ci(package/windows): use absolute paths for signed files
...
This is (weirdly) required by the Trusted Signing action
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-13 06:40:00 -05:00
Seth Flynn
908032f033
Sign Windows builds again ( #4348 )
2025-11-13 06:29:59 -05:00
Seth Flynn
b819be49cd
ci: sign windows builds through azure
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-13 06:07:59 -05:00
Seth Flynn
a9f27ef075
Use libqrencode for MSA QR codes ( #3956 )
2025-11-13 05:11:38 -05:00
Seth Flynn
83b4a31144
build(vcpkg): use a minimal libqrencode build
...
`libpng` in vcpkg doesn't have the right patches (libpng@ed68998) to
build with universal binary support on macOS, so let's avoid building it
(we need to bump our baseline for this too)
Thanks for letting me know it was optional, Kode :)
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-13 04:13:02 -05:00
Seth Flynn
3b9e020115
feat(ui/MSALoginDialog): use libqrencode for qr codes
...
`qrcodegen` isn't available in most repositories, package discovery
scripts for it are maintained in a different repository, and they are
bugged for Windows at least. This basically forces us into vendoring it,
which isn't cool; libqrencode seems like viable alternative used by many
more apps
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-13 04:12:52 -05:00
TheKodeToad
29bb9fe9f3
Revert some things caught in the crossfire
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-11-10 19:01:24 +00:00
TheKodeToad
51a1e3bfe0
Merge remote-tracking branch 'upstream/develop' into no-ensure
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-11-10 18:56:32 +00:00
TheKodeToad
ff1690532d
fix mod select ( #4305 )
2025-11-10 16:55:21 +00:00
TheKodeToad
79fddf8a86
Remove icon from PageContainer header
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-11-10 00:03:30 +00:00
TheKodeToad
6475ce6623
Remove some redundant default values
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-11-09 22:21:46 +00:00
TheKodeToad
755ddd0f7f
Remove traces of ensure helpers
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-11-09 21:35:21 +00:00
TheKodeToad
e42c9d2a1d
Remove ensure JSON helpers
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-11-09 21:35:11 +00:00
Alexandru Ionut Tripon
b070ffaf72
Fix modpack search abort crash ( #4327 )
2025-11-09 23:17:55 +02:00
Alexandru Ionut Tripon
2563e280a4
fix: declare the flame icon like the others in multimc.qrc ( #4326 )
2025-11-09 23:17:40 +02:00
Alexandru Ionut Tripon
89edc7c826
chore: update to latest version of sparkle framework ( #4325 )
2025-11-09 23:17:18 +02:00
Alexandru Ionut Tripon
ca3cadc377
chore(nix): update lockfile ( #4324 )
2025-11-09 23:17:04 +02:00
Alexandru Ionut Tripon
20896855cc
Cleanup main.cpp ( #4318 )
2025-11-09 23:16:54 +02:00
Alexandru Ionut Tripon
fe01aabc10
Fix fractional scaling issues on skin preview ( #4310 )
2025-11-09 23:15:59 +02:00
Alexandru Ionut Tripon
609aa9f7f3
fix crash when failing to download file ( #4249 )
2025-11-09 23:08:20 +02:00
TheKodeToad
80db7437d0
Ensure correct image format when importing skin files ( #4053 )
2025-11-09 21:00:56 +00:00
Kenneth Chew
d937563ead
Pick out additional fixes, functionality to SecurityBookmarkFileAccess
...
Match the state of this class with the current state of the macOS sandbox PR
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com >
2025-11-09 14:43:57 -05:00
Kenneth Chew
efe1d71d35
Generate security-scoped bookmarks on startup
...
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com >
2025-11-09 14:43:57 -05:00
Kenneth Chew
710789b701
Use security-scoped bookmarks to keep track of data directory settings on macOS
...
This enables sandboxed apps to maintain access to user-selected items. In addition, for both sandboxed and nonsandboxed apps it can keep track of directories even if they are moved or renamed, and can remember access to directories in "sensitive" locations (such as the Documents folder or external drives).
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com >
2025-11-09 14:43:55 -05:00
TheKodeToad
98afd2086a
Make sure nullptr on_abort never gets called
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-11-09 10:52:24 +00:00
TheKodeToad
df35d5eb14
Fix crash when modpack search is aborted
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-11-09 10:44:23 +00:00
DioEgizio
00eef96f48
fix: declare the flame icon like the others in multimc.qrc
...
this fixes the flame icon not rendering on macOS with recent versions of Qt
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2025-11-09 10:43:36 +01:00
DioEgizio
42b53504be
chore: update to latest version of sparkle framework
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2025-11-09 09:01:24 +01:00
github-actions[bot]
e3be434e94
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15?narHash=sha256-kJ8lIZsiPOmbkJypG%2BB5sReDXSD1KGu2VEPNqhRa/ew%3D' (2025-10-31)
→ 'github:NixOS/nixpkgs/ae814fd3904b621d8ab97418f1d0f2eb0d3716f4?narHash=sha256-YRqMDEtSMbitIMj%2BJLpheSz0pwEr0Rmy5mC7myl17xs%3D' (2025-11-05)
2025-11-09 00:29:30 +00:00
Dylan Schooner
1fa486a795
Extend Ctrl+C functionality to requiredByItem and customPathItem
...
Refactor appendResource to remove redundant insertChildren calls
Signed-off-by: Dylan Schooner <dschooner05@gmail.com >
2025-11-08 10:55:34 -05:00
TheKodeToad
3a80dd10ea
Cleanup main.cpp
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-11-08 15:38:27 +00:00
Tayou
7e8cf628e8
Override Ctrl+C functionality for ReviewMessageBox items ( #4313 )
2025-11-08 07:47:35 +01:00
Dylan Schooner
a16026828e
Move shortcut connection to constructor
...
Add copy functionality for changelog on ResourceUpdateDialog
Signed-off-by: Dylan Schooner <dschooner05@gmail.com >
2025-11-07 13:40:54 -05:00
Dylan Schooner
6f4460b604
Apply override to ResourceUpdateDialog::appendResource
...
Signed-off-by: Dylan Schooner <dschooner05@gmail.com >
2025-11-07 02:30:45 -05:00
Dylan Schooner
8c0e8a319b
Overwrite Ctrl+C functionality for ReviewMessageBox items
...
Signed-off-by: Dylan Schooner <dschooner05@gmail.com >
2025-11-07 00:53:41 -05:00
Dylan Schooner
405650eff2
Fix fractional scaling issues
...
Signed-off-by: Dylan Schooner <dschooner05@gmail.com >
2025-11-06 20:00:22 -05:00
Seth Flynn
1e4e3fd914
build(cmake): match ninja multi-config for compile commands
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-06 17:41:22 -05:00
Seth Flynn
85d6e03a4e
build(cmake): always emit compile commands
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-06 17:41:21 -05:00
Seth Flynn
650ecb0bde
build(cmake): centralize preset files
...
Now that we don't need so many variants for each platform, this is much
more sensible
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-06 17:41:21 -05:00
Seth Flynn
ffdf00876e
build(cmake): use mutli-config generators for debug/release presets
...
This prevents us from hardcoding variants for each release type. Yay!
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-06 17:41:21 -05:00
Seth Flynn
c5c12ae8ce
Build for Windows on ARM with MSVC natively ( #3872 )
2025-11-06 17:39:12 -05:00
Tayou
9c38719170
program_info: fix macOS icon generation, use AppID in desktop file template ( #4164 )
2025-11-06 13:45:09 +01:00
Tayou
c5b5b02621
Implement Reverse Z projection matrix for skin model ( #4283 )
2025-11-06 13:42:50 +01:00
timoreo
f835d00f77
Check return value of 'QFile::open(QIODeviceBase::OpenMode)' ( #4274 )
2025-11-06 09:47:33 +01:00
timoreo
a34cdf0519
chore(nix): update lockfile ( #4256 )
2025-11-06 09:39:45 +01:00
timoreo
c8911f9f70
Fix Java memory field alignment when warning label is visible ( #4303 )
2025-11-06 09:32:35 +01:00
Seth Flynn
bc02af771d
ci: build for windows on arm with msvc natively
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-06 02:27:34 -05:00
Seth Flynn
9656db0f32
Update to Qt 6.9.3 ( #4300 )
2025-11-06 02:13:51 -05:00
Tayou
a7b302c1bb
Move credits to a HTML resource ( #4255 )
2025-11-05 18:53:28 +01:00
Trial97
31cdca77df
fix mod select
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-11-05 14:24:38 +02:00
TheKodeToad
d5309ffb05
Fix Java memory field alignment when warning label is visible
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-11-05 10:31:55 +00:00
Seth Flynn
fe6b90adc5
chore: qt 6.9.1 -> 6.9.3
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-11-03 17:40:38 -05:00
github-actions[bot]
42637a70db
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/544961dfcce86422ba200ed9a0b00dd4b1486ec5?narHash=sha256-EVAqOteLBFmd7pKkb0%2BFIUyzTF61VKi7YmvP1tw4nEw%3D' (2025-10-15)
→ 'github:NixOS/nixpkgs/2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15?narHash=sha256-kJ8lIZsiPOmbkJypG%2BB5sReDXSD1KGu2VEPNqhRa/ew%3D' (2025-10-31)
2025-11-02 00:28:51 +00:00
Tayou
f3bc2f0e9f
Check for mouse button before applying skin rotation ( #4279 )
2025-11-01 19:59:08 +01:00
Dylan Schooner
b488547054
Implement Reverse Z projection matrix for skin model
...
Signed-off-by: Dylan Schooner <dschooner05@gmail.com >
2025-10-31 12:30:17 -04:00
Dylan Schooner
8e4b66d71c
Check for mouse button before applying skin rotation
...
Signed-off-by: Dylan Schooner <dschooner05@gmail.com >
2025-10-31 03:02:46 -04:00
Dylan Schooner
8d42bdaf6b
Check return value of 'virtual bool QFile::open(QIODeviceBase::OpenMode)'
...
Signed-off-by: Dylan Schooner <dschooner05@gmail.com >
2025-10-30 03:15:14 -04:00
TheKodeToad
ff3968e36e
Fix brace war crime
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-10-27 11:36:38 +00:00
Alexandru Ionut Tripon
2982e6e7c9
chore(deps): update github artifact actions (major) ( #4251 )
2025-10-27 10:15:09 +02:00
TheKodeToad
8fddc353d5
Fix tests
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-10-25 15:14:32 +01:00
TheKodeToad
21a8ac530a
Move credits to a HTML resource
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-10-25 14:34:42 +01:00
TheKodeToad
d626604b5e
Fix issues with log level handling and clean up code
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-10-25 14:20:15 +01:00
renovate[bot]
8c9ad0664f
chore(deps): update github artifact actions
2025-10-24 23:49:31 +00:00
Trial97
2981d9109b
fix crash when failing to download file
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-10-23 19:34:44 +03:00
Seth Flynn
3c5431176b
chore(nix): update lockfile ( #4202 )
2025-10-20 09:58:38 -04:00
Seth Flynn
41fe18d378
chore(deps): update cachix/install-nix-action digest to fd24c48 ( #4227 )
2025-10-20 09:58:15 -04:00
Seth Flynn
9bb25b8b43
chore(deps): update github/codeql-action action to v4 ( #4213 )
2025-10-20 09:57:57 -04:00
Alexandru Ionut Tripon
a550277fda
fix: warn before double-click toggling resource while game is running ( #4232 )
2025-10-19 13:07:02 +03:00
github-actions[bot]
2dbcd8ea30
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/e643668fd71b949c53f8626614b21ff71a07379d?narHash=sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o%3D' (2025-09-24)
→ 'github:NixOS/nixpkgs/544961dfcce86422ba200ed9a0b00dd4b1486ec5?narHash=sha256-EVAqOteLBFmd7pKkb0%2BFIUyzTF61VKi7YmvP1tw4nEw%3D' (2025-10-15)
2025-10-19 00:29:21 +00:00
renovate[bot]
da39885249
chore(deps): update cachix/install-nix-action digest to fd24c48
2025-10-15 11:00:47 +00:00
Edgars Cīrulis
91a02a1dc6
style: run-run clang-format on launcher/*
...
Signed-off-by: Edgars Cīrulis <e.cirulis@proton.me >
2025-10-14 04:05:56 +03:00
Edgars Cīrulis
577f9ca94c
style: remove duplicate #include headers
...
Signed-off-by: Edgars Cīrulis <e.cirulis@proton.me >
2025-10-14 04:03:02 +03:00
Alexandru Ionut Tripon
6a40ea4e69
fix: prioritize .ftbapp/version.json in FTB App import ( #4207 )
2025-10-13 13:20:15 +03:00
renovate[bot]
d399d241eb
chore(deps): update github/codeql-action action to v4
2025-10-07 20:37:17 +00:00
Gingeh
abc63e4432
fix: warn before double-click toggling resource while game is running
...
Closes #4119
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com >
2025-10-07 16:17:43 +11:00
Octol1ttle
ea004846a9
Create a unified dialog to ask user for offline name
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2025-10-07 01:07:50 +05:00
Marco von Rosenberg
182d130c18
fix: prioritize .ftbapp/version.json in FTB App import
...
Newer versions of FTB App create a stub version.json in the instance
root with only a comment directing to .ftbapp/version.json. The old
logic would find this stub file first and fail to parse it, causing
modpacks to not be detected.
This fix checks .ftbapp/version.json first (newer location) before
falling back to the root version.json (older location).
Signed-off-by: Marco von Rosenberg <codingmarco@gmail.com >
2025-10-06 21:56:19 +09:00
timoreo
8b5e91920d
chore(deps): update korthout/backport-action action to v3.4.1 ( #4191 )
2025-10-02 22:02:20 +02:00
timoreo
c87c1b6988
chore(deps): update cachix/install-nix-action digest to 9280e7a ( #4195 )
2025-10-02 22:01:50 +02:00
renovate[bot]
acb4cee0ac
chore(deps): update cachix/install-nix-action digest to 9280e7a
2025-10-02 17:58:51 +00:00
renovate[bot]
fca874a641
chore(deps): update korthout/backport-action action to v3.4.1
2025-10-01 20:43:52 +00:00
timoreo
60f81d54b3
chore(nix): update lockfile ( #4186 )
2025-09-30 16:09:57 +02:00
github-actions[bot]
e34cd3ef88
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/8eaee110344796db060382e15d3af0a9fc396e0e?narHash=sha256-iCGWf/LTy%2BaY0zFu8q12lK8KuZp7yvdhStehhyX1v8w%3D' (2025-09-19)
→ 'github:NixOS/nixpkgs/e643668fd71b949c53f8626614b21ff71a07379d?narHash=sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o%3D' (2025-09-24)
2025-09-28 00:28:36 +00:00
Seth Flynn
fcd3852621
Actions fixes for setup-dependencies/macOS and package/Windows ( #4182 )
2025-09-25 10:59:25 -04:00
Octol1ttle
158e001660
fix(ci/windows): remove erroneous default
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2025-09-25 18:51:57 +05:00
Octol1ttle
e9ffb40e2b
fix(ci/macOS): run vcpkg on non-debug builds too
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2025-09-25 18:50:27 +05:00
timoreo
e4fb28760b
chore(deps): update actions/cache action to v4.3.0 ( #4179 )
2025-09-25 09:41:46 +02:00
renovate[bot]
eb26d655b0
chore(deps): update actions/cache action to v4.3.0
2025-09-24 14:50:40 +00:00
Tayou
e1a7f6cac4
fix: modrinth modpacks icon importing ( #4171 )
2025-09-22 20:06:26 +02:00
Trial97
88399cf922
fix: modrinth modpacks icon importing
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-09-22 14:47:56 +03:00
Richard Voigtmann
b0594dbb06
updated Assets.car to the icon suggestion from hw2007
...
Signed-off-by: Richard Voigtmann <richard.v.voigtmann@gmail.com >
2025-09-22 09:56:14 +02:00
timoreo
6aa728b12a
ci: macos-13 -> macos-15-intel ( #4166 )
2025-09-22 09:48:16 +02:00
Tayou
6f1ebfbb54
Avoid pull_request_target in Nix workflow, always use upstream Nix ( #4167 )
2025-09-22 08:59:14 +02:00
Alexandru Ionut Tripon
f7e58723e0
Fix typo in status message for asset files ( #4161 )
2025-09-22 00:02:00 +03:00
Alexandru Ionut Tripon
9c9e0d2945
FindJavaPaths: fix sdkman search, add asdf search ( #4163 )
2025-09-22 00:01:31 +03:00
Seth Flynn
761cae8d9c
chore(deps): update cachix/install-nix-action digest to a809471 ( #4165 )
2025-09-21 16:59:31 -04:00
Seth Flynn
37dabc7c9a
chore(nix): update lockfile ( #4162 )
2025-09-21 16:57:25 -04:00
Seth Flynn
7ba91ca488
ci(nix): always use upstream nix
...
This ensures evaluation is consistent between out-of-tree and in-tree
runs
It also probably won't be possible to install upstream Nix with the
Determinate installer action soon so.....
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-09-21 16:28:07 -04:00
Seth Flynn
87174a0d5a
ci(get-merge-commit): drop
...
No longer used after `pull_request_target` was NUKED
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-09-21 16:27:42 -04:00
Seth Flynn
90855a7cc0
ci(nix): pull_request_target -> pull_request
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-09-21 16:25:09 -04:00
Seth Flynn
7e4a4cfd11
ci(nix): flakehub -> magic-nix-cache & gha cache
...
This will help us avoid `pull_request_target`, etc.
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-09-21 16:23:15 -04:00
Seth Flynn
ffcd733d70
ci: macos-13 -> macos-15-intel
...
https://github.blog/changelog/2025-09-19-github-actions-macos-13-runner-image-is-closing-down/
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-09-21 16:15:10 -04:00
renovate[bot]
d5c0ff32a7
chore(deps): update cachix/install-nix-action digest to a809471
2025-09-21 13:38:54 +00:00
Octol1ttle
d2516c355c
fix: use Launcher_AppID in desktop file template
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2025-09-21 15:58:20 +05:00
Octol1ttle
2fa50c5d50
fix(genicons/macOS): use correct filename suffixes, copy output file to current dir
...
Fixes: 6a474a0125 ("fix: update icon generate script")
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2025-09-21 15:56:18 +05:00
Octol1ttle
b605685187
feat(FindJavaPaths): also use asdf to find Java
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2025-09-21 13:45:35 +05:00
Octol1ttle
542ad146ad
fix(FindJavaPaths): use SDKMAN_DIR env var to find sdkman installations
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2025-09-21 13:44:38 +05:00
github-actions[bot]
19dcc5b37a
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/c23193b943c6c689d70ee98ce3128239ed9e32d1?narHash=sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820%3D' (2025-09-13)
→ 'github:NixOS/nixpkgs/8eaee110344796db060382e15d3af0a9fc396e0e?narHash=sha256-iCGWf/LTy%2BaY0zFu8q12lK8KuZp7yvdhStehhyX1v8w%3D' (2025-09-19)
2025-09-21 00:27:56 +00:00
Kat Tschan
418b84a599
Fix typo in status message for asset files
...
Signed-off-by: Kat Tschan <kat@kattschan.co.uk >
2025-09-20 16:39:53 -04:00
Richard Voigtmann
d0737eecc5
Added macOS 26 Liquid Glass Icon Support. See: #4149
...
Signed-off-by: Richard Voigtmann <richard.v.voigtmann@gmail.com >
2025-09-20 19:42:04 +02:00
Alexandru Ionut Tripon
28b755cf04
Remove unused code ( #4158 )
2025-09-19 13:37:49 +03:00
TheKodeToad
d384970694
Merge remote-tracking branch 'upstream/develop' into unused-code
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-09-19 11:06:34 +01:00
Alexandru Ionut Tripon
51a444624d
Replace getThemedIcon with QIcon::fromTheme/APPLICATION->logo() ( #4156 )
2025-09-19 12:20:50 +03:00
TheKodeToad
49b238f384
Properly remove gameoptions
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-09-19 09:42:13 +01:00
TheKodeToad
7789ba8608
Remove unused code
...
GameOptions.{h,cpp}, GameOptionsPage.{h,cpp}, ThemeWizardPage.cpp
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-09-19 09:04:29 +01:00
timoreo
7390bfcaff
Fix crash in Rule::apply ( #4157 )
2025-09-19 08:58:15 +02:00
TheKodeToad
5d46f79f19
Fix crash in Rule::apply
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-09-19 00:25:26 +01:00
TheKodeToad
cd4f119e4b
Replace getThemedIcon with APPLICATION->logo()
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-09-19 00:07:05 +01:00
timoreo
1724bdaeb9
Remove some unnecessary const_casting ( #4150 )
2025-09-18 16:17:55 +02:00
TheKodeToad
7c9c9432dd
Remove pointless const_cast in ProgressWidget
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-09-17 11:24:10 +01:00
TheKodeToad
24726ea621
Avoid const-cast in WorldList - subclass is unnecessary and result->formats() is correct
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-09-17 10:50:54 +01:00
TheKodeToad
5ef61aa445
Make BaseVersion const-correct in order to remove const-cast from Meta::Version
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-09-17 10:30:00 +01:00
Alexandru Ionut Tripon
b7b06c0e48
Remove some duplicate code ( #3828 )
2025-09-16 11:03:30 +03:00
Trial97
29cff14fd6
removed some duplicate code
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-09-15 18:25:07 +03:00
Trial97
ab3bfb0f74
make universal resource type
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-09-15 18:25:06 +03:00
timoreo
668ff45403
chore(deps): update hendrikmuhs/ccache-action action to v1.2.19 ( #4132 )
2025-09-15 15:01:17 +02:00
timoreo
57dff0797d
chore(deps): update cachix/install-nix-action digest to 7be5dee ( #4136 )
2025-09-15 15:00:44 +02:00
timoreo
b8ff2ce406
Fix minor annoyances ( #4086 )
2025-09-15 13:28:01 +02:00
timoreo
f665579c62
Simplify Rule class ( #4040 )
2025-09-15 10:14:15 +02:00
timoreo
529198702d
chore(nix): update lockfile ( #4138 )
2025-09-15 10:11:34 +02:00
github-actions[bot]
89d7ffdc68
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/d0fc30899600b9b3466ddb260fd83deb486c32f1?narHash=sha256-rw/PHa1cqiePdBxhF66V7R%2BWAP8WekQ0mCDG4CFqT8Y%3D' (2025-09-02)
→ 'github:NixOS/nixpkgs/c23193b943c6c689d70ee98ce3128239ed9e32d1?narHash=sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820%3D' (2025-09-13)
2025-09-14 00:27:15 +00:00
renovate[bot]
7f4b157087
chore(deps): update cachix/install-nix-action digest to 7be5dee
2025-09-13 06:24:19 +00:00
timoreo
31852724b1
Fix resource update with loaders ( #3108 )
2025-09-12 11:14:02 +02:00
renovate[bot]
170071746f
chore(deps): update hendrikmuhs/ccache-action action to v1.2.19
2025-09-10 17:48:01 +00:00
timoreo
2ed5650c4f
catpacks+gif= ❤️ ( #3315 )
2025-09-08 17:29:46 +02:00
timoreo
d877f07662
Properly refresh modpack search upon changing filters ( #4043 )
2025-09-08 17:19:34 +02:00
timoreo
d694e58667
chore(deps): update actions/setup-java action to v5 ( #4082 )
2025-09-08 17:08:25 +02:00
timoreo
b6dcef8e90
chore(nix): update lockfile ( #4092 )
2025-09-08 17:06:34 +02:00
timoreo
78700aa8fb
chore(deps): update actions/stale action to v10 ( #4117 )
2025-09-08 17:05:57 +02:00
timoreo
43e786e9e0
chore(deps): update cachix/install-nix-action digest to 56a7bb7 ( #4122 )
2025-09-08 17:05:33 +02:00
github-actions[bot]
d9e5afcaa0
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/fbcf476f790d8a217c3eab4e12033dc4a0f6d23c?narHash=sha256-wNO3%2BKs2jZJ4nTHMuks%2BcxAiVBGNuEBXsT29Bz6HASo%3D' (2025-08-14)
→ 'github:NixOS/nixpkgs/d0fc30899600b9b3466ddb260fd83deb486c32f1?narHash=sha256-rw/PHa1cqiePdBxhF66V7R%2BWAP8WekQ0mCDG4CFqT8Y%3D' (2025-09-02)
2025-09-07 00:27:45 +00:00
renovate[bot]
7e0b9511b4
chore(deps): update cachix/install-nix-action digest to 56a7bb7
2025-09-06 12:54:37 +00:00
renovate[bot]
e5653b36cc
chore(deps): update actions/stale action to v10
2025-09-04 04:47:44 +00:00
Tayou
320cf0b3c2
Update TranslationsModel.cpp ( #4110 )
2025-09-04 06:47:22 +02:00
Cinnamon
9ecc11787f
Update TranslationsModel.cpp
...
Signed-off-by: Cinnamon <rblossom.dev@gmail.com >
2025-08-31 10:14:40 -05:00
Tayou
5480ce6b44
Fix resourcepack parsing ( #4084 )
2025-08-21 19:36:42 +02:00
TheKodeToad
2b0d135afd
More consistent padding and frames
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-08-21 15:08:18 +01:00
TheKodeToad
83736950d9
Consistent case style
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-08-21 15:08:18 +01:00
TheKodeToad
81e4f1cf7a
Prevent View Configs showing in places it shouldn't
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-08-21 15:08:18 +01:00
TheKodeToad
40f45b19f4
Make search bars consistent
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-08-21 15:08:16 +01:00
Trial97
634a5d18c4
fix tests
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-08-21 15:14:05 +03:00
TheKodeToad
22d651f041
Fix buggy movement in screenshots page
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-08-21 13:05:13 +01:00
Trial97
8c9b504382
fix: datapack/resourcepack parsing
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-08-21 15:00:00 +03:00
TheKodeToad
31e0c07bf7
Fix #4083 - server address text box is enabled even if auto-join is disabled
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-08-21 12:45:48 +01:00
Trial97
9c3c74d055
fix: ensure correct skin format
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-08-21 10:09:49 +03:00
renovate[bot]
c596c6eb48
chore(deps): update actions/setup-java action to v5
2025-08-21 06:51:14 +00:00
timoreo
542ab62ab7
Refactor Filter API ( #4039 )
2025-08-20 16:45:48 +02:00
TheKodeToad
0f6d589c6b
Merge branch 'PrismLauncher:develop' into refactor-filter
2025-08-20 14:48:15 +01:00
Seth Flynn
accb3382aa
style(nix): format with modern nixfmt ( #4066 )
2025-08-18 12:16:13 -04:00
Seth Flynn
4a7772e2d1
Use C++20 ( #3957 )
2025-08-18 12:15:53 -04:00
timoreo
b6157fa8e4
chore(nix): update lockfile ( #4072 )
2025-08-18 16:18:57 +02:00
TheKodeToad
8420e75cfa
Merge branch 'develop' into refactor-filter
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-08-18 11:40:38 +01:00
github-actions[bot]
4d4b8a1fd0
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/c2ae88e026f9525daf89587f3cbee584b92b6134?narHash=sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs%3D' (2025-08-06)
→ 'github:NixOS/nixpkgs/fbcf476f790d8a217c3eab4e12033dc4a0f6d23c?narHash=sha256-wNO3%2BKs2jZJ4nTHMuks%2BcxAiVBGNuEBXsT29Bz6HASo%3D' (2025-08-14)
2025-08-17 00:30:33 +00:00
Seth Flynn
bc76960dd7
style(nix): format with modern nixfmt
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-08-15 13:56:28 +00:00
Seth Flynn
3c93ce8385
chore(deps): update korthout/backport-action action to v3.3.0 ( #4061 )
2025-08-15 09:54:22 -04:00
Seth Flynn
847c3238ce
chore(deps): update actions/cache action to v4.2.4 ( #4046 )
2025-08-15 09:54:02 -04:00
Seth Flynn
ee33aa81bd
chore(deps): update actions/checkout action to v5 ( #4056 )
2025-08-15 09:53:46 -04:00
renovate[bot]
a261718009
chore(deps): update korthout/backport-action action to v3.3.0
2025-08-14 17:10:11 +00:00
TheKodeToad
2ae9b63a22
Add Ornithe, LegacyFabric and Rift mod loader filters ( #4041 )
2025-08-11 23:14:20 +01:00
renovate[bot]
29dc75ec63
chore(deps): update actions/checkout action to v5
2025-08-11 15:25:38 +00:00
renovate[bot]
a1956ec53a
chore(deps): update actions/cache action to v4.2.4
2025-08-11 06:44:42 +00:00
timoreo
0e38deb199
chore(deps): update actions/download-artifact action to v5 ( #4044 )
2025-08-11 07:34:32 +02:00
timoreo
9afeb1a54f
chore(nix): update lockfile ( #4016 )
2025-08-11 07:33:59 +02:00
github-actions[bot]
1cc6072a94
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/6e987485eb2c77e5dcc5af4e3c70843711ef9251?narHash=sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo%3D' (2025-07-16)
→ 'github:NixOS/nixpkgs/c2ae88e026f9525daf89587f3cbee584b92b6134?narHash=sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs%3D' (2025-08-06)
2025-08-10 00:32:11 +00:00
renovate[bot]
9f5bc882b2
chore(deps): update actions/download-artifact action to v5
2025-08-06 02:15:15 +00:00
TheKodeToad
d1f7bcd6c6
Properly refresh modpack search upon changing filters
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-08-05 18:55:07 +01:00
moehreag
98ae99c513
add Rift in the two places I missed
...
Signed-off-by: moehreag <moehreag@gmail.com >
2025-08-05 12:09:27 +02:00
TheKodeToad
8275529afb
A few tweaks to new ui ( #4033 )
2025-08-05 10:44:57 +01:00
moehreag
100b209043
Add Ornithe, LegacyFabric and Rift mod loader filters
...
Signed-off-by: moehreag <moehreag@gmail.com >
2025-08-05 11:12:22 +02:00
TheKodeToad
aaa1a74875
Reintroduce some encapulation
...
As much as I like keeping things as simple as possible it's probably best to be consistent with other library related stuff
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-08-04 15:43:05 +01:00
TheKodeToad
3ba9483011
Simplify Rule
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-08-04 15:36:11 +01:00
TheKodeToad
e14b18ca71
Fix tests (oops)
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-08-04 15:31:38 +01:00
TheKodeToad
d7eddd3773
Replace IPathMatcher stuff with Filter
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-08-04 15:03:22 +01:00
TheKodeToad
d41db5253e
Refactor Filter
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-08-04 14:02:54 +01:00
TheKodeToad
6abd7ac673
Remove invisible GroupBoxes (they appear on Fusion)
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-08-04 10:22:25 +01:00
TheKodeToad
99f6a02a14
Cat Fit -> Cat Scaling
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-08-03 12:14:03 +01:00
TheKodeToad
6ab1a246cb
Use radio buttons for Instance Renaming Mode
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-08-03 12:09:10 +01:00
Tayou
79b7e277f1
Explicitly install Java for Windows in CI ( #4030 )
2025-08-01 08:24:50 +02:00
Seth Flynn
b196c5d59f
ci(setup-deps/windows): install java
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-07-31 21:19:37 -04:00
Trial97
29231e2038
chore: update to cxx20
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-07-30 18:52:52 +03:00
timoreo
9565affa64
ci(macos): use vcpkg ( #3977 )
2025-07-30 06:54:08 +02:00
timoreo
b5c86ffee6
ensure that both cape and skin are downloaded via https ( #4006 )
2025-07-30 06:51:16 +02:00
timoreo
0710f3667f
update ftb import to consider meta folder ( #4017 )
2025-07-30 06:50:17 +02:00
TheKodeToad
a85babefaa
fix: use new Mojang API endpoint for Username->UUID resolution ( #4012 )
2025-07-27 13:53:35 +01:00
Trial97
f40117b431
update ftb import to consider meta folder
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-07-27 14:59:02 +03:00
Octol1ttle
eefe0375af
fix(mojang api): use new endpoint for Username->UUID resolution
...
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com >
2025-07-26 18:41:34 +05:00
Trial97
597309ceeb
ensure that both cape and skin are downloaded via https
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-07-24 18:44:46 +03:00
Trial97
2e428330f4
support gif catpacks
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-07-24 11:30:52 +03:00
Sefa Eyeoglu
b90cda5eef
chore(deps): update cachix/install-nix-action digest to c134e4c ( #4004 )
2025-07-24 10:12:38 +02:00
renovate[bot]
a8eea411e9
chore(deps): update cachix/install-nix-action digest to c134e4c
2025-07-23 23:28:11 +00:00
Seth Flynn
0ae0996adc
build(vcpkg): patch meson to support universal binaries
...
tomlplusplus uses Meson as a build system, which makes us come across a
small bug when building Universal Binaries with our custom triplet
I hate vendoring this
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-07-22 18:04:55 -04:00
Trial97
bd570aa5d1
fix:resource update with loaders
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-07-22 13:33:19 +03:00
Trial97
a75713897d
chore:renamed variables to camelCase
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-07-22 13:33:19 +03:00
Alexandru Ionut Tripon
078de50951
make universal resource type ( #3541 )
2025-07-22 13:31:05 +03:00
Alexandru Ionut Tripon
e043242a8e
Reduce usage of [[nodiscard]] attributes ( #3952 )
2025-07-22 13:30:45 +03:00
Alexandru Ionut Tripon
a7f3cbb6f5
Add "Babric" and "BTA (Babric)" filters as shown on Modrinth ( #3961 )
2025-07-22 13:30:33 +03:00
Alexandru Ionut Tripon
0c0111c03c
Apply selected style to NSWindow elements (e.g. title bar) on macOS ( #3986 )
2025-07-22 13:30:22 +03:00
timoreo
43c07cab4d
chore(nix): update lockfile ( #3993 )
2025-07-21 15:02:37 +02:00
timoreo
535bc4b6c6
chore(deps): update determinatesystems/update-flake-lock action to v27 ( #3982 )
2025-07-21 15:02:09 +02:00
timoreo
1794768b20
chore(deps): update determinatesystems/nix-installer-action action to v19 ( #3981 )
2025-07-21 15:01:44 +02:00
github-actions[bot]
43b2b07e0e
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/9807714d6944a957c2e036f84b0ff8caf9930bc0?narHash=sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X%2BxgOL0%3D' (2025-07-08)
→ 'github:NixOS/nixpkgs/6e987485eb2c77e5dcc5af4e3c70843711ef9251?narHash=sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo%3D' (2025-07-16)
2025-07-20 00:32:26 +00:00
Trial97
b60b577d25
rename VALID_RESOURCES static variable
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-07-18 18:26:25 +03:00
Alexandru Ionut Tripon
6f23c6ea41
Update launcher/modplatform/ResourceType.h
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2025-07-18 18:22:46 +03:00
Trial97
9a51cd55df
make universal resource type
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-07-18 16:17:22 +03:00
timoreo
d63dba43d6
Add ability to change assets download server ( #3875 )
2025-07-18 09:14:45 +02:00
timoreo
31d7c3a727
Don't always enable optional mods manually downloaded from CurseForge ( #3864 )
2025-07-18 08:31:07 +02:00
clague
78dc42f4dd
fix grammar
...
Co-authored-by: Seth Flynn <getchoo@tuta.io >
Signed-off-by: clague <93119153+clague@users.noreply.github.com >
2025-07-16 14:56:44 +08:00
Kenneth Chew
677a7d7a05
Unregister window observer before theme manager is deallocated
...
Technically this probably isn't actually necessary since ThemeManager looks like it should remain allocated until the program quits, but...
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com >
2025-07-16 01:15:56 -04:00
Kenneth Chew
3e65d3a9b5
Apply selected style to window elements on macOS
...
Qt doesn't apply the proper style to elements such as the title bar or text shadows, so this must be done in native code.
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com >
2025-07-16 00:34:42 -04:00
renovate[bot]
49daf62114
chore(deps): update determinatesystems/update-flake-lock action to v27
2025-07-15 03:24:29 +00:00
renovate[bot]
3cc8362662
chore(deps): update determinatesystems/nix-installer-action action to v19
2025-07-15 03:24:25 +00:00
Seth Flynn
5c8ce8db66
build(vcpkg): add univesal-osx triplet
...
vcpkg doesn't officially support universal binaries, but this should
function as a workaround until it does one day
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-07-13 16:33:35 -04:00
Seth Flynn
4614d683b3
ci(macos): use vcpkg
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-07-13 16:33:35 -04:00
Seth Flynn
9210d68ed1
ci(setup-deps/windows): try to fix vcpkg binary cache auth
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-07-13 16:33:33 -04:00
Seth Flynn
0dbaeef8a6
chore(nix): update lockfile ( #3972 )
2025-07-13 11:50:39 -04:00
Seth Flynn
1a6ffaeb49
chore(deps): update cachix/install-nix-action digest to f0fe604 ( #3971 )
2025-07-13 11:50:20 -04:00
github-actions[bot]
f5fffd27ab
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/5c724ed1388e53cc231ed98330a60eb2f7be4be3?narHash=sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8%2B%2BxWA8itO4%3D' (2025-07-04)
→ 'github:NixOS/nixpkgs/9807714d6944a957c2e036f84b0ff8caf9930bc0?narHash=sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X%2BxgOL0%3D' (2025-07-08)
2025-07-13 00:31:57 +00:00
renovate[bot]
5fb6022b47
chore(deps): update cachix/install-nix-action digest to f0fe604
2025-07-12 13:50:35 +00:00
Alexandru Ionut Tripon
058717bcc2
chore(deps): update cachix/install-nix-action digest to cebd211 ( #3967 )
2025-07-12 08:28:16 +03:00
renovate[bot]
9ce6d3571e
chore(deps): update cachix/install-nix-action digest to cebd211
2025-07-11 22:00:35 +00:00
matthewperiut
20a833e1b9
Add "Babric" and "Babric (BTA)" as shown on Modrinth. Add "Show More" button to allow for space efficiency and readiness to add all other Modrinth modloader types.
...
Signed-off-by: matthewperiut <matthewperiut@gmail.com >
2025-07-10 11:12:27 -04:00
Seth Flynn
af73cfa20f
Add support for vcpkg ( #3742 )
2025-07-09 06:50:41 -04:00
Seth Flynn
463cf43161
ci(setup-deps/windows): use vcpkg for msvc
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-07-09 05:22:50 -04:00
seth
7f78f6b85f
build: add support for vcpkg
...
Signed-off-by: seth <getchoo@tuta.io >
2025-07-09 05:22:50 -04:00
seth
a5f5d14538
build(cmake): fallback to pkg-config discovery for tomlplusplus
...
Some distributions of it (like in vcpkg *wink*) won't contain CMake files
Signed-off-by: seth <getchoo@tuta.io >
2025-07-09 05:22:44 -04:00
Alexandru Ionut Tripon
4072e2fa3d
Modernize launcher bundling ( #3741 )
2025-07-09 11:13:06 +03:00
timoreo
37a9271d5b
propagate side as enum instead of Qstring ( #3544 )
2025-07-09 10:01:51 +02:00
Seth Flynn
f3b778342e
build(cmake): replace INSTALL_BUNDLE with install component
...
Considering this doesn't affect the build, it has never made much sense
for it to be a build option or require rereconfiguration of the project
to change
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-07-08 11:03:19 -04:00
seth
1688db055e
build: modernize launcher bundling
...
Replaces fixup_bundle with Qt's deployment scripts and CMake's newer
RUNTIME_DEPENDENCY_SET target, making it a bit easier to find and
include linked dependencies with less code on our end
Signed-off-by: seth <getchoo@tuta.io >
2025-07-08 11:03:19 -04:00
Seth Flynn
91abebbb59
build: let cmake know when we're cross compiling on msvc
...
This (unsurprisingly) makes some things actually work as they're
expected to when cross compiling, like windeployqt
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-07-08 11:03:19 -04:00
Seth Flynn
822b10e46e
Update to Qt 6.9 ( #3934 )
2025-07-07 20:18:34 -04:00
TheKodeToad
6d19984873
Add [[nodiscard]] guidelines
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-07-07 20:58:22 +01:00
TheKodeToad
29d73a474f
Reduce usage of [[nodiscard]] attributes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-07-07 20:56:29 +01:00
Alexandru Ionut Tripon
9559204c8f
chore(nix): update lockfile ( #3945 )
2025-07-06 22:24:18 +03:00
github-actions[bot]
fe1a488651
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/30e2e2857ba47844aa71991daa6ed1fc678bcbb7?narHash=sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM%3D' (2025-06-27)
→ 'github:NixOS/nixpkgs/5c724ed1388e53cc231ed98330a60eb2f7be4be3?narHash=sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8%2B%2BxWA8itO4%3D' (2025-07-04)
2025-07-06 00:30:52 +00:00
Seth Flynn
5b6276ac0f
Don't bundle Qt with the Linux Portable build ( #3940 )
2025-07-05 17:30:34 -04:00
Seth Flynn
50c8cddb5b
build(linux): don't bundle qt with portable zip
...
This was mainly implemented to work around an ABI incompatibility in
Arch Linux, which is no longer a major issue as they have an official
binary package for us now. Many ABI incompatibility issues still remain
(as not every distribution is, or similar to, Ubuntu) which this doesn't
even begin to scratch the surface of fixing, and isn't a very supported
use case in Linux-land outside of our mostly self-rolled `fixup_bundle`
Users who experience ABI incompatibilities with our binaries would be
*much* better served using Flatpak or AppImage, as they can guarntee^*
compatibility with any host system through a complete bundle; packagers
who experience ABI incompatibilities should probably build the launcher
against their own distribution, like Arch and many others do
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-07-05 02:50:10 -04:00
Seth Flynn
19e69b7197
Use Ninja for MSVC release and cross builds ( #3938 )
2025-07-05 02:38:51 -04:00
Seth Flynn
ba6f49b891
ci: glob directory matches
...
This makes sure *all* changes to directories trigger the given workflows
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-07-04 05:27:41 -04:00
Seth Flynn
3257abaa34
build(cmake): use ninja for msvc release and cross builds
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-07-04 05:16:35 -04:00
Seth Flynn
fde66a11ce
build(cmake): apply workaround for ninja in release mode on msvc
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-07-04 05:13:01 -04:00
Seth Flynn
300851e603
chore(deps): update determinatesystems/update-flake-lock action to v26 ( #3937 )
2025-07-04 03:07:23 -04:00
Seth Flynn
7e3a0f5dc3
chore(deps): update determinatesystems/nix-installer-action action to v18 ( #3936 )
2025-07-04 03:07:01 -04:00
renovate[bot]
907f661c57
chore(deps): update determinatesystems/update-flake-lock action to v26
2025-07-03 17:40:45 +00:00
renovate[bot]
e12c4d0abc
chore(deps): update determinatesystems/nix-installer-action action to v18
2025-07-03 17:40:41 +00:00
Seth Flynn
1deda8cdf4
build(cmake): set minimum version to 3.22
...
This requirement was introduced in Qt 6.9
https://doc.qt.io/qt-6/whatsnew69.html#build-system-changes
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-07-03 04:46:18 -04:00
Seth Flynn
59ed25fad1
chore: update to qt 6.9
...
https://doc.qt.io/qt-6/whatsnew69.html
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-07-03 04:20:52 -04:00
timoreo
d4a50166e8
Correct Corruption in CustomCommands ( #3933 )
2025-07-03 07:56:59 +02:00
Seth Flynn
364ebbcbe6
ci: run on changes to .ui files
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-07-03 01:25:49 -04:00
Seth Flynn
56fa6586ab
fix(ui/CustomCommands): memory corruption in labelPostExitCmd
...
Making a QLabel a buddy of itself causes a double free and crashing on
deconstruction in some cases (like MSVC)
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-07-03 01:20:45 -04:00
Seth Flynn
ae9d0b2d6b
Deploy PDBs with Windows debug builds ( #3923 )
2025-07-01 23:21:44 -04:00
seth
71be6eb7d8
build: deploy pdbs with windows builds
...
Signed-off-by: seth <getchoo@tuta.io >
2025-06-30 15:22:51 -04:00
seth
dac73b394a
build: emit pdbs on mingw
...
Signed-off-by: seth <getchoo@tuta.io >
2025-06-30 15:21:04 -04:00
Alexandru Ionut Tripon
4d70d4cafe
chore(nix): update lockfile ( #3920 )
2025-06-29 16:49:32 +03:00
Alexandru Ionut Tripon
3d4ed25dee
fix: icon import with dot in name ( #3919 )
2025-06-29 16:49:17 +03:00
github-actions[bot]
be62a7d0a2
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/08f22084e6085d19bcfb4be30d1ca76ecb96fe54?narHash=sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50%3D' (2025-06-19)
→ 'github:NixOS/nixpkgs/30e2e2857ba47844aa71991daa6ed1fc678bcbb7?narHash=sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM%3D' (2025-06-27)
2025-06-29 00:31:19 +00:00
Trial97
53dcc15766
fix: icon import with dot in name
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-06-28 23:34:13 +03:00
Alexandru Ionut Tripon
497cea0bd5
fix typo in APIPage.ui ( #3916 )
2025-06-27 12:48:15 +03:00
Alexandru Ionut Tripon
957a577216
fix: escape quotes in shorcut creation arguments ( #3909 )
2025-06-27 12:47:47 +03:00
Alexandru Ionut Tripon
be310a272a
chore(deps): update cachix/install-nix-action digest to f0fe604 ( #3906 )
2025-06-27 12:47:00 +03:00
Ismail
24d70c773e
fix typo in APIPage.ui
...
Signed-off-by: Ismail <ismail.choudhury33@gmail.com >
2025-06-27 00:48:31 +01:00
Alexandru Ionut Tripon
95594caa12
chore(deps): update korthout/backport-action action to v3.2.1 ( #3913 )
2025-06-26 12:02:17 +03:00
renovate[bot]
bcdbbab7c0
chore(deps): update korthout/backport-action action to v3.2.1
2025-06-26 08:37:29 +00:00
Trial97
cdf8ad2c94
fix: escape quetes in shorcut creation arguments
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-06-25 13:13:42 +03:00
renovate[bot]
ec63f54f48
chore(deps): update cachix/install-nix-action digest to f0fe604
2025-06-24 17:38:33 +00:00
Alexandru Ionut Tripon
e0c569365f
chore(nix): update lockfile ( #3899 )
2025-06-22 11:20:12 +03:00
github-actions[bot]
f29c5f5581
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/ee930f9755f58096ac6e8ca94a1887e0534e2d81?narHash=sha256-Kh9K4taXbVuaLC0IL%2B9HcfvxsSUx8dPB5s5weJcc9pc%3D' (2025-06-13)
→ 'github:NixOS/nixpkgs/08f22084e6085d19bcfb4be30d1ca76ecb96fe54?narHash=sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50%3D' (2025-06-19)
2025-06-22 00:30:42 +00:00
Seth Flynn
1064e5dc57
fix: nightly link ( #3897 )
2025-06-21 14:01:06 -04:00
Trial97
7eb07451ce
fix: nightly link
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-06-21 17:35:51 +03:00
Alexandru Ionut Tripon
b6c1ce31a6
Fix crash wrong component ( #3868 )
2025-06-19 00:02:21 +03:00
Tayou
be2e2ec629
Improve the message when component metadata fails to download ( #3884 )
2025-06-17 10:14:39 +02:00
Seth Flynn
1889dca401
chore: refresh metainfo.xml.in ( #3881 )
2025-06-16 20:40:41 -04:00
TheKodeToad
8711913ac3
Improve the message when component metadata fails to download
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-06-17 00:43:03 +01:00
Trial97
21de7a2d97
fix: crash when component version can't be loaded from atlauncher file
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-06-16 22:32:39 +03:00
renner
e9899e3af3
chore: refresh metainfo.xml.in
...
adds a donation + FAQ URL and developer id property
Signed-off-by: renner <renner0@posteo.de >
2025-06-16 20:40:38 +02:00
clague
09ec3eb621
resolve problems
...
Signed-off-by: clague <93119153+clague@users.noreply.github.com >
2025-06-17 00:25:34 +08:00
clague
4bf6e59f3b
feat: add ability to change assets download server
...
Signed-off-by: clague <93119153+clague@users.noreply.github.com >
2025-06-17 00:25:33 +08:00
Seth Flynn
f1b0034f5c
Build Linux binaries for ARM64 ( #3304 )
2025-06-15 22:43:24 -04:00
Alexandru Ionut Tripon
a2681b5704
chore(nix): update lockfile ( #3878 )
2025-06-15 10:03:16 +03:00
github-actions[bot]
45027279fa
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/d3d2d80a2191a73d1e86456a751b83aa13085d7d?narHash=sha256-QuUtALJpVrPnPeozlUG/y%2BoIMSLdptHxb3GK6cpSVhA%3D' (2025-06-05)
→ 'github:NixOS/nixpkgs/ee930f9755f58096ac6e8ca94a1887e0534e2d81?narHash=sha256-Kh9K4taXbVuaLC0IL%2B9HcfvxsSUx8dPB5s5weJcc9pc%3D' (2025-06-13)
2025-06-15 00:30:46 +00:00
seth
03c714cccf
ci: build for arm on linux
...
Signed-off-by: seth <getchoo@tuta.io >
2025-06-13 02:19:52 -04:00
Seth Flynn
c03f854fb8
cmake: use build platform from environment
...
This allows all CI builds to be deemed "official"
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-06-13 02:18:19 -04:00
Seth Flynn
3718c60844
cmake: enforce explicit artifact name
...
It's much easier to determine this in CI and ensure our artifact names
are correct (I have made some accidents). They (and thus the updater)
can also easily be left out of local builds -- and probably should've
always been
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-06-13 02:18:19 -04:00
Seth Flynn
6d960b9c3c
ci(setup-deps): always use sccache, simplify restore key
...
sccache is available on arm runners. we can use the restore key for an
easy, unique restore key in the cache too (it also prevents us from
re-using the ccache caches!)
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-06-13 02:18:19 -04:00
Seth Flynn
04ecd447bc
ci(package/linux): use dpkg to determine file paths and variables
...
Should hopefully make things less brittle across different architectures
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-06-13 02:18:15 -04:00
Alexandru Ionut Tripon
2c91629564
Cleanup CI trigger events ( #3873 )
2025-06-13 09:13:11 +03:00
Seth Flynn
d8ac52bd8c
ci: ensure all workflows are actually run on push to branches
...
Oops
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-06-12 21:39:41 -04:00
Seth Flynn
8df20a372c
ci: don't run ci on custom in-tree branches
...
This basically duplicates runs when a PR is opened from an in-tree
branch. If we want to run one without a PR, we can use workflow_dispatch
anyways
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-06-12 21:37:39 -04:00
Seth Flynn
d68269eca8
chore: move opacity after checkbox draw ( #3848 )
2025-06-10 06:51:20 -04:00
Seth Flynn
7e6292db25
feat: use build config url instead of hadcoded one ( #3829 )
2025-06-10 06:48:31 -04:00
Trial97
ea1a0dadda
fix: curseforge optinal blocked mods
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-06-09 23:04:20 +03:00
Alexandru Ionut Tripon
fbac04c170
Auth abort fixes ( #3851 )
2025-06-09 18:32:38 +03:00
Alexandru Ionut Tripon
75db733642
chore(nix): update lockfile ( #3854 )
2025-06-09 18:31:42 +03:00
github-actions[bot]
ca545b7a5b
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/96ec055edbe5ee227f28cdbc3f1ddf1df5965102?narHash=sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg%3D' (2025-05-28)
→ 'github:NixOS/nixpkgs/d3d2d80a2191a73d1e86456a751b83aa13085d7d?narHash=sha256-QuUtALJpVrPnPeozlUG/y%2BoIMSLdptHxb3GK6cpSVhA%3D' (2025-06-05)
2025-06-08 00:30:27 +00:00
TheKodeToad
a195b9981d
Use Task::getState
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-06-07 22:41:09 +01:00
TheKodeToad
06aece111a
Reset account state on abort
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-06-07 20:25:21 +01:00
TheKodeToad
834eb5a90d
Don't retry account refresh if aborted
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-06-07 16:32:40 +01:00
TheKodeToad
f19fe41937
Fix MessageLevel.h error when compiling on Debian Stable ( #3846 )
2025-06-07 08:46:56 +00:00
Trial97
8a80ccae3a
chore: move oppacity after checkbox draw
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-06-07 09:10:03 +03:00
TheKodeToad
f0388d04bf
Fix MessageLevel.h error when compiling on Debian Stable
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-06-06 23:42:43 +01:00
TheKodeToad
9f9aabcf97
Add a page to view launcher logs ( #3831 )
2025-06-06 14:59:57 +00:00
Yihe Li
836c558c6c
Merge branch 'develop' into launcher-log-page
2025-06-06 21:36:03 +08:00
Tayou
f17e443b12
chore: fix some codeql warnings ( #3838 )
2025-06-06 15:20:07 +02:00
Tayou
87d199fae8
feat: fade installed resources in the download dialog ( #3732 )
2025-06-06 14:42:43 +02:00
Tayou
ae9e4835c4
fix: qr code overlaping with text when adding account ( #3753 )
2025-06-06 14:32:39 +02:00
Tayou
9cdfeb5fcd
add options to change the cat scalling ( #3380 )
2025-06-06 14:23:39 +02:00
Tayou
a17ea196c1
chore: fix some codeql warnings ( #3840 )
2025-06-06 14:19:27 +02:00
Alexandru Ionut Tripon
2d90144cd9
More intuitive version changing for modpacks ( #3841 )
2025-06-06 08:12:52 +03:00
Alexandru Ionut Tripon
36572a63f0
fix: crash with global datapacks on export ( #3843 )
2025-06-06 08:12:40 +03:00
Trial97
09dcfa4b65
feat: fade installed resources in the download dialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-06-05 18:41:09 +03:00
Yihe Li
25907ea8c6
Forgot to reset pointer to nullptr
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-06-05 23:22:49 +08:00
Yihe Li
dea8de01e3
Merge branch 'develop' into launcher-log-page
2025-06-05 23:20:46 +08:00
Yihe Li
842662c24f
Merge branch 'develop' into launcher-log-page
2025-06-05 23:20:15 +08:00
Yihe Li
d77889f26d
Change log to be a QMainWindow
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-06-05 23:15:55 +08:00
Trial97
37f8b2f563
fix: crash with global datapacks on export
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-06-05 17:50:47 +03:00
Alexandru Ionut Tripon
6eec17e846
Remove reliance on SIGNAL/SLOT macros ( #3842 )
2025-06-05 17:41:33 +03:00
Yihe Li
c57ba911cf
Remove unnecessary QObject::
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-06-05 21:41:06 +08:00
Yihe Li
4a9b3d2f5f
Remove usage of SIGNAL/SLOT macro
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-06-05 21:35:19 +08:00
Yihe Li
58a28f319a
More intuitive version changing for modpacks
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-06-05 20:20:34 +08:00
Yihe Li
ef3bf75715
Remove some duplicate code
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-06-05 16:15:29 +08:00
Trial97
7ea15c31a1
chore: fix some codeql warnings
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-06-05 09:45:25 +03:00
Yihe Li
e4a801fdf7
Use separate window for viewing logs
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-06-05 07:18:13 +08:00
Trial97
4f5db2e49f
chore: fixe some codeql warnings
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-06-05 00:34:45 +03:00
Alexandru Ionut Tripon
0136c2e82a
Fix crash and make loader override more consistent ( #3827 )
2025-06-04 22:20:13 +03:00
Yihe Li
1aa8d7bc13
Reuse OtherLogsPage directly
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-06-03 15:44:17 +08:00
Alexandru Ionut Tripon
6d9eac6766
remove: unused files ( #3740 )
2025-06-03 08:42:09 +03:00
Yihe Li
289645266a
Add support for view older launcher logs
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-06-03 06:08:32 +08:00
Yihe Li
c58cc3396a
Basic support for launcher log page
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-06-03 04:51:41 +08:00
Trial97
9991501832
feat: use build config url instead of hadcoded one
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-06-02 19:28:52 +03:00
Tayou
df90d0cb0d
fix: warning with different signedness ( #3826 )
2025-06-02 17:28:13 +02:00
TheKodeToad
956f5ee180
Fix crash and make loader override more consistent with other option groups
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-06-02 14:59:56 +01:00
Trial97
93e9d2fd86
fix: warning with different signedness
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-06-02 16:43:36 +03:00
Alexandru Ionut Tripon
253b9756d4
improve blocked mods dialog ( #3378 )
2025-06-02 16:26:29 +03:00
Trial97
2fc89d7e11
improve blocked mods dialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-06-02 15:35:05 +03:00
Trial97
8c0ba43838
add options to change the cat scalling
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-06-02 15:15:17 +03:00
Trial97
be963764ea
propagate side as enum instead of Qstring
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-06-02 13:26:42 +03:00
Alexandru Ionut Tripon
178965676e
Remove reference to deprecated Q_OS_OSX macro ( #3824 )
2025-06-02 12:45:24 +03:00
Alexandru Ionut Tripon
52fa074ff7
Make column visibility global ( #3748 )
2025-06-02 12:45:03 +03:00
TheKodeToad
d9b672ee8d
Data pack management ( #1905 )
2025-06-02 09:18:57 +00:00
Yihe Li
5ccdb0a477
Remove several warnings when building the project
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-06-02 17:00:13 +08:00
TheKodeToad
609a4f7160
Fix spelling of override
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-06-02 11:56:03 +03:00
Trial97
a29b189056
feat: make the visibility per resource
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-06-02 11:56:03 +03:00
Trial97
8c710fb8de
chore: migrate map settings to json string
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-06-02 11:56:03 +03:00
TheKodeToad
edb1020dce
Merge remote-tracking branch 'upstream/develop' into data-packs
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-06-02 09:52:05 +01:00
Trial97
89be378ef6
chore: add miggrate qbytearray settings to qstring
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-06-02 11:40:48 +03:00
Trial97
7e174f53af
chore: add migration for old QByteArray to base64
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-06-02 11:40:48 +03:00
Trial97
6177fa0148
feat: make resource header config global
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-06-02 11:40:48 +03:00
TheKodeToad
af0176b12a
Allow data packs on vanilla instances
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-06-02 09:39:45 +01:00
Alexandru Ionut Tripon
d667dfe223
feat: add setting to control the loaders for mod search ( #3659 )
2025-06-02 11:39:39 +03:00
Alexandru Ionut Tripon
a95def5588
Delete associated shortcuts when deleting instance ( #3819 )
2025-06-02 11:39:24 +03:00
Trial97
ca54971499
chore: ensure the setting is saved as string
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-06-02 09:45:49 +03:00
Trial97
492769aea6
feat: add setting to control the loaders for mod search
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-06-02 09:19:40 +03:00
Yihe Li
8965200384
Handle JSON parse error
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-06-02 14:19:31 +08:00
Alexandru Ionut Tripon
b4a998e992
chore(deps): try find system wide qrcodegencpp-cmake and use it ( #3821 )
2025-06-02 09:08:54 +03:00
Yihe Li
50fb2db718
Validate JSON parsing results
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-06-02 07:36:53 +08:00
TheKodeToad
142a73888d
Rework the settings user interface ( #3534 )
2025-06-01 22:46:40 +00:00
TheKodeToad
b54dd051fb
Fix close button on world datapacks dialog
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-06-01 19:24:21 +00:00
Yihe Li
0a1001ee84
Use QString instead of QByteArray
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-06-02 01:34:24 +08:00
Puqns67
49dc9a5d3f
chore(deps): try find system wide qrcodegencpp-cmake and use it
...
Signed-off-by: Puqns67 <me@puqns67.icu >
2025-06-02 00:58:42 +08:00
Yihe Li
caff4b884f
Use null QString instead of empty
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-06-01 18:32:38 +08:00
TheKodeToad
e665a257dc
Hopefully fix segfault with HintOverrideProxyStyle ( #3820 )
2025-06-01 09:47:56 +00:00
Yihe Li
d9884f0d03
Add notes in shortcut creation screen
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-06-01 16:33:43 +08:00
Yihe Li
4214571cff
Add # of shortcuts to deletion confirmation screen instead
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-06-01 16:18:35 +08:00
TheKodeToad
1c69f63357
Hopefully fix segfault with HintOverrideProxyStyle
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-06-01 09:15:21 +01:00
Yihe Li
d2ee023788
Switch to JSON-encoded store
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-06-01 16:13:40 +08:00
TheKodeToad
e4ed3b4546
Merge branch 'PrismLauncher:develop' into data-packs
2025-06-01 07:54:16 +00:00
Yihe Li
7c3a810d3d
Implement persistence by storing shortcut in settings
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-06-01 14:16:47 +08:00
Rachel Powers
9f1d19811b
chore(nix): update lockfile ( #3818 )
2025-05-31 18:56:31 -07:00
github-actions[bot]
48bc6ebcc2
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/063f43f2dbdef86376cc29ad646c45c46e93234c?narHash=sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o%3D' (2025-05-23)
→ 'github:NixOS/nixpkgs/96ec055edbe5ee227f28cdbc3f1ddf1df5965102?narHash=sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg%3D' (2025-05-28)
2025-06-01 00:33:52 +00:00
Yihe Li
d3f337d6ef
Delete shortcut when deleting instances
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-06-01 08:13:18 +08:00
Alexandru Ionut Tripon
0a89f5cfaa
feat: move qr code glue in MSALoginDialog ( #3676 )
2025-05-31 21:40:01 +03:00
TheKodeToad
308cbcbf77
feat: propagate Sink error handling ( #2631 )
2025-05-31 18:32:19 +00:00
TheKodeToad
43dcafda60
Support for CurseForge recommended memory ( #3711 )
2025-05-31 17:22:06 +00:00
TheKodeToad
77057267d2
feat(skin manager): add elytra preview ( #3761 )
2025-05-30 19:01:58 +00:00
TheKodeToad
75779a841e
Re-apply my suggestion
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-05-30 18:55:58 +00:00
Alexandru Ionut Tripon
acc0f96e34
chore(deps): update determinatesystems/update-flake-lock action to v25 ( #3778 )
2025-05-30 09:43:06 +03:00
Alexandru Ionut Tripon
2ac7b79026
chore(nix): update lockfile ( #3784 )
2025-05-30 09:42:57 +03:00
Alexandru Ionut Tripon
7d9eda7eb9
chore(deps): update determinatesystems/flakehub-cache-action action to v2 ( #3812 )
2025-05-30 09:42:42 +03:00
renovate[bot]
03e1b7b4d5
chore(deps): update determinatesystems/flakehub-cache-action action to v2
2025-05-29 22:07:33 +00:00
Rachel Powers
43c8f74fa0
chore(deps): update cachix/install-nix-action digest to 17fe5fb ( #3798 )
2025-05-27 16:16:47 -07:00
renovate[bot]
3690d93591
chore(deps): update cachix/install-nix-action digest to 17fe5fb
2025-05-27 12:24:27 +00:00
timoreo
a6c93d66d4
fix(skin manager): accept files with same name ( #3755 )
2025-05-26 21:47:49 +02:00
github-actions[bot]
ff1fb8755a
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/dda3dcd3fe03e991015e9a74b22d35950f264a54?narHash=sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ%2BTCkTRpRc%3D' (2025-05-08)
→ 'github:NixOS/nixpkgs/063f43f2dbdef86376cc29ad646c45c46e93234c?narHash=sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o%3D' (2025-05-23)
2025-05-25 00:30:05 +00:00
TheKodeToad
618e6bd96b
Merge remote-tracking branch 'upstream/develop' into rework-settings
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-05-22 23:04:57 +01:00
TheKodeToad
c300db1a24
Allow creating shortcuts to individual worlds and servers with Quick Play ( #3767 )
2025-05-22 20:48:02 +01:00
Yihe Li
8425861fb1
Just disable world selection when there is no world
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-05-23 00:53:03 +08:00
Yihe Li
a89caf7362
Apply suggestions from review
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-05-22 23:09:37 +08:00
Trial97
64ef14100d
feat(skin manager): add elytra preview
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-05-18 21:13:13 +03:00
Yihe Li
3745bdb6f2
Special treatment of non-Quick Join worlds
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-05-19 01:46:23 +08:00
Yihe Li
46c9eb1d5f
Remove button additions
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-05-19 01:34:18 +08:00
Yihe Li
4839595a11
Implement account override
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-05-19 01:29:30 +08:00
Yihe Li
3529d29584
Implement world and server selection
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-05-19 01:06:21 +08:00
Yihe Li
2e6981977b
Add basic shortcut creation integration
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-05-19 00:04:15 +08:00
Yihe Li
b296085ea0
Small adjustments
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-05-18 23:32:35 +08:00
Yihe Li
37e12fff02
Merge branch 'develop' into world-server-shortcut
2025-05-18 23:09:47 +08:00
Yihe Li
ea8f105292
Add stubs and b asic integration with MainWindow
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-05-18 23:09:39 +08:00
Yihe Li
0a5013ff9f
Add source files for UI
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-05-18 23:09:39 +08:00
Yihe Li
1c288543f2
Initial UI for shortcut dialog
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-05-18 23:09:39 +08:00
Trial97
8a60ec1c4a
chore: replace foreach macro
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-05-18 23:09:39 +08:00
Sefa Eyeoglu
91e9e49d2c
chore(readme): update Jetbrains logo
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2025-05-18 23:09:39 +08:00
github-actions[bot]
183f3d4e9a
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/f771eb401a46846c1aebd20552521b233dd7e18b?narHash=sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA%3D' (2025-04-24)
→ 'github:NixOS/nixpkgs/dda3dcd3fe03e991015e9a74b22d35950f264a54?narHash=sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ%2BTCkTRpRc%3D' (2025-05-08)
2025-05-18 23:09:39 +08:00
Yihe Li
d9c9eb6521
Remove redundant assignment
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-05-18 20:41:11 +08:00
renovate[bot]
776b15d587
chore(deps): update determinatesystems/update-flake-lock action to v25
2025-05-16 16:08:06 +00:00
Yihe Li
bc1d1b41c0
Move menu creation to constructors to avoid performance issues
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-05-15 19:12:15 +08:00
Yihe Li
f3c253d708
Fix menu issues
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-05-15 19:05:40 +08:00
Tayou
1c20faccf8
chore: replace foreach macro ( #3773 )
2025-05-14 10:48:37 +02:00
Trial97
bbfaaef31d
chore: replace foreach macro
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-05-14 09:55:55 +03:00
Alexandru Ionut Tripon
7df330f411
chore(readme): update Jetbrains logo ( #3768 )
2025-05-13 22:08:16 +03:00
Alexandru Ionut Tripon
56b6c3a6a7
chore(nix): update lockfile ( #3733 )
2025-05-13 22:08:01 +03:00
Sefa Eyeoglu
003d422626
chore(readme): update Jetbrains logo
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2025-05-13 15:51:52 +02:00
Yihe Li
31dc84653d
Refactor shortcut parameter into its own struct
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-05-13 05:14:53 +08:00
Yihe Li
db82988943
Re-add an appropriate copyright comment
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-05-13 03:23:28 +08:00
Yihe Li
bae0ac7ad6
Use index.row() directly
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-05-13 03:12:20 +08:00
Yihe Li
039682b7dc
Remove inappropriate comments
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-05-13 03:09:49 +08:00
Yihe Li
dbdc9bea7a
Add create shortcut button for servers
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-05-11 19:28:00 +08:00
Yihe Li
37213ecc34
Add create shortcut button for worlds
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-05-11 19:08:36 +08:00
github-actions[bot]
9f1ee3594e
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/f771eb401a46846c1aebd20552521b233dd7e18b?narHash=sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA%3D' (2025-04-24)
→ 'github:NixOS/nixpkgs/dda3dcd3fe03e991015e9a74b22d35950f264a54?narHash=sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ%2BTCkTRpRc%3D' (2025-05-08)
2025-05-11 00:28:34 +00:00
Yihe Li
69469b4484
Refactor shortcut creation logic into its own file
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-05-11 03:37:47 +08:00
Trial97
e1cfae5e06
fix(skin manager): accept files with same name
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-05-10 12:21:32 +03:00
Trial97
a67a015e49
fix: qr code overlaping with text when adding account
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-05-10 12:21:10 +03:00
Trial97
3d0bef92a1
feat: compound the conncurent task error
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-05-10 12:16:10 +03:00
Trial97
de541bf397
refactor: paste upload to report the error directly
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-05-10 12:16:10 +03:00
Trial97
c3749c4fdc
feat: add sink fail reason and correctly propagate it through the NetRequest
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-05-10 12:16:10 +03:00
Alexandru Ionut Tripon
a89fc7d1e0
Improvements to upload logs ( #1872 )
2025-05-10 12:12:46 +03:00
Alexandru Ionut Tripon
2c838f8c2c
Allow the user to create a shortcut on the desktop and/or application folder ( #2966 )
2025-05-10 12:12:04 +03:00
Alexandru Ionut Tripon
0a665231db
feat: search for pack icon in the actual file ( #3752 )
2025-05-10 12:11:48 +03:00
Alexandru Ionut Tripon
bc9af29158
feat: prevent deletion of running instances ( #3754 )
2025-05-10 12:11:26 +03:00
Alexandru Ionut Tripon
c48ef22cf8
MinGW CI improvements ( #3757 )
2025-05-10 12:11:11 +03:00
seth
b9a97c8647
ci(release): upload mingw-arm64 artifacts
...
Signed-off-by: seth <getchoo@tuta.io >
2025-05-07 21:01:00 -04:00
Seth Flynn
b7bcc2f612
Don't re-define structs for newer MinGW versions ( #3756 )
2025-05-07 18:21:25 -04:00
seth
3dcac0de50
ci: run workflows on local action changes
...
Helps ensure they still actually work when changes are made
Signed-off-by: seth <getchoo@tuta.io >
2025-05-07 18:03:37 -04:00
seth
9d79695512
ci(mingw): print msys2 packages
...
Also lists theirs versions, which is useful for debugging issues like
those fixed in https://github.com/PrismLauncher/PrismLauncher/pull/3756
Signed-off-by: seth <getchoo@tuta.io >
2025-05-07 17:56:33 -04:00
seth
0711890d18
ci(mingw): use tomlplusplus from msys2
...
Signed-off-by: seth <getchoo@tuta.io >
2025-05-07 17:55:05 -04:00
seth
cf7061b9a8
fix(FileSystem): dont re-define structs for newer mingw versions
...
Signed-off-by: seth <getchoo@tuta.io >
2025-05-07 17:42:30 -04:00
Trial97
4bad7e48c3
feat: prevent deletion of running instances
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-05-07 23:21:35 +03:00
Trial97
fa189572db
feat: search for pack icon in the actual file
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-05-07 22:52:22 +03:00
Alexandru Ionut Tripon
198fbd19cf
Replace deprecated unique_qobject_ptr::swap with unique_ptr ( #3746 )
2025-05-07 19:18:33 +03:00
Hendrik Lind
14a78d55b0
Merge branch 'PrismLauncher:develop' into add-startmenu-shortcut
2025-05-07 13:34:35 +02:00
Trial97
e325806173
feat: add regex removal for log sesnitive data
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-05-07 00:12:10 +03:00
Trial97
63d40ecda4
feat: add upload action for launcher logs
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-05-07 00:12:09 +03:00
Trial97
cb01d5c46e
feat: refactor logs upload to use the NetJob
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-05-07 00:12:09 +03:00
Trial97
9b07c6948c
fix: modrinth categories not loading
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-05-06 23:27:29 +03:00
Trial97
7523bc1925
fix: replaced deprecated unique_qobject_ptr::swap with unique_ptr
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-05-06 23:12:03 +03:00
Trial97
476f3edce0
Revert "fix: 6.2 deprecation warning regard the QScopedPointer::swap function ( #3655 )"
...
This reverts commit ca258109c5 , reversing
changes made to 693d9d02bc .
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-05-06 23:12:03 +03:00
Seth Flynn
cb8f6f5e80
Fix jq blocked ( #3747 )
2025-05-05 18:45:30 -04:00
Rachel Powers
1cff0dee21
Merge branch 'PrismLauncher:develop' into fix-jq-blocked
2025-05-05 15:41:59 -07:00
Rachel Powers
f379c5ef34
ci(blocked-pr): another jq syntax fix
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-05-05 15:40:21 -07:00
Seth Flynn
ad4983e422
jq if statements need parens ( #3744 )
2025-05-05 18:30:43 -04:00
Rachel Powers
d1234198a1
ci(blocked-pr): default pr body as empty string
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-05-05 14:01:58 -07:00
Rachel Powers
a55bffc963
ci(blocked-prs): jq if statements need parens
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-05-05 13:25:29 -07:00
Seth Flynn
f1d264d12d
ci: Distinguish between stacked and blocked pr ( #3719 )
2025-05-05 13:04:35 -04:00
Trial97
fe0c52ff78
remove: unused files
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-05-05 19:57:24 +03:00
timoreo
ca258109c5
fix: 6.2 deprecation warning regard the QScopedPointer::swap function ( #3655 )
2025-05-05 14:42:09 +02:00
Tayou
693d9d02bc
[macOS] Remove support for macOS 11 ( #3611 )
2025-05-04 11:47:48 +02:00
TheKodeToad
13f533801b
Use options struct for FlamePackExportTask
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-05-03 14:26:52 +01:00
Alexandru Ionut Tripon
62afb86c6b
Build MinGW binaries for ARM64 ( #3724 )
2025-05-01 20:18:31 +03:00
Seth Flynn
a7c5959b7e
ci(setup-deps): dont force x64 binutils for msys2
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-05-01 11:02:35 -04:00
Seth Flynn
ee81c7a6f4
feat: build mingw binaries for arm64
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-05-01 11:02:32 -04:00
Seth Flynn
d13dff0dc8
chore(deps): update hendrikmuhs/ccache-action action to v1.2.18 ( #3726 )
2025-05-01 10:54:33 -04:00
Trial97
c7aef20b1e
deperecate macos 11
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-05-01 17:22:33 +03:00
renovate[bot]
be33aa3567
chore(deps): update hendrikmuhs/ccache-action action to v1.2.18
2025-05-01 14:19:24 +00:00
Alexandru Ionut Tripon
65ce09969e
Split build workflow into composite actions ( #3707 )
2025-05-01 17:18:59 +03:00
Seth Flynn
8c5333a5da
ci: use sccache on windows
...
This apparently works with less hacks, and is actually suggested by the
action we're using
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-05-01 08:44:00 -04:00
Seth Flynn
1e617392ad
ci(codeql): use setup-dependencies action
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-05-01 08:44:00 -04:00
Seth Flynn
efa3392632
ci: trigger_release -> release
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-05-01 08:44:00 -04:00
Seth Flynn
77b88fc7ec
ci: run build workflow directly on push/prs
...
Calling this from another workflow only for these events doesn't make
much sense now
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-05-01 08:44:00 -04:00
Seth Flynn
2dfb674e44
ci: split build workflow into composite actions
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-05-01 08:43:57 -04:00
Alexandru Ionut Tripon
d88d32b917
chore(deps): update cachix/install-nix-action digest to 5261181 ( #3720 )
2025-04-30 21:34:36 +03:00
renovate[bot]
19d6999455
chore(deps): update cachix/install-nix-action digest to 5261181
2025-04-30 16:35:22 +00:00
Alexandru Ionut Tripon
573aa8c208
fix: task typo in flame export task ( #3718 )
2025-04-30 14:38:32 +03:00
Rachel Powers
eb911389f8
Distinguish between stacked and blocked pr
...
distinguish between stacked and blocked pr
stacks need merge
blocks just need a close
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-04-30 02:45:23 -07:00
TheKodeToad
29d867cb88
Merge branch 'develop' into recommended-memory
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-30 10:35:17 +01:00
Alexandru Ionut Tripon
b8a9b086ae
ci: only run on specific paths ( #3717 )
2025-04-30 11:03:34 +03:00
Seth Flynn
dc3a8dcfed
ci: only run on specific paths
...
This avoids the previously applied paths-ignore exception workaround,
and makes runs as strict as (reasonably) possible. Only directories
known to affect builds will trigger builds, as well as any `.cpp` or
`.h` files to account for any new folders created - though these should
still be added to the workflow later
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-04-30 03:30:47 -04:00
Trial97
a465af45dc
fix: task typo in flame export task
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-30 10:15:59 +03:00
Alexandru Ionut Tripon
36d18b393b
fix: crash when task was canceled and abort signal was fired early ( #3712 )
2025-04-30 10:10:36 +03:00
Alexandru Ionut Tripon
9a85f23d85
Add support for CMake presets and workflows ( #3702 )
2025-04-30 10:10:16 +03:00
Seth Flynn
b438236a64
ci: use symlink for ccache when possible
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-04-30 02:25:31 -04:00
Seth Flynn
6c45ff915a
chore(gitignore): add CMakeUserPresets.json
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-04-30 02:25:31 -04:00
Seth Flynn
70500af2a2
ci: use cmake workflow presets
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-04-30 02:25:31 -04:00
Seth Flynn
9131f79cc0
feat: add CMakePresets.json
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-04-30 02:25:31 -04:00
Alexandru Ionut Tripon
224503cc93
fix: file filtering on modpack export ( #3710 )
2025-04-30 08:24:21 +03:00
Trial97
053b57c21f
fix: crash when task was canceled and abort signal was fired early
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-29 19:24:04 +03:00
TheKodeToad
24036021bb
Propagate task warnings
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-29 17:16:18 +01:00
TheKodeToad
acdb8c5578
Implement recommendedRam in CurseForge import
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-29 17:16:16 +01:00
Trial97
147159be2c
fix: file filtering on modpack export
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-29 19:02:35 +03:00
TheKodeToad
ee52127044
Implement recommendedRam in CurseForge export
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-29 16:46:48 +01:00
TheKodeToad
75d4ef1828
Implement UI for setting recommended RAM
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-29 14:44:30 +01:00
TheKodeToad
497e0cbfdc
Tweak pack export UI – add recommended RAM
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-29 14:44:09 +01:00
TheKodeToad
80fb1a8f4e
Fixes for new changes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-29 12:15:58 +01:00
Trial97
476054ba19
feat: move qr code glue in MSALoginDialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-29 11:27:02 +03:00
Seth Flynn
f086233186
chore(nix): update lockfile ( #3693 )
2025-04-29 04:23:53 -04:00
Seth Flynn
e9afa16aa1
chore: format some of the project files ( #3677 )
2025-04-29 04:23:25 -04:00
TheKodeToad
fadbcf2d04
Merge remote-tracking branch 'upstream/develop' into data-packs
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-29 09:15:11 +01:00
Trial97
8bb79cefac
chore: add format commits to the git-blame-ignore
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-29 10:47:00 +03:00
Trial97
5c8481a118
chore: reformat
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-29 10:46:41 +03:00
Alexandru Ionut Tripon
57d3d4815b
fix: build error introduced in #3516 ( #3708 )
2025-04-29 10:46:19 +03:00
Seth Flynn
e1fce47eb3
ci(nix): remove addtional > ( #3709 )
2025-04-29 03:43:32 -04:00
Trial97
7da32af1b2
ci(nix): remove addtional >
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-29 10:42:42 +03:00
Alexandru Ionut Tripon
c54f420c23
ci(nix): fix the PR number ( #3703 )
2025-04-29 10:33:43 +03:00
Trial97
93552277fe
fix: build error introduced in #3516
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-29 10:20:28 +03:00
Alexandru Ionut Tripon
6b4f07e976
Add checkboxes to resource downloader ( #3516 )
2025-04-29 08:32:30 +03:00
Alexandru Ionut Tripon
0d15699b26
change java on modpack update ( #3379 )
2025-04-29 08:31:59 +03:00
Alexandru Ionut Tripon
aa6324c920
chore(deps): update hendrikmuhs/ccache-action action to v1.2.18 ( #3704 )
2025-04-29 08:31:46 +03:00
Alexandru Ionut Tripon
a6006c3a33
chore: make all the regexes static const ( #3647 )
2025-04-29 00:33:49 +03:00
renovate[bot]
1c223997db
chore(deps): update hendrikmuhs/ccache-action action to v1.2.18
2025-04-28 21:33:12 +00:00
Alexandru Ionut Tripon
d6bba50d86
replace qvector with qlist ( #3519 )
2025-04-29 00:32:40 +03:00
Alexandru Ionut Tripon
5f20d98643
chore: update submodules ( #3701 )
2025-04-28 23:24:23 +03:00
Trial97
71da130fe4
ci(nix): fix the PR number
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-28 23:11:52 +03:00
Alexandru Ionut Tripon
25b1d79080
ci(nix): add github token for gh cli ( #3700 )
2025-04-28 22:49:38 +03:00
Trial97
c5fd5e6ac1
chore: make all the regexes static const
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-28 22:37:29 +03:00
Alexandru Ionut Tripon
21c90527d2
Parse log4j xml events in logs ( #3642 )
2025-04-28 18:33:17 +03:00
Alexandru Ionut Tripon
2ceb8a4986
Fix: Use after free collecting tasks from ResourceDownloadDialogs ( #3670 )
2025-04-28 18:32:39 +03:00
Trial97
0ccb4059a0
chore: update submodules
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-28 17:57:31 +03:00
Trial97
bcdbe79c59
fix: add github token for gh cli
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-28 17:38:01 +03:00
Rachel Powers
07a6606c9c
fix: cover both usages of the download dialog
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-04-28 04:49:30 -07:00
Rachel Powers
d0ccd110a1
fix: use after free begone!
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-04-28 04:49:23 -07:00
Rachel Powers
2031859731
Merge remote-tracking branch 'upstream/develop' into xml-logs
2025-04-28 04:11:53 -07:00
Rachel Powers
2c943a003d
feat(xml-logs): preserve whitespace lines in logs
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-04-28 03:54:47 -07:00
Rachel Powers
da30904630
fix: nullptr access ( #3690 )
2025-04-28 03:39:01 -07:00
TheKodeToad
63e30352e6
Fix catastrophic regex mistake ( #3669 )
2025-04-28 11:07:01 +01:00
TheKodeToad
51cd4c2174
Shallow search and lazy loading for Other Logs page ( #3664 )
2025-04-28 10:57:37 +01:00
TheKodeToad
1e3c197222
Merge remote-tracking branch 'upstream/develop' into shallow-lazy-otherlogs
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-28 10:31:48 +01:00
TheKodeToad
20626e6606
Fix log sorting
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-28 10:28:57 +01:00
TheKodeToad
0f7cb916cc
Pass mainclass and gameargs to the main game via system properties ( #3692 )
2025-04-28 09:47:25 +01:00
Alexandru Ionut Tripon
f58ee6af7a
ci(nix): fix get-merge-commit action call ( #3697 )
2025-04-27 23:48:49 +03:00
Rachel Powers
abba91c6fa
chore(deps): update determinatesystems/nix-installer-action action to v17 ( #3686 )
2025-04-27 13:46:57 -07:00
Seth Flynn
cdb4247323
Improve CI path filtering ( #3696 )
2025-04-27 14:48:09 -04:00
Seth Flynn
57a2ef1aed
ci: fix improper paths-ignore usage
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-04-27 07:47:36 -04:00
Seth Flynn
3b7b9fa03c
ci: better filter workflow runs
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-04-27 07:30:26 -04:00
Seth Flynn
47cb58d326
ci(nix): fix get-merge-commit action call
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-04-27 07:28:25 -04:00
Seth Flynn
440f7ea9a5
Use nix-shell over nix develop in .envrc ( #3634 )
2025-04-27 06:46:13 -04:00
Seth Flynn
816752e4e9
Ensure Nix workflows are actually running on PRs ( #3678 )
2025-04-27 03:21:58 -04:00
github-actions[bot]
facc48d0f8
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef?narHash=sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU%3D' (2025-04-17)
→ 'github:NixOS/nixpkgs/f771eb401a46846c1aebd20552521b233dd7e18b?narHash=sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA%3D' (2025-04-24)
2025-04-27 00:28:07 +00:00
Xander
02106ab29a
comment on property about delimeter
...
Signed-off-by: Xander <xander@isxander.dev >
2025-04-26 23:42:22 +01:00
Xander
a92e114236
Use \u001F instead of a space as a delimeter for game args
...
Signed-off-by: Xander <xander@isxander.dev >
2025-04-26 21:57:28 +01:00
Xander
a702d06cd8
Pass mainclass and gameargs to the main game via system properties
...
Signed-off-by: Xander <xander@isxander.dev >
2025-04-26 21:41:14 +01:00
Seth Flynn
abe18fb144
ci(nix): checkout merge commit of pull request
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-04-26 15:02:39 -04:00
Rachel Powers
83ebb5984b
fix: nullptr access
...
style can't always be created
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-04-25 19:18:28 -07:00
renovate[bot]
f2a601f815
chore(deps): update determinatesystems/nix-installer-action action to v17
2025-04-24 16:58:13 +00:00
Seth Flynn
e03870d3f2
ci(get-merge-commit): init
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-04-20 16:52:14 -04:00
Alexandru Ionut Tripon
60e279bf39
chore(nix): update lockfile ( #3672 )
2025-04-20 08:29:12 +03:00
github-actions[bot]
3fd5557f89
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'libnbtplusplus':
'github:PrismLauncher/libnbtplusplus/23b955121b8217c1c348a9ed2483167a6f3ff4ad?narHash=sha256-yy0q%2Bbky80LtK1GWzz7qpM%2BaAGrOqLuewbid8WT1ilk%3D' (2023-11-06)
→ 'github:PrismLauncher/libnbtplusplus/531449ba1c930c98e0bcf5d332b237a8566f9d78?narHash=sha256-qhmjaRkt%2BO7A%2Bgu6HjUkl7QzOEb4r8y8vWZMG2R/C6o%3D' (2025-04-16)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/2631b0b7abcea6e640ce31cd78ea58910d31e650?narHash=sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR%2BXhw3kr/3Xd0GPTM%3D' (2025-04-12)
→ 'github:NixOS/nixpkgs/b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef?narHash=sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU%3D' (2025-04-17)
• Updated input 'qt-qrcodegenerator':
'github:nayuki/QR-Code-generator/f40366c40d8d1956081f7ec643d240c02a81df52?narHash=sha256-5%2BiYwsbX8wjKZPCy7ENj5HCYgOqzeSNLs/YrX2Vc7CQ%3D' (2024-11-18)
→ 'github:nayuki/QR-Code-generator/2c9044de6b049ca25cb3cd1649ed7e27aa055138?narHash=sha256-6SugPt0lp1Gz7nV23FLmsmpfzgFItkSw7jpGftsDPWc%3D' (2025-01-23)
2025-04-20 00:28:02 +00:00
Rachel Powers
1bd1245d86
feat(xml-logs): Case insisitive xml parseing + cleaner switch
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-04-19 13:48:18 -07:00
TheKodeToad
11015a22d2
Remove commented out code
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-19 13:02:40 -07:00
TheKodeToad
266031df81
Fix compilation on Qt 6.4.2
...
Is this an EOL version lol
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-19 13:02:40 -07:00
Rachel Powers
21570a03fb
feat(xml-logs): finish tests
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-04-19 13:02:30 -07:00
Rachel Powers
bfdc77665d
feat(xml-logs): add tests
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-04-19 12:54:45 -07:00
Rachel Powers
47295da390
feat(logs): parse log4j xml events in logs
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-04-19 12:54:40 -07:00
Rachel Powers
15a981b3f8
fix: gzip file parsing as a stream ( #3667 )
2025-04-19 05:33:56 -07:00
TheKodeToad
feec7bf249
chore: update submodules ( #3643 )
2025-04-19 11:08:34 +01:00
TheKodeToad
111cdc240e
Disable auto-reload of files
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-19 09:34:12 +01:00
Rachel Powers
2ce1fdcee0
chore(deps): update cachix/install-nix-action digest to 754537a ( #3666 )
2025-04-18 20:39:40 -07:00
Rachel Powers
16b0447dc9
blocked-prs workflow fixes ( #3665 )
2025-04-18 20:39:22 -07:00
Rachel Powers
0e00c28450
Console colors and log invocation location ( #3654 )
2025-04-18 20:38:55 -07:00
TheKodeToad
92ba13cfdb
Fix catastrophic regex mistake
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-19 00:12:38 +01:00
TheKodeToad
0aa3341d58
Fix other weird import
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-19 00:07:13 +01:00
TheKodeToad
19b241fd31
Include txt too
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-19 00:07:12 +01:00
TheKodeToad
8ea5eac29c
Make requested changes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-18 23:50:02 +01:00
TheKodeToad
96a4b78e2e
Remove accidental return
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-18 23:46:55 +01:00
Trial97
49f0e8ef6b
replace qvector with qlist
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-19 00:59:48 +03:00
Trial97
e3ff9630e9
fix: 6.2 deprecation warning regard the QScopedPointer::swap function
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-19 00:43:52 +03:00
Trial97
d1c7107575
fix: gzip file parsing as a stream
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-19 00:41:24 +03:00
renovate[bot]
95492cdeef
chore(deps): update cachix/install-nix-action digest to 754537a
2025-04-18 20:57:31 +00:00
Seth Flynn
b6e48ac641
ci(blocked-prs): allow workflow_dispatch on blocking prs
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-04-18 16:56:19 -04:00
Seth Flynn
e9f7ba188b
ci(blocked-prs): use object filter to check pr label
...
https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/evaluate-expressions-in-workflows-and-actions#example-using-an-object-filter
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-04-18 16:53:16 -04:00
Seth Flynn
7f2f62afa8
ci(blocked-prs): use pull_request_target
...
This needs to run in the context of our repo to have access to it's
secrets
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-04-18 16:50:25 -04:00
Seth Flynn
3df98dd5e7
Remove support for Qt 5 ( #2174 )
2025-04-18 16:26:55 -04:00
TheKodeToad
01efd5b5d8
Fix double load (again lol)
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-18 21:24:25 +01:00
TheKodeToad
d5db974008
Shallow search and lazy loading for Other Logs page
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-18 20:14:33 +01:00
TheKodeToad
a39edb3b59
Optimise log colourisation ( #3641 )
2025-04-18 20:14:17 +01:00
TheKodeToad
0f847d6682
Fix mistakes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-18 19:40:19 +01:00
TheKodeToad
f307340690
Fix formatting
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-18 11:32:50 -07:00
TheKodeToad
166b2cb286
Tweak log formatting
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-18 11:32:50 -07:00
Alexandru Ionut Tripon
5cab302ce4
chore: improve log display ( #3658 )
2025-04-18 21:31:41 +03:00
Alexandru Ionut Tripon
8373fa81f1
chore: add getOrRegisterSetting function ( #3660 )
2025-04-18 21:31:22 +03:00
Trial97
0948d3598b
chore: improve log display
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-18 20:38:37 +03:00
Trial97
5af06dec85
chore: add getOrRegisterSetting function
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-18 20:02:52 +03:00
TheKodeToad
77f53c02a9
Fix compilation
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-18 17:03:29 +01:00
Alexandru Ionut Tripon
5eb8561157
add qr code support for login ( #3257 )
2025-04-18 18:48:26 +03:00
Alexandru Ionut Tripon
c622c83930
Add Popup for metacache clear failures ( #3586 )
2025-04-18 18:47:12 +03:00
Alexandru Ionut Tripon
e9245716f7
fix: load world size async ( #3651 )
2025-04-18 18:47:05 +03:00
Alexandru Ionut Tripon
6f38ab3fb0
fix: beginResetModel called before endResetModel ( #3657 )
2025-04-18 18:46:59 +03:00
Trial97
cb591ba52e
chore:add qr code support for login
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-18 18:46:10 +03:00
Trial97
cddf00c61b
fix: beginResetModel called before endResetModel
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-18 14:10:00 +03:00
Trial97
2271a05b19
chore: add back deprecation warnings and disable all API deprecated before 6.0
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-18 12:37:54 +03:00
Rachel Powers
45b6454222
feat(ansi-console): Format console with ansi excapes
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-04-18 00:39:19 -07:00
Rachel Powers
4a2b5c72dc
feat(color-console): support ansi colors in console
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-04-17 14:54:44 -07:00
Trial97
5fee4e3f8b
chore: remove qt5 from release and copyright
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-18 00:17:29 +03:00
Trial97
442aae88ce
chore: remove qt version checks from code
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-17 23:46:55 +03:00
Trial97
59bd6a915b
chore: remove qt5 from cmake files
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-17 23:38:49 +03:00
Trial97
8a3aafc274
chore: remove qt5 from github actions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-17 23:38:48 +03:00
Trial97
efeaefbf2e
fix: load world size async
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-17 23:31:25 +03:00
Trial97
6e00f94a57
chore: rename varibales to match code standards
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-17 22:43:32 +03:00
Rachel Powers
564f120c22
chore: sync cmake version with the one used in the launcher ( #3644 )
2025-04-16 19:35:30 -07:00
Alexandru Ionut Tripon
202095c466
fix: compile warning regarding duplicate object name ( #3645 )
2025-04-16 21:30:48 +03:00
Trial97
b70d9d6537
chore: update submodules
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-16 17:56:01 +03:00
Trial97
c3f4735808
fix: compile warning regarding duplicate object name
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-16 17:02:22 +03:00
Trial97
5ce6ad604b
chore: sync cmake version with the one used in the launcher
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-16 16:54:08 +03:00
Alexandru Ionut Tripon
8285993f38
fix: crash when the instance window is closed before download dialog is open ( #3614 )
2025-04-16 16:28:11 +03:00
TheKodeToad
9b815e8bee
Emit applied (oops)
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-16 11:54:31 +01:00
TheKodeToad
df15aacfbb
Harmonizing "Other Log" page with "Minecraft Log" ( #3638 )
2025-04-15 21:49:13 +01:00
TheKodeToad
6d3d4d0083
Redo tab orderings
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-15 19:52:21 +01:00
TheKodeToad
fc94bb6af3
Add colons to single-line settings
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-15 19:47:00 +01:00
TheKodeToad
0b3b9debd8
Fix PageDialog OK button
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-15 19:42:46 +01:00
TheKodeToad
76db89460b
Redo layouts
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-15 19:21:38 +01:00
Yihe Li
29b81e7163
Set parent for LogModel
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-04-15 23:11:54 +08:00
TheKodeToad
ce76320b23
Remove unnecessary import
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-15 15:58:11 +01:00
TheKodeToad
be803b3279
Optimise guessLevel
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-15 15:39:27 +01:00
Alexandru Ionut Tripon
8f54a8c8dc
Fix icon removal in icon picker ( #3410 )
2025-04-15 16:58:13 +03:00
TheKodeToad
c7401ad649
Try to avoid cramming too much next to file path boxes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-15 14:27:47 +01:00
TheKodeToad
be5a1b47ac
Make PermGen max consistent
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-15 14:20:59 +01:00
TheKodeToad
53305bf5a7
Align task spinboxes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-15 14:17:03 +01:00
Yihe Li
521302a962
Move delete buttons to the same line & set model to nullptr before adding lines
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-04-15 20:35:05 +08:00
TheKodeToad
54e63fee6e
Fix spacer
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-15 13:17:31 +01:00
TheKodeToad
917abd60e1
Remove accidental qevent import
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-15 13:08:58 +01:00
TheKodeToad
33ac9e3f47
Apparently this is correct
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-15 12:39:25 +01:00
TheKodeToad
4a2e4e9dc2
Use title case for 'When Renaming Instances...'
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-15 12:32:14 +01:00
TheKodeToad
2c869c7a02
Revert to old close behaviour
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-15 12:09:13 +01:00
TheKodeToad
1a76e04925
Stop OK or Browse from getting implicit focus; add accelerator
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-15 11:59:02 +01:00
TheKodeToad
e04acdb8fb
Cleanup modpack update prompt phrasing
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-15 11:44:19 +01:00
TheKodeToad
a0c0262a19
Delete libraries/filesystem
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-15 11:39:26 +01:00
TheKodeToad
211c71f84a
Merge remote-tracking branch 'upstream/develop' into rework-settings
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-15 11:38:31 +01:00
TheKodeToad
ec2552e501
Make padding consistent
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-15 10:42:02 +01:00
Yihe Li
de66fe4eda
Apparently removeLast() only comes in Qt 6.5+
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-04-15 06:16:47 +08:00
Yihe Li
5634723ecd
Harmonizing other log controls with minecraft log
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-04-15 06:00:49 +08:00
Yihe Li
1ee1bab067
Add color lines button
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-04-15 05:07:56 +08:00
Yihe Li
4ac6a0629b
Use LogView to implement level highlighting for other logs
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-04-15 03:42:51 +08:00
timoreo
41a790d258
Shorten LocalPeer socket names to fix CLI not working if an instance of the launcher is already running ( #3630 )
2025-04-14 11:40:38 +02:00
Rachel Powers
bd304eee94
chore: use nix-shell over nix develop in .envrc (brakes less things)
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-04-13 12:16:07 -07:00
Alexandru Ionut Tripon
42007290a0
Start using patch versioning for launcher ( #3605 )
2025-04-13 20:27:14 +03:00
Kenneth Chew
7d4034cfa5
Shorten LocalPeer socket names
...
On most systems supporting Unix sockets, the maximum length of a socket name is quite low (e.g. on macOS 104 characters and on Linux 108). If the name is too long, the sockets will not work and thus sending messages to a running instance of the launcher will not work.
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com >
2025-04-13 02:33:22 -04:00
Alexandru Ionut Tripon
edd88b9603
chore(nix): update lockfile ( #3628 )
2025-04-13 08:15:13 +03:00
github-actions[bot]
6812d137e6
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/2c8d3f48d33929642c1c12cd243df4cc7d2ce434?narHash=sha256-F7n4%2BKOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE%3D' (2025-04-02)
→ 'github:NixOS/nixpkgs/2631b0b7abcea6e640ce31cd78ea58910d31e650?narHash=sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR%2BXhw3kr/3Xd0GPTM%3D' (2025-04-12)
2025-04-13 00:51:01 +00:00
Rachel Powers
a8e5e8dcfc
Fix compatibility with Qt 6.9 ( #3622 )
2025-04-11 11:44:41 -07:00
Yihe Li
8bb9b168fb
Use explicit construction for QFile from QString
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-04-12 01:59:07 +08:00
timoreo
a601a7cb06
chore: remove release macos Legacy reference ( #3619 )
2025-04-11 08:32:45 +02:00
Trial97
cc69a59f36
fix: crash when the instance window is closed before download dialog is open
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-11 08:38:05 +03:00
Trial97
d1eebbceff
chore: remove release macos Legacy reference
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-11 08:33:27 +03:00
Alexandru Ionut Tripon
c430b66657
Drop ghc_filesystem ( #3608 )
2025-04-10 22:39:10 +03:00
Trial97
4361aaa094
remove ghc_filesystem
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-10 22:38:55 +03:00
Alexandru Ionut Tripon
2ec0457854
Remove macOS Legacy build ( #3607 )
2025-04-10 22:38:24 +03:00
Seth Flynn
9364753d51
[Linux] Update to Qt 6.8.1 ( #3610 )
2025-04-09 17:22:06 -04:00
Alexandru Ionut Tripon
a6f00330a6
Improvements to modlist export ( #3512 )
2025-04-10 00:16:32 +03:00
Seth Flynn
a3b8846465
[Linux] Bump Ubuntu requirement to 22.04 ( #3612 )
2025-04-08 21:14:06 -04:00
Trial97
1a3cc00438
deprecate ubuntu 20.04 runner
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-08 21:37:34 +03:00
Trial97
5ba25a1476
remove mac legacy build
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-08 21:36:13 +03:00
Trial97
c89a8a676e
increment linux qt version
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-08 20:43:41 +03:00
Rachel Powers
b579cae5c2
feat(server): start using semver for launcher
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-04-08 04:27:06 -07:00
Seth Flynn
734db2bedc
Use ninja with MSVC on x64 ( #3587 )
2025-04-07 09:25:31 -04:00
Seth Flynn
4995bdcad6
Fix Nix release CI ( #3594 )
2025-04-07 09:13:23 -04:00
Seth Flynn
d92f7b3c97
ci: use ninja with msvc on x64
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-04-07 09:01:32 -04:00
Seth Flynn
6386d044e3
revert: "feat: publish on flakehub"
...
Flakehub requires semver. We don't use that (yet)
Refs: 86cc6d3
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-04-07 08:40:15 -04:00
Seth Flynn
180292098d
ci(nix): pin release packages in cachix
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-04-07 08:40:15 -04:00
Seth Flynn
76bec385d6
ci(nix): correctly parse action env vars as bools
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-04-07 08:40:15 -04:00
Seth Flynn
1a5a162727
ci(nix): ignore more paths
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-04-07 08:40:14 -04:00
Seth Flynn
da3a498490
ci(nix): run on tags
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-04-07 08:40:14 -04:00
Seth Flynn
3f1b91c611
chore(nix): update lockfile ( #3581 )
2025-04-07 08:13:04 -04:00
Soup of the tomato kind
9b3fa591d3
Update launcher/net/HttpMetaCache.h
...
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
Signed-off-by: Soup of the tomato kind <43444191+Soup-64@users.noreply.github.com >
2025-04-06 16:24:09 -04:00
Soup of the tomato kind
25d7db207d
Update FileSystem.cpp
...
fix oopsie
Signed-off-by: Soup of the tomato kind <43444191+Soup-64@users.noreply.github.com >
2025-04-06 16:15:02 -04:00
Soup
0c90530f88
cleanup
...
Fix formatting and fix a typo in the return code check
Signed-off-by: Soup <43444191+Soup-64@users.noreply.github.com >
2025-04-06 16:09:49 -04:00
Soup
b9a1fa3645
Implement popup for metacache
...
someone in the Discord ran into an issue somewhat related to the metacache button not working (folder in use err), so this warning makes it more obvious when this happens, though it would be better to find out why it ran into a process conflict
Signed-off-by: Soup <43444191+Soup-64@users.noreply.github.com >
2025-04-06 16:09:42 -04:00
Seth Flynn
6dd8bd0708
Use default palette on all system themes ( #3584 )
2025-04-06 15:55:02 -04:00
Seth Flynn
e5861129ad
fix(SystemTheme): use default palette on all system themes
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-04-06 06:41:37 -04:00
github-actions[bot]
aec410cb28
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/5e5402ecbcb27af32284d4a62553c019a3a49ea6?narHash=sha256-gWd4urRoLRe8GLVC/3rYRae1h%2BxfQzt09xOfb0PaHSk%3D' (2025-03-27)
→ 'github:NixOS/nixpkgs/2c8d3f48d33929642c1c12cd243df4cc7d2ce434?narHash=sha256-F7n4%2BKOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE%3D' (2025-04-02)
2025-04-06 00:27:19 +00:00
Seth Flynn
c1b460fa05
Nix Flake spring cleaning ( #3560 )
2025-04-04 05:01:40 -04:00
Alexandru Ionut Tripon
1bed9536f3
Add checkbox for LiteLoader in mod filter ( #3572 )
2025-04-04 08:12:52 +03:00
Alexandru Ionut Tripon
5ad6e7b50d
chore(deps): update actions/create-github-app-token action to v2 ( #3575 )
2025-04-04 08:11:15 +03:00
hanlie
12c266f8bd
Update ExportToModListDialog.ui
...
Signed-off-by: hanlie <48323966+HanlieChina@users.noreply.github.com >
2025-04-04 11:22:00 +08:00
renovate[bot]
dc4cb8b9d5
chore(deps): update actions/create-github-app-token action to v2
2025-04-03 22:22:42 +00:00
Yihe Li
3ae68114f6
Remove extra argument from ModFilterWidget::create
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-04-02 16:28:49 +08:00
Yihe Li
b0c85fd539
Hide checkbox for CurseForge
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-04-02 16:22:52 +08:00
Yihe Li
0518c50958
Add checkbox for LiteLoader in mod filter
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-04-02 16:01:45 +08:00
Rachel Powers
e883e9f359
(blocked-pr): push json expansion into env ( #3571 )
2025-04-01 23:53:34 -07:00
Rachel Powers
8fd86e065e
push json expansion into env
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-04-01 23:46:49 -07:00
Rachel Powers
f82b050bca
Fix blocked pr comment body ( #3570 )
...
* Add newline to seperate header from comment body
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Seth Flynn <getchoo@tuta.io >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
---------
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
Co-authored-by: Seth Flynn <getchoo@tuta.io >
2025-04-02 02:33:17 -04:00
Alexandru Ionut Tripon
3042e051c7
ci: add a workflow to detect and check dependencies for blocked pull requests ( #3497 )
2025-04-02 09:08:21 +03:00
Alexandru Ionut Tripon
40ff0321f6
Rename instance's physical dir when renaming instances ( #3550 )
2025-04-02 09:03:08 +03:00
TheKodeToad
1e5d21be61
feat: add updater dialogues ( #3454 )
2025-04-01 16:09:40 +01:00
Seth Flynn
1d45850b6d
chore(deps): update cachix/install-nix-action digest to d1ca217 ( #3563 )
2025-03-31 21:41:17 -04:00
renovate[bot]
b1c4e85806
chore(deps): update cachix/install-nix-action digest to d1ca217
2025-03-31 19:53:22 +00:00
Seth Flynn
de08d7c364
chore(gitignore): add more nix-related files
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-03-31 01:28:43 -04:00
Seth Flynn
e9cac2e0e3
refactor(nix): use date for version
...
Helps avoid needless rebuilds where only the revision changed. Also
better conforms to Nixpkgs' version standards
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-03-31 01:28:43 -04:00
Seth Flynn
9b38226f8c
chore(nix): clone git submodules automatically
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-03-31 01:28:43 -04:00
Seth Flynn
38ec7def32
chore(nix): add nice welcome message to dev shell
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-03-31 01:28:43 -04:00
Seth Flynn
51bbd02a08
Fix typo in NetRequest.cpp ( #3561 )
2025-03-31 01:12:48 -04:00
Seth Flynn
de923a07d8
refactor(nix): rely more on setup hooks in dev shell
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-03-30 19:25:48 -04:00
Seth Flynn
2d4bc09cb9
build(nix): properly wrap development shell
...
Allows actually running the executables built in the development shell
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-03-30 19:25:48 -04:00
Seth Flynn
58579539d0
fix(nix): only create compile_commands.json if it doesn't exist
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-03-30 19:25:48 -04:00
Seth Flynn
32b49ecb84
refactor(nix): cleanup flake
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-03-30 19:25:48 -04:00
Seth Flynn
c367f48ec9
refactor(nix): pin flake-compat in default.nix
...
Avoids polluting downstream flake.locks
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-03-30 19:25:47 -04:00
Seth Flynn
99852c972c
Reapply "refactor(nix): nix-filter -> lib.fileset"
...
After extensive (5 minutes) of testing, it seems we don't actually come
across any Nix bugs with lib.fileset! (aside from those inherit to
it...but 🤷 )
This reverts commit a49a58bc45 .
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-03-30 19:25:47 -04:00
Yihe Li
da007d6212
Use CustomMessageBox::selectable
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-03-31 07:14:09 +08:00
Alexandru Ionut Tripon
0709479110
chore(nix): update lockfile ( #3557 )
2025-03-30 10:53:02 +03:00
github-actions[bot]
0487ab3754
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/a84ebe20c6bc2ecbcfb000a50776219f48d134cc?narHash=sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ%3D' (2025-03-19)
→ 'github:NixOS/nixpkgs/5e5402ecbcb27af32284d4a62553c019a3a49ea6?narHash=sha256-gWd4urRoLRe8GLVC/3rYRae1h%2BxfQzt09xOfb0PaHSk%3D' (2025-03-27)
2025-03-30 00:27:40 +00:00
Alexandru Ionut Tripon
6b93e7aa62
fix themes leak ( #3555 )
2025-03-30 01:54:33 +02:00
Trial97
5b12d3cfff
fix themes leak
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-03-30 00:46:59 +02:00
TheKodeToad
36a89b0839
Fix CustomCommands spacing
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-29 20:24:21 +00:00
LAHarbottle
66c6399ade
Fix typo in NetRequest.cpp
...
Signed-off-by: LAHarbottle <87842870+LAHarbottle@users.noreply.github.com >
2025-03-29 17:17:57 +00:00
Yihe Li
02ca6bea8c
Sync group after updating instance
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-03-29 14:11:09 +08:00
Yihe Li
694959ef7f
Remove names from header comments
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-03-27 20:25:30 +08:00
Yihe Li
a2e44c0ef7
Use custom signals to record previous name
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-03-27 17:13:52 +08:00
Yihe Li
11a0dbf810
Make deleting a verb
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-03-27 16:11:54 +08:00
TheKodeToad
3b393e8d61
Fix Java padding
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-27 01:20:38 +00:00
TheKodeToad
7e5178cf81
Visual cleanup
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-27 01:08:26 +00:00
TheKodeToad
1ce343fb97
Try to make Minecraft general page easier to understand - remove misc
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-27 00:48:56 +00:00
TheKodeToad
910febeeb0
Try to make getchoo requested changes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-27 00:38:37 +00:00
Yihe Li
45368fbf2f
Get rid of unused includes
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-03-27 08:36:07 +08:00
TheKodeToad
1e7ceafa5f
Auto-fix \ to / on Windows (for portability)
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-26 23:48:00 +00:00
TheKodeToad
ccef855f06
Reset path when unchecked (still keeps it in UI in case you recheck)
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-26 23:41:47 +00:00
TheKodeToad
9c942c6894
Fix CurseForge support
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-26 23:35:40 +00:00
Yihe Li
a7af120cf0
Fix interaction with invalid chars
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-03-27 07:22:05 +08:00
Yihe Li
294448a01e
Filter out invalid chars
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-03-27 06:54:10 +08:00
Yihe Li
8fea37b8b7
Only call on interactive uses
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-03-27 06:53:57 +08:00
Yihe Li
ea44c2465c
Add link instance detection
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-03-27 05:48:05 +08:00
Yihe Li
7b511f4c67
Refactor into InstanceDirUpdate.h
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-03-27 05:47:29 +08:00
Yihe Li
b550a6c5c4
Revert the radio button changes
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-03-27 05:20:58 +08:00
Yihe Li
7ea5b6173c
Refactor updateInstanceRoot() to BaseInstance
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-03-27 04:51:13 +08:00
Yihe Li
abac3db125
Make remember checkbox off by default
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-03-27 04:11:29 +08:00
Yihe Li
4b20e3bc39
Implement instance renaming
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-03-27 03:26:13 +08:00
Yihe Li
0da645594f
Adjust instance view sorting mode to QComboBox and add renaming behavior
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-03-27 01:20:07 +08:00
TheKodeToad
5ece4bae70
Add CurseForge support
...
Currently doesn't work. Will try another approach to modrinth filter.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-26 16:11:53 +00:00
TheKodeToad
1d1480f470
Filter for datapack loader in datapack update too
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-26 13:25:46 +00:00
TheKodeToad
221365f05b
Make requested changes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-26 10:12:13 +00:00
Alexandru Ionut Tripon
1c0c247631
chore:fixed some codeql warnings ( #1679 )
2025-03-26 08:05:57 +02:00
TheKodeToad
36ceaebcf0
pls compile
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-26 01:50:05 +00:00
TheKodeToad
7bac7f7b2b
Actually fix build?
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-26 01:32:17 +00:00
TheKodeToad
683df62980
Implement data pack updating
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-26 01:30:06 +00:00
TheKodeToad
9c920fbad9
Open FileDialog in game root
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-26 01:10:10 +00:00
TheKodeToad
e22930fabf
Fix build
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-26 01:08:05 +00:00
TheKodeToad
5bdc0b3871
Implement browse for global data pack folder
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-26 01:04:04 +00:00
TheKodeToad
ea82d44aab
Allow absolute path for global data packs
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-26 00:30:00 +00:00
TheKodeToad
ed96f2064b
Display selected count and add buttons to dialog
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-25 23:40:58 +00:00
TheKodeToad
82978ee34d
Fix data pack filtering
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-25 19:23:35 +00:00
TheKodeToad
46c348a7b4
Fix license header emails
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-25 17:18:55 +00:00
TheKodeToad
481a1d222c
Fix use after free
...
If any page apply methods return false, the launcher breaks when opening an instance window for the second time
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-25 16:31:41 +00:00
TheKodeToad
18ee1f897a
Global data packs
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-25 16:28:16 +00:00
Rachel Powers
064383b8fa
Pin AppImage tooling in CI, drop libfuse2 ( #3543 )
2025-03-24 16:09:51 -07:00
Seth Flynn
671aad88f5
ci: don't install libfuse2
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-03-24 18:17:39 -04:00
Seth Flynn
5d5155bb22
ci: pin appimage tooling
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-03-24 18:17:39 -04:00
Seth Flynn
6ef59fe984
ci: use bundled linuxdeploy appimage plugin
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-03-24 18:17:39 -04:00
TheKodeToad
6ab4fef0c5
Merge remote-tracking branch 'upstream/develop' into data-packs
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-24 21:11:46 +00:00
Alexandru Ionut Tripon
ad8e0a9f7f
chore(deps): update actions/cache action to v4.2.3 ( #3517 )
2025-03-24 22:27:02 +02:00
Trial97
f7fd6f566f
chore:fixed some codeql warnings
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-03-24 22:25:35 +02:00
TheKodeToad
9a57fddaaf
Refactor ResourcePack ( #2616 )
2025-03-24 20:12:41 +00:00
TheKodeToad
e2b85a2e2b
Clang format
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-24 17:24:18 +00:00
TheKodeToad
23a28fe762
Fix tooltip inconsistency
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-24 17:19:09 +00:00
Alexandru Ionut Tripon
e27f602b7c
chore(nix): update lockfile ( #3525 )
2025-03-24 18:59:26 +02:00
Alexandru Ionut Tripon
7d0e3fb792
Fix crash with low disk space ( #3528 )
2025-03-24 18:59:09 +02:00
Alexandru Ionut Tripon
aa4c0a4dcc
fix account help link ( #3529 )
2025-03-24 18:58:36 +02:00
Alexandru Ionut Tripon
80b4a4427c
Use correct colours for all system themes ( #3530 )
2025-03-24 18:58:27 +02:00
TheKodeToad
491b5e1473
Correctly show max memory notice for max < min
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-24 16:35:02 +00:00
TheKodeToad
a8ea072d36
Make Services page nicer
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-24 13:23:53 +00:00
TheKodeToad
4e6bfde723
Revert sliders
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-24 11:59:29 +00:00
TheKodeToad
e1e0a3d887
Remove tabs from proxy page
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-24 01:49:43 +00:00
TheKodeToad
26f9850462
fix memory leak
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-24 01:48:15 +00:00
TheKodeToad
0768623e1e
Select General tab by default on Java page
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-24 01:33:23 +00:00
TheKodeToad
c5e766512e
Improve update interval setting
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-24 01:21:52 +00:00
TheKodeToad
72b90cf7de
gay bowser
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-24 01:07:40 +00:00
TheKodeToad
0434cc648a
Rearrange settings categories
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-24 00:36:55 +00:00
TheKodeToad
ad8818a134
Improve proxy page
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-24 00:36:03 +00:00
TheKodeToad
2ab08f01b1
Merge mods & modpack settings
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-24 00:30:23 +00:00
TheKodeToad
3922136f6d
Rework Minecraft and Java settings
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-24 00:29:07 +00:00
Seth Flynn
9fe78fa86a
Improve clangd support (in Nix development shell) ( #3526 )
2025-03-23 17:15:23 -04:00
TheKodeToad
adf2ed0849
Only fire apply event when settings are actually applied
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-23 15:22:17 +00:00
TheKodeToad
513959750f
Try best to avoid regression
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-23 14:29:58 +00:00
TheKodeToad
f08478c7ec
Use correct colours for all system themes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-23 14:17:43 +00:00
TheKodeToad
8732e17db9
Improve appearance icons for simple theme
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-23 13:50:08 +00:00
TheKodeToad
8852b5823b
Rework tools page
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-23 13:11:26 +00:00
TheKodeToad
411161fe49
Use same UI for appearance page and wizard
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-23 13:11:26 +00:00
TheKodeToad
a1baa5ff47
Use OK and Cancel instead of Close in Settings dialog
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-23 13:11:26 +00:00
TheKodeToad
3a508bdc78
Change slider behaviour to jumping directly when clicking
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-23 13:11:26 +00:00
TheKodeToad
dd3a4023c9
Move cat to right and use QPushButtons for browse
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-23 13:11:26 +00:00
TheKodeToad
99eeef40d9
Improve appearance page more
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-23 13:11:26 +00:00
TheKodeToad
06b5ac9a25
Add icons to appearance page
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-23 13:11:26 +00:00
TheKodeToad
414ad1340d
Rework API page design and rename to services
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-23 13:11:26 +00:00
TheKodeToad
dced39cab0
Add appearance page
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-23 13:11:25 +00:00
TheKodeToad
7dd159aac0
Rework Launcher as General category
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-23 13:11:25 +00:00
Trial97
a4472406b9
fix account help link
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-03-23 14:02:09 +02:00
Trial97
9ce5587f60
fix crash on accessing reseted output
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-03-23 08:52:30 +02:00
Trial97
269938dfd8
rename variable
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-03-23 08:52:08 +02:00
Seth Flynn
e3f93295f0
build(nix): add clangd to dev shell
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-03-22 22:36:16 -04:00
Seth Flynn
d6103c2a06
build(nix): copy compile_commands.json when entering dev shell
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-03-22 22:36:11 -04:00
Seth Flynn
8a21b07915
build: export compile commands for debug builds
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-03-22 22:16:18 -04:00
Seth Flynn
9fa397a299
chore(gitignore): add compile_commands.json
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-03-22 22:15:36 -04:00
github-actions[bot]
9ee357dcf1
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/6607cf789e541e7873d40d3a8f7815ea92204f32?narHash=sha256-cPfs8qMccim2RBgtKGF%2Bx9IBCduRvd/N5F4nYpU0TVE%3D' (2025-03-13)
→ 'github:NixOS/nixpkgs/a84ebe20c6bc2ecbcfb000a50776219f48d134cc?narHash=sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ%3D' (2025-03-19)
2025-03-23 00:27:03 +00:00
Rachel Powers
815306f1d0
Use group redirections for multiple outputs, prevent glob expansion of PR_NUMBER
...
Co-authored-by: Seth Flynn <getchoo@tuta.io >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-21 12:16:44 -07:00
TheKodeToad
216034c283
refactor FlameCheckUpdate to remove qEventLoop ( #3046 )
2025-03-20 09:34:26 +00:00
Rachel Powers
436896d365
ci(blocked-pr): use gh issue comment --create-if-none --edit-last with app token, not composit action
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-19 15:46:04 -07:00
Rachel Powers
187728c1f2
ci(blocked-pr): use app token
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-19 15:19:13 -07:00
Alexandru Ionut Tripon
71e0c62fee
fix no cape select ( #3511 )
2025-03-19 22:56:37 +02:00
renovate[bot]
4c2182e086
chore(deps): update actions/cache action to v4.2.3
2025-03-19 18:59:33 +00:00
TheKodeToad
947ca67952
Fix windows 9x and possibly other styles
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-19 13:32:14 +00:00
TheKodeToad
a108b5e9eb
Correctly set objectName for HintOverrideProxyStyle
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-19 12:35:24 +00:00
TheKodeToad
e89f96e9e9
Hack for broken windowsvista
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-19 11:48:31 +00:00
TheKodeToad
5832fb8b95
Implement middle click
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-19 11:09:25 +00:00
TheKodeToad
9f768f76bb
Translate installed indicator
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-19 11:00:51 +00:00
TheKodeToad
6dc16c48a2
Append [installed] to installed mods
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-19 10:56:07 +00:00
TheKodeToad
6c44a3f6df
onToggle -> onResourceToggle
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-19 10:46:32 +00:00
TheKodeToad
0f3ac57fdd
Trigger onToggle instead of onResourceSelected when pressing enter
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-19 10:42:38 +00:00
TheKodeToad
7532172233
Clear enableQueue on model reset
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-19 10:31:55 +00:00
hanlie
6bda537633
Improvements to modlist export
...
Added .replace("{mod_id}", modID)
Signed-off-by: hanlie <48323966+HanlieChina@users.noreply.github.com >
2025-03-19 12:35:22 +08:00
TheKodeToad
a5c62e657a
Snek case
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-19 01:43:43 +00:00
TheKodeToad
c6066fe6ec
Add warning dialog if there are no versions available
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-19 01:41:56 +00:00
TheKodeToad
900579eea6
Handle checkbox toggle
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-19 01:17:25 +00:00
TheKodeToad
8577f58fe3
Remove UserDataTypes::SELECTED
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-18 20:44:49 +00:00
TheKodeToad
5f70335a07
Render checkbox in project items
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-18 19:52:59 +00:00
Trial97
d5d83bf55c
fix no cape select
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-03-18 16:48:18 +02:00
TheKodeToad
a501441e6e
Paint project item backgrounds with native style
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-17 21:34:03 +00:00
Alexandru Ionut Tripon
d0b9073f60
Show online players on servers screen ( #3112 )
2025-03-16 08:30:12 +02:00
Alexandru Ionut Tripon
52a53a3b75
Make account checks more on-par with MultiMC ( #3466 )
2025-03-16 08:29:31 +02:00
Alexandru Ionut Tripon
41e2a486e0
chore(nix): update lockfile ( #3484 )
2025-03-16 08:28:22 +02:00
Alexandru Ionut Tripon
da508da1ab
chore(deps): update cachix/install-nix-action digest to 02a151a ( #3507 )
2025-03-16 08:28:12 +02:00
github-actions[bot]
6cf96d8fe7
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/6313551cd05425cd5b3e63fe47dbc324eabb15e4?narHash=sha256-D%2BR%2BkFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs%3D' (2025-02-27)
→ 'github:NixOS/nixpkgs/6607cf789e541e7873d40d3a8f7815ea92204f32?narHash=sha256-cPfs8qMccim2RBgtKGF%2Bx9IBCduRvd/N5F4nYpU0TVE%3D' (2025-03-13)
2025-03-16 00:27:01 +00:00
renovate[bot]
a469f6b114
chore(deps): update cachix/install-nix-action digest to 02a151a
2025-03-15 21:14:57 +00:00
Rachel Powers
e28dd30d87
ci(blocked_pr): merge env setup for dispatch and pull_request events
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-14 19:26:27 -07:00
Rachel Powers
72aee5c9f6
ci(blocked-pr): go back to single labels use gh cli actions directly insead of api where possible
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-14 16:07:14 -07:00
Alexandru Ionut Tripon
1a1bc14a73
Fix crash with invalid quilt mod info ( #3496 )
2025-03-15 00:00:46 +02:00
Alexandru Ionut Tripon
577cae3e00
chore(deps): update cachix/cachix-action action to v16 ( #3493 )
2025-03-15 00:00:30 +02:00
Alexandru Ionut Tripon
998de93ee5
chore(deps): update cachix/install-nix-action action to v31 ( #3492 )
2025-03-15 00:00:19 +02:00
Rachel Powers
e8e81a7627
use basename and dirname to split owner/repo
...
Co-authored-by: Seth Flynn <getchoo@tuta.io >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-14 14:56:46 -07:00
Rachel Powers
b42b453f76
ci(blocking-lables): cleanup lables with a pr closes
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-14 12:58:42 -07:00
Rachel Powers
da3f378d5d
ci(label-actions): actions can't directly access secrets
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-14 11:04:44 -07:00
Rachel Powers
7cbdb80f6b
ci(label-actions): composit actions to add and delete labels in bulk
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-14 10:26:19 -07:00
Rachel Powers
0818e7068a
ci(blocked_pres): ensure merge workflow has actions permission
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-12 21:01:58 -07:00
Rachel Powers
c75ae4170f
ci(blocked_prs): fix merge workflow
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-12 20:44:07 -07:00
Rachel Powers
c2b7b4c82a
ci(blocked_prs): fix multiline comment body in comment action
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-12 20:44:07 -07:00
Rachel Powers
05356eff69
ci(blocking_prs): fix generated comment
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-12 20:44:06 -07:00
Rachel Powers
0474b03626
ci(blocked_pr): fix comment action
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-12 20:44:06 -07:00
Rachel Powers
79283fd744
ci(blocked_prs): checkout default branch for action access
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-12 20:44:06 -07:00
Rachel Powers
e00d93135f
ci(blocked_prs): fix blocking_data refrences, add synchronize and
...
reopend events
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-12 20:44:06 -07:00
Rachel Powers
6fd70ad095
ci(blocked_prs): correct condition to use JOB_DATA from env
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-12 20:44:05 -07:00
Rachel Powers
1c6ab1f054
ci(blocked_prs): unnest array of blocking prs
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-12 20:44:05 -07:00
Rachel Powers
14f042540c
ci(blocking_pr): pass json expressions as env not direct.
...
use internal compost comment action
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-12 20:44:05 -07:00
Rachel Powers
eb11cde0f4
ci(blocked_prs): use compact jq output when outputting to ENV or step
...
ouput
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-12 20:44:05 -07:00
Rachel Powers
0bbf529afb
ci(blocked_prs): quote json in env file
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-12 20:44:04 -07:00
Rachel Powers
a6a172a136
ci: ensure block pr scan always returns valid json
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-12 20:44:04 -07:00
Rachel Powers
a2907dcaa3
ci: fix blocked PR workflow to preserve JSON in ENV
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-12 20:44:04 -07:00
Rachel Powers
cbd1fc6f43
ci: fix repo URL in blocked pr workflow
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-12 20:44:04 -07:00
Rachel Powers
cfc3c76779
ci: fix labels detected as sequence
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-12 20:44:03 -07:00
Rachel Powers
be1ce8dd9d
ci: add workflow to trigger refresh of dependants when a blocking pr is merged
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-12 20:44:03 -07:00
Rachel Powers
a65ced1598
ci: add a workflow to detect and check dependencies for blocked pull requests
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-03-12 20:44:03 -07:00
Alexandru Ionut Tripon
88bdb6541e
Update launcher/minecraft/mod/tasks/LocalModParseTask.cpp
...
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2025-03-12 00:14:53 +02:00
Trial97
0626e354a0
Fix crash with invalid quilt mod info
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-03-12 00:01:45 +02:00
renovate[bot]
de13d55c7c
chore(deps): update cachix/cachix-action action to v16
2025-03-10 21:53:14 +00:00
renovate[bot]
d41c54b6b2
chore(deps): update cachix/install-nix-action action to v31
2025-03-10 18:24:28 +00:00
TheKodeToad
fde2f4afe9
Fix mistakes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-10 12:44:44 +00:00
Alexandru Ionut Tripon
1e1730e5a9
fix mod load with empty gameversions ( #3455 )
2025-03-10 14:40:35 +02:00
Alexandru Ionut Tripon
bb9e19eec6
Qt app ID fix ( #3480 )
2025-03-09 15:03:38 +02:00
Echo J
14ab4055ff
Reduce app ID hardcoding
...
And rename the relevant build variable to make more sense
Signed-off-by: Echo J <tcg96nougat@gmail.com >
2025-03-09 14:16:48 +02:00
Echo J
ffdf1f746e
Remove .desktop suffix from application ID
...
Signed-off-by: Echo J <tcg96nougat@gmail.com >
2025-03-09 14:15:45 +02:00
Alexandru Ionut Tripon
91ef9f4998
fix duplicate optional mods dialog appearing when updating a modpack ( #3475 )
2025-03-09 14:05:09 +02:00
Alexandru Ionut Tripon
0716e49065
fix beginResetModel called before endResetModel ( #3470 )
2025-03-09 14:04:58 +02:00
Alexandru Ionut Tripon
43385f22be
fix null mainwindow in case of login on setup ( #3464 )
2025-03-09 14:04:48 +02:00
Trial97
59a816c696
fix duplicate optional mods dialog appearing when updating a modpack
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
tmp
2025-03-06 10:19:38 +02:00
Trial97
c441ae05df
fix beginResetModel called before endResetModel
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-03-05 13:06:29 +02:00
Sticks
d4e1851e67
fix: remove qWarning for unknown state
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Sticks <sticks@teamhydra.dev >
2025-03-04 22:20:40 -06:00
Trial97
7db717ee7c
fix null mainwindow in case of login on setup
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-03-03 23:55:44 +02:00
Trial97
162bbcfe19
rename some variables
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-03-03 23:55:43 +02:00
TheKodeToad
cb77cc1219
Use refresh instead of requestRefresh on LaunchController::login
...
There should be no reason to queue it and it could cause problems with the launcher's rate limiting
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-03 20:24:07 +00:00
Trial97
4dd026d1ae
QList to QVector
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-03-03 08:31:39 +02:00
Trial97
8e33608ddb
refactor FlameCheckUpdate to remove qEventLoop
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-03-03 08:31:39 +02:00
Trial97
22e0659a5f
removed unused BaseInstance argument from some API functions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-03-03 08:31:39 +02:00
Trial97
3da94eeea2
removed some unused QNetworkAccessManager references
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-03-03 08:31:39 +02:00
Alexandru Ionut Tripon
f9ab75868a
remove some QEventLoops ( #3044 )
2025-03-03 08:27:06 +02:00
Alexandru Ionut Tripon
5d268a3ded
chore: Update year range ( #3461 )
2025-03-03 08:26:56 +02:00
txtsd
f99b7e9ebd
chore: Update year range
...
Signed-off-by: txtsd <code@ihavea.quest >
2025-03-03 10:14:06 +05:30
Trial97
8f8c8394dc
remove some QEventLoops
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-03-02 08:36:48 +02:00
Alexandru Ionut Tripon
02b6afe3d5
Default to Fusion based Dark/Bright themes on Windows ( #3452 )
2025-03-02 08:21:20 +02:00
Alexandru Ionut Tripon
67d385fed2
chore(deps): update actions/cache action to v4.2.2 ( #3451 )
2025-03-02 08:19:27 +02:00
Alexandru Ionut Tripon
758b6cb756
chore(deps): update korthout/backport-action action to v3.2.0 ( #3448 )
2025-03-02 08:19:18 +02:00
Alexandru Ionut Tripon
74dd9ff43a
chore(nix): update lockfile ( #3439 )
2025-03-02 08:19:10 +02:00
Alexandru Ionut Tripon
ecf770d4ae
implement packignore for curseforge/modrinth export ( #3295 )
2025-03-02 08:19:03 +02:00
Alexandru Ionut Tripon
bf01d42c83
Add skin preview ( #3283 )
2025-03-02 08:18:51 +02:00
Alexandru Ionut Tripon
74ed1f3b5d
Improve profile setup error messages ( #3256 )
2025-03-02 08:18:40 +02:00
github-actions[bot]
d75f1e3032
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/2ff53fe64443980e139eaa286017f53f88336dd0?narHash=sha256-%2B/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc%3D' (2025-02-13)
→ 'github:NixOS/nixpkgs/6313551cd05425cd5b3e63fe47dbc324eabb15e4?narHash=sha256-D%2BR%2BkFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs%3D' (2025-02-27)
2025-03-02 00:26:09 +00:00
Trial97
29b3eb5cc6
fix mod load with empty gameversions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-03-01 22:45:36 +02:00
iTrooz
93286789c5
fix typo
...
Signed-off-by: iTrooz <hey@itrooz.fr >
2025-03-01 20:12:31 +01:00
Sticks
ea5458ed22
fix: Grammar correction in failed message for update dialogues
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Sticks <sticks@teamhydra.dev >
2025-02-28 21:06:34 -06:00
sticks
998bc660fa
feat: add updater dialogues
...
Signed-off-by: sticks <tanner@teamhydra.dev >
2025-02-28 15:09:46 -06:00
TheKodeToad
5261b615d7
Default to Fusion based Dark/Bright themes on Windows
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-02-28 21:07:58 +00:00
renovate[bot]
8cb999c479
chore(deps): update actions/cache action to v4.2.2
2025-02-27 19:24:06 +00:00
renovate[bot]
3cb44ba105
chore(deps): update korthout/backport-action action to v3.2.0
2025-02-23 22:35:16 +00:00
Alexandru Ionut Tripon
12a4915420
Apply suggestions from code review
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2025-02-21 11:32:30 +02:00
Trial97
6a2f5f071c
improve chessboard contrast
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-02-21 11:12:27 +02:00
Trial97
47af33ff6f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin
2025-02-21 08:40:33 +02:00
Trial97
5810032861
Fix icon removal in icon picker
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-02-19 09:29:05 +02:00
Trial97
c9471d083b
change java on modpack update
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-02-19 09:28:06 +02:00
Seth Flynn
0af021fef2
ci: always run nix workflow on push ( #3433 )
2025-02-19 02:17:41 -05:00
Alexandru Ionut Tripon
d24066c965
chore(deps): update actions/cache action to v4.2.1 ( #3432 )
2025-02-19 08:20:04 +02:00
Seth Flynn
46385e671d
ci: always run nix workflow on push
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-02-18 22:55:51 -05:00
renovate[bot]
73bb740bbb
chore(deps): update actions/cache action to v4.2.1
2025-02-18 18:14:21 +00:00
Alexandru Ionut Tripon
50ab1b2c40
Recognize riscv64 as a 64-bit platform ( #3425 )
2025-02-17 20:33:17 +02:00
Alexandru Ionut Tripon
d472b966dc
chore(nix): update lockfile ( #3401 )
2025-02-17 18:04:45 +02:00
Alexandru Ionut Tripon
beee93e199
Update hendrikmuhs/ccache-action action to v1.2.17 ( #3388 )
2025-02-17 18:04:33 +02:00
thonkdifferent
8f1750df51
Recognize riscv64 as a 64-bit platform
...
Currently PrismLauncher complains about the installed JDK being a 32-bit version, despite it being compiled for 64-bit RISC-V `riscv64`.
This PR fixes this issue.
Signed-off-by: thonkdifferent <41342923+thonkdifferent@users.noreply.github.com >
2025-02-16 19:30:31 +02:00
github-actions[bot]
bdf87fa02f
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/3a228057f5b619feb3186e986dbe76278d707b6e?narHash=sha256-xvTo0Aw0%2Bveek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc%3D' (2025-02-01)
→ 'github:NixOS/nixpkgs/2ff53fe64443980e139eaa286017f53f88336dd0?narHash=sha256-%2B/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc%3D' (2025-02-13)
2025-02-16 00:25:49 +00:00
Rachel Powers
3295b0717a
add libMangoHud_shim.so to mangohub preloadlist ( #3413 )
2025-02-13 14:41:01 -07:00
Rachel Powers
7b97863685
make sure if user changes java path also disable java management ( #3414 )
2025-02-13 14:40:40 -07:00
TheKodeToad
3840d8a37a
Always check Microsoft account for offline account
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-02-13 19:12:50 +00:00
Alexandru Ionut Tripon
3e4fc2ff3b
Increase the stale operations ( #3393 )
2025-02-13 13:44:01 +02:00
Alexandru Ionut Tripon
d22a20ffa6
Update .github/workflows/stale.yml
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2025-02-13 08:14:20 +02:00
TheKodeToad
de86e63611
Update .github/workflows/stale.yml
...
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-02-13 00:05:14 +00:00
TheKodeToad
e41a60e57e
remove some unused files ( #3412 )
2025-02-13 00:04:45 +00:00
iTrooz
34233a93a2
MinecraftTarget::parse() to parse IP
...
Signed-off-by: iTrooz <hey@itrooz.fr >
2025-02-13 00:55:35 +01:00
Trial97
174cddcf42
make sure if user changes java path also disable java management
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-02-12 20:40:09 +02:00
Trial97
9e954548dd
add libMangoHud_shim.so to mangohub preloadlist
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-02-12 20:21:45 +02:00
Trial97
14b653e08d
remove some unused files
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-02-12 20:16:00 +02:00
TheKodeToad
79180db663
Fix some undefined behaviour ( #3407 )
2025-02-11 19:04:56 +00:00
Alexandru Ionut Tripon
22b59e760c
Update launcher/ui/widgets/CheckComboBox.cpp
...
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2025-02-11 21:03:04 +02:00
Alexandru Ionut Tripon
1d1a4f1b30
Apply suggestions from code review
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2025-02-11 21:02:27 +02:00
Trial97
bf1084d7fa
Fix some undefined behaviour
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-02-11 10:59:10 +02:00
Trial97
ef825a7bc5
update stale action
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-02-06 09:58:41 +02:00
Alexandru Ionut Tripon
8d143c7b95
Fixed when game crashes, it doesn't log any time played ( #3392 )
2025-02-06 09:35:23 +02:00
Riley Richard
9ea33e0651
DCO Remediation Commit for Riley Richard <bubbalou112@gmail.com>
...
I, Riley Richard <bubbalou112@gmail.com >, hereby add my Signed-off-by to this commit: cb83f8e52d
Signed-off-by: Riley Richard <bubbalou112@gmail.com >
2025-02-05 18:10:31 -05:00
Trial97
f1209c1279
Increase the stale operations
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-02-05 23:43:38 +02:00
Riley Richard
17e95c0d07
forgot to sign
...
Signed-off-by: Riley Richard <bubbalou112@gmail.com >
2025-02-05 16:33:15 -05:00
Riley Richard
cb83f8e52d
fixed thing
2025-02-05 16:13:22 -05:00
Alexandru Ionut Tripon
7d202e348d
Use the same UI for instance and global settings ( #3341 )
2025-02-05 23:04:54 +02:00
Alexandru Ionut Tripon
364b5be856
Add stale workflow ( #3389 )
2025-02-05 23:04:38 +02:00
TheKodeToad
e1896d5b6b
Update launcher/ui/pages/global/MinecraftPage.h
...
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-02-05 13:45:49 +00:00
TheKodeToad
6e3dd04a1f
Update launcher/ui/pages/global/MinecraftPage.h
...
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-02-05 12:09:32 +00:00
TheKodeToad
f7a401ab22
Update launcher/ui/pages/instance/InstanceSettingsPage.h
...
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-02-05 12:09:26 +00:00
TheKodeToad
9ed6801b15
Update launcher/ui/pages/global/JavaPage.h
...
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-02-05 12:09:12 +00:00
TheKodeToad
06b50dfd33
Fix more header mistakes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-02-05 11:11:45 +00:00
TheKodeToad
5a76d9b7e1
Make requested changes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-02-05 10:58:06 +00:00
Alexandru Ionut Tripon
34438824c1
Update .github/workflows/stale.yml
...
Co-authored-by: Seth Flynn <getchoo@tuta.io >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2025-02-04 23:15:18 +02:00
Alexandru Ionut Tripon
ac598740b3
Update .github/workflows/stale.yml
...
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2025-02-04 22:08:46 +02:00
Alexandru Ionut Tripon
85c2710e33
Apply suggestions from code review
...
Co-authored-by: Seth Flynn <getchoo@tuta.io >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2025-02-04 22:08:16 +02:00
Alexandru Ionut Tripon
afe6d4836d
Update .github/workflows/stale.yml
...
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2025-02-04 17:41:36 +02:00
Trial97
9c26ba5932
add stale workflow
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-02-04 16:13:55 +02:00
renovate[bot]
2a987b5a4a
chore(deps): update hendrikmuhs/ccache-action action to v1.2.17
2025-02-03 22:11:56 +00:00
Alexandru Ionut Tripon
1a375dc243
Merge pull request #3382 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2025-02-03 00:28:59 +02:00
Alexandru Ionut Tripon
ab3792b080
Merge pull request #3381 from razzeee/patch-1
...
Add PackageManager category
2025-02-03 00:28:42 +02:00
Seth Flynn
f9dcc31843
Merge pull request #3374 from getchoo-contrib/ci/fix-nix-out-paths
...
Fix Nix workflow
2025-02-02 17:18:03 -05:00
Seth Flynn
989e6c6cb6
ci: directly print nix out paths to step summary
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-02-01 22:55:39 -05:00
Seth Flynn
138684a84f
Revert "ci: add nix out paths to job summary"
...
This reverts commit 588e0d6305 .
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-02-01 22:54:26 -05:00
github-actions[bot]
faf7e6b06e
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/825479c345a7f806485b7f00dbe3abb50641b083?narHash=sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU%3D' (2025-01-24)
→ 'github:NixOS/nixpkgs/3a228057f5b619feb3186e986dbe76278d707b6e?narHash=sha256-xvTo0Aw0%2Bveek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc%3D' (2025-02-01)
2025-02-02 00:24:39 +00:00
Kolja
f1671e3ded
Add PackageManager category
...
Signed-off-by: Kolja <razzeee@gmail.com >
2025-02-01 20:25:01 +01:00
Alexandru Ionut Tripon
6404d81ada
Merge pull request #3373 from Trial97/fix_crash2
...
Show warning when adding new resources with no instances
2025-01-31 23:03:55 +02:00
Alexandru Ionut Tripon
d6eb96df5c
Merge pull request #3260 from Trial97/fix_modrinth_shapshot
...
Map Minecraft snapshots to Modrinth
2025-01-31 23:02:55 +02:00
Trial97
c5efe081b4
fix add resource with no instance
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-31 22:03:57 +02:00
Seth Flynn
a639bc019e
Merge pull request #3368 from getchoo-contrib/ci/print-nix-out-paths
2025-01-31 07:00:37 -05:00
Seth Flynn
588e0d6305
ci: add nix out paths to job summary
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-01-30 13:34:34 -05:00
Sefa Eyeoglu
d7eddedf41
Merge pull request #3359 from PrismLauncher/ci/flakehub
2025-01-30 16:06:58 +01:00
Alexandru Ionut Tripon
6ae9fa4df4
Merge pull request #3314 from Trial97/update_modules
...
update submodules
2025-01-29 23:35:08 +02:00
Seth Flynn
86cc6d3c5e
feat: publish on flakehub
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-01-29 16:34:31 -05:00
Seth Flynn
61d7f08883
ci: use generic workflow for publishing
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-01-29 16:34:27 -05:00
Seth Flynn
0deb5e20ae
Merge pull request #3362 from getchoo-contrib/ci/flakehub-cache
2025-01-29 16:34:02 -05:00
Alexandru Ionut Tripon
fcb3dd5e9d
Merge pull request #3346 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2025-01-29 23:33:01 +02:00
Seth Flynn
169f5728b1
ci: run nix workflow on pull_request_target
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-01-29 16:22:44 -05:00
Seth Flynn
8816be1668
ci: use flakehub cache
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-01-29 16:17:01 -05:00
Alexandru Ionut Tripon
bd752c025c
Merge pull request #3360 from getchoo-contrib/ci/split
...
Split Flatpak and Nix CI jobs from main build workflow
2025-01-29 22:51:07 +02:00
Seth Flynn
49d734f314
ci: separate flatpak job
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-01-29 08:32:49 -05:00
Seth Flynn
417688089d
ci: separate nix job
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-01-29 08:31:45 -05:00
Seth Flynn
de21b77ae1
Merge pull request #3334 from PrismLauncher/renovate/determinatesystems-magic-nix-cache-action-9.x
...
chore(deps): update determinatesystems/magic-nix-cache-action action to v9
2025-01-29 07:44:06 -05:00
TheKodeToad
68bf409a98
Fix formatting issues
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-01-27 19:14:57 +00:00
TheKodeToad
5d179671bf
Fix non-Linux build
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-01-27 18:55:24 +00:00
TheKodeToad
dc6f536843
Fix Qt 5 compilation
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-01-27 18:04:41 +00:00
TheKodeToad
cc504f4a6c
Merge remote-tracking branch 'upstream/develop' into unify-mc-settings
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-01-27 17:02:50 +00:00
TheKodeToad
a92c68adbd
Remove duplicate console section
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-01-27 16:54:45 +00:00
TheKodeToad
7aaa9fa93c
Finish off MinecraftSettingsWidget implementation
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-01-27 16:46:26 +00:00
TheKodeToad
81769b9047
Use MinecraftInstancePtr instance of InstancePtr
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-01-27 14:34:07 +00:00
TheKodeToad
147b315c14
Update thresholds when min. memory value is changed too
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-01-27 14:15:07 +00:00
TheKodeToad
9d0918a064
Remove outdated JavaWizardWidget comment
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-01-27 13:19:10 +00:00
TheKodeToad
98ab686348
Merge remote-tracking branch 'upstream/develop' into unify-mc-settings
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-01-27 13:18:19 +00:00
TheKodeToad
39ae2fbd4a
Fix tab inconsistencies
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-01-26 22:44:43 +00:00
TheKodeToad
36a35d7925
Fix tab order
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-01-26 22:36:48 +00:00
TheKodeToad
1b4b36df33
Unify Java page
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-01-26 22:25:26 +00:00
github-actions[bot]
3d9e073721
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/5df43628fdf08d642be8ba5b3625a6c70731c19c?narHash=sha256-Tbk1MZbtV2s5aG%2BiM99U8FqwxU/YNArMcWAv6clcsBc%3D' (2025-01-16)
→ 'github:NixOS/nixpkgs/825479c345a7f806485b7f00dbe3abb50641b083?narHash=sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU%3D' (2025-01-24)
2025-01-26 00:23:21 +00:00
iTrooz
bb20848449
use more sensible protocol version
...
Signed-off-by: iTrooz <hey@itrooz.fr >
2025-01-25 21:01:21 +01:00
iTrooz
0b9d4784d8
Show socket error in McClient
...
Signed-off-by: iTrooz <hey@itrooz.fr >
2025-01-25 20:26:52 +01:00
iTrooz
b06c4341d8
update documentation
...
Signed-off-by: iTrooz <hey@itrooz.fr >
2025-01-25 20:22:09 +01:00
iTrooz
7c82cd82d7
use m_responseReadState to avoid calling parseResponse() (as a failsafe for malicious/bad server responses)
...
Signed-off-by: iTrooz <hey@itrooz.fr >
2025-01-25 20:19:19 +01:00
iTrooz
439c565961
forward McResolver error as Task error
...
Signed-off-by: iTrooz <hey@itrooz.fr >
2025-01-25 20:14:15 +01:00
iTrooz
cf2b413f29
forward McClient error as Task error
...
Signed-off-by: iTrooz <hey@itrooz.fr >
2025-01-25 20:10:31 +01:00
iTrooz
fe8f755b43
remove waitForConnected() and waitForReadyRead() and use signals ineatd
...
Signed-off-by: iTrooz <hey@itrooz.fr >
2025-01-25 20:08:44 +01:00
iTrooz
43376b1c40
remove unused defines in McClient.h
...
Signed-off-by: iTrooz <hey@itrooz.fr >
2025-01-25 19:06:52 +01:00
Trial97
255f27d419
virtual constructor
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-22 16:11:54 +02:00
Trial97
aeeb6f6bb6
fix build final
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-22 00:16:20 +02:00
Trial97
49d82ab528
fix build
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-21 23:49:42 +02:00
Alexandru Ionut Tripon
fdb4159f2a
Merge pull request #3332 from eff3ry/modrinth-filter-tweak
...
Update Modrinth Client/Server Filters to match Modrinth website & launcher.
2025-01-21 23:42:37 +02:00
Alexandru Ionut Tripon
98be91c9d5
Merge pull request #3294 from Trial97/fix_flame_update
...
Fix updating Curseforge mods with missing mod loader
2025-01-21 23:40:21 +02:00
Trial97
7010b8acb6
fix the freeze with openglwidget
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-21 23:36:40 +02:00
renovate[bot]
705375c0df
chore(deps): update determinatesystems/magic-nix-cache-action action to v9
2025-01-21 21:35:18 +00:00
Alexandru Ionut Tripon
38d3f14f06
Apply suggestions from code review
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2025-01-21 16:45:40 +02:00
TheKodeToad
8d3684c484
Merge pull request #1413 from Trial97/fix_curse_import
...
feat: updated flame mod resolution
2025-01-21 13:53:00 +00:00
Alexandru Ionut Tripon
0d4eeb9965
Merge pull request #3330 from getchoo-contrib/mingw-cfg
...
Use better compile flags for MINGW
2025-01-21 15:18:43 +02:00
Jeffery Tolmie
caccaefb39
Change "none" to ""
...
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
Signed-off-by: Jeffery Tolmie <jeffery.tolmie@gmail.com >
2025-01-22 02:06:49 +13:00
eff3ry
532fec7748
DCO Remediation Commit
...
DCO Remediation Commit for eff3ry <jeffery.tolmie@gmail.com >
I, eff3ry <jeffery.tolmie@gmail.com >, hereby add my Signed-off-by to this commit: 2a403b3bfe
I, eff3ry <jeffery.tolmie@gmail.com >, hereby add my Signed-off-by to this commit: 4ba3fd559d
Signed-off-by: eff3ry <jeffery.tolmie@gmail.com >
2025-01-22 01:48:04 +13:00
eff3ry
4ba3fd559d
Update Filter Checks
...
Updates the filter checks so that options both and none can be differentiated.
Signed-off-by: Jeffery Tolmie Jeffery.tolmie@gmail.com
2025-01-22 01:40:59 +13:00
eff3ry
2a403b3bfe
Edit Modrinth search faucets
...
Edit Modrinth search faucets to alter the client and server filters to be more in-line with the Modrinth website and Launcher, making it easier to find client-side only mods etc.
Signed-off-by: Jeffery Tolmie Jeffery.tolmie@gmail.com
2025-01-22 01:39:28 +13:00
Seth Flynn
f8a504e254
Merge pull request #3299 from Trial97/appimage2
...
Use Ubuntu 22.04 for Linux builds
2025-01-20 23:43:45 -05:00
Seth Flynn
e66f447ce5
feat: use better compile flags for mingw
...
Signed-off-by: Seth Flynn <getchoo@tuta.io >
2025-01-20 20:36:48 -05:00
Seth Flynn
67b218b1f3
Merge pull request #2895 from Edgars-Cirulis/qt-6.8
...
chore: update to qt 6.8.x
2025-01-20 18:53:05 -05:00
Alexandru Ionut Tripon
db766574a4
Update .github/workflows/build.yml
...
Co-authored-by: Seth Flynn <getchoo@tuta.io >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2025-01-21 01:38:13 +02:00
timoreo
18da01c9a6
Merge pull request #3320 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2025-01-20 09:48:11 +01:00
Alexandru Ionut Tripon
c79ad73311
Merge pull request #3319 from getchoo-contrib/flatpak-arm
...
Build Flatpaks for ARM
2025-01-19 10:16:41 +02:00
Sefa Eyeoglu
fb3926a85d
Merge pull request #3318 from getchoo-contrib/nix-arm
...
Build Nix packages for aarch64-linux
2025-01-19 09:08:17 +01:00
github-actions[bot]
8d4f279539
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/bffc22eb12172e6db3c5dde9e3e5628f8e3e7912?narHash=sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc%2Bc2c%3D' (2025-01-08)
→ 'github:NixOS/nixpkgs/5df43628fdf08d642be8ba5b3625a6c70731c19c?narHash=sha256-Tbk1MZbtV2s5aG%2BiM99U8FqwxU/YNArMcWAv6clcsBc%3D' (2025-01-16)
2025-01-19 00:24:56 +00:00
Alexandru Ionut Tripon
1b5d3c2bf9
Update .github/workflows/build.yml
...
Co-authored-by: seth <getchoo@tuta.io >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2025-01-19 02:03:21 +02:00
Trial97
be3eca8c97
remove specific step for qt6
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-19 01:05:06 +02:00
seth
66f0397087
ci: build flatpaks for arm
...
Signed-off-by: seth <getchoo@tuta.io >
2025-01-18 17:16:02 -05:00
seth
8e8538b506
ci: build nix packages for aarch64-linux
...
Signed-off-by: seth <getchoo@tuta.io >
2025-01-18 16:55:38 -05:00
Trial97
dc00c47f2e
update submodules
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-18 13:27:18 +02:00
Trial97
7d3238d234
rename variables
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-17 21:09:44 +02:00
Alexandru Ionut Tripon
f17599c8b8
Merge pull request #1689 from Trial97/progrss_bar_interaction
...
Added mouse interactions for labels in ProgressDialog
2025-01-17 20:59:52 +02:00
Trial97
8e5a7c6e33
ensure that the snapshot mapping is on all apis
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-17 10:35:13 +02:00
Trial97
1d8bf1d5a7
map modrinth snapshots
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-17 09:19:39 +02:00
Alexandru Ionut Tripon
0a71b19509
Apply suggestions from code review
...
Co-authored-by: seth <getchoo@tuta.io >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2025-01-17 08:53:10 +02:00
Alexandru Ionut Tripon
c2f4389e5f
Merge pull request #3254 from Trial97/remove_multimc
...
remove EditAccountDialog
2025-01-17 08:51:44 +02:00
Alexandru Ionut Tripon
b7d117cc77
Merge pull request #2737 from maskersss/log-upload
...
Truncate logs for mclo.gs to fit 25k line limit
2025-01-17 08:49:49 +02:00
seth
1cce582d56
Merge pull request #3292 from Trial97/fix_modrinth_link
...
fix modrinth link
2025-01-16 20:42:00 -05:00
seth
867aaf881e
Merge pull request #3286 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2025-01-16 20:40:44 -05:00
seth
14b348ffe7
Merge pull request #3285 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x
...
chore(deps): update hendrikmuhs/ccache-action action to v1.2.16
2025-01-16 20:40:17 -05:00
Edgars Cīrulis
181610a8c1
Merge branch 'PrismLauncher:develop' into qt-6.8
2025-01-17 03:04:43 +02:00
seth
b7f2175718
Merge pull request #3179 from sshcrack/fix-inst-java
...
Fix $INST_JAVA not being set for auto download java
2025-01-16 20:03:26 -05:00
seth
7a1dc0e9c9
Merge pull request #1555 from Trial97/env_vars
...
correctly expand env vars for pre/post launch commands
2025-01-16 19:45:31 -05:00
Trial97
9317a675ed
removed unused type
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-16 17:07:44 +02:00
Trial97
7cb8deeb90
feat: updated flame mod resolution
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-16 17:05:36 +02:00
Trial97
797cacf804
refactor to remove code duplication
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-16 17:04:53 +02:00
Trial97
d2516cbecc
use YCbCr for chesboard pattern
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-16 14:11:56 +02:00
Trial97
bca517b8d3
fix appimage
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-16 12:10:19 +02:00
Trial97
aa6518410e
fix build
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-15 23:04:47 +02:00
Trial97
9d25680587
remove defaults blocked list
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-15 22:35:47 +02:00
Trial97
82e59658d5
uniform ignoreFilesWithPath
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-15 21:59:31 +02:00
Trial97
a6f5858dac
Fix ignore for modrinth/flame export
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-15 21:54:02 +02:00
Trial97
c0525ebf4e
add wheel support for zoom
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-15 17:59:45 +02:00
Trial97
dbeb987978
improve skin preview
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-15 17:59:24 +02:00
Trial97
f6622a4cbb
implement packignore for curseforge/modrinth export
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-14 18:48:41 +02:00
Trial97
2292df16cc
some renames
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-14 18:48:20 +02:00
Trial97
e4ad4051c8
fix curseforge with empty loader as newest version
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-13 13:56:55 +02:00
Trial97
3ee73916ca
fix modrinth link
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-13 08:16:12 +02:00
github-actions[bot]
03834e1455
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/6df24922a1400241dae323af55f30e4318a6ca65?narHash=sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk%3D' (2025-01-02)
→ 'github:NixOS/nixpkgs/bffc22eb12172e6db3c5dde9e3e5628f8e3e7912?narHash=sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc%2Bc2c%3D' (2025-01-08)
2025-01-12 00:26:01 +00:00
renovate[bot]
54da41c625
chore(deps): update hendrikmuhs/ccache-action action to v1.2.16
2025-01-11 22:11:18 +00:00
Trial97
1b98c69948
generate skin preview
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-10 17:30:00 +02:00
Trial97
5ba4b3a32f
add licence header
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-10 15:31:57 +02:00
Trial97
059c03c655
fix qt5 build
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-10 15:03:53 +02:00
Trial97
87ec7cdd39
move background to vertex buffer
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-10 14:54:40 +02:00
Trial97
0219c11a73
Fix build CI
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-10 11:48:21 +02:00
Trial97
6fc386cfe9
Move shaders to separate files
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-10 11:40:38 +02:00
Trial97
cd0895b237
Add skin preview
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-10 00:54:14 +02:00
Alexandru Ionut Tripon
f4f1d5f0d7
Merge pull request #3228 from Trial97/delete_block
...
Add settings to control the if prism should move the downloaded mods
2025-01-09 00:12:12 +02:00
Alexandru Ionut Tripon
fbd886e9db
Merge pull request #3255 from Trial97/propagate_load
...
propagate load component error
2025-01-09 00:11:48 +02:00
Alexandru Ionut Tripon
0fb99d837f
Merge pull request #3230 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2025-01-09 00:11:24 +02:00
Alexandru Ionut Tripon
cb8320ca41
Merge pull request #3278 from Trial97/remove_drop
...
remove drop label
2025-01-09 00:10:50 +02:00
Alexandru Ionut Tripon
33981b9870
Merge pull request #3215 from Trial97/fix_custom_instance_icons
...
Fix curseforge/modrinth instance icons
2025-01-09 00:10:39 +02:00
Alexandru Ionut Tripon
07a0a15457
Merge pull request #3277 from Trial97/drop_file
...
fix drop file on resource page
2025-01-08 10:46:55 +02:00
Trial97
0f9ea5c949
remove drop label
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-08 01:55:45 +02:00
Trial97
d40c8b704c
fix drop file on resource page
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-01-08 01:52:11 +02:00
github-actions[bot]
82a500f4e8
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/5d67ea6b4b63378b9c13be21e2ec9d1afc921713?narHash=sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g%3D' (2024-12-11)
→ 'github:NixOS/nixpkgs/6df24922a1400241dae323af55f30e4318a6ca65?narHash=sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk%3D' (2025-01-02)
2025-01-05 00:25:34 +00:00
Trial97
4358e28d7e
improve profile setup error message
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-12-31 14:33:36 +02:00
Trial97
6ebfcb91cf
propagate load component error
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-12-31 13:44:22 +02:00
Trial97
e01df73deb
remove EditAccountDialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-12-31 11:13:01 +02:00
Trial97
7dde35fef2
Add settings to control the if prism should move the downloaded mods
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-12-20 19:57:09 +02:00
Trial97
23ffc4d8b9
Refactor ResourcePack
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-12-19 10:42:42 +02:00
Alexandru Ionut Tripon
0b6ce5525d
Merge pull request #3216 from Trial97/fix_auto_mod_provider
...
Fix automatically choose mod provider option
2024-12-19 09:16:59 +02:00
timoreo
f17faadf8a
Merge pull request #3174 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-12-18 19:54:44 +01:00
timoreo
c7b6977692
Merge pull request #3043 from Trial97/fix_flame_loader_match
...
fix the flame loaders match
2024-12-18 19:53:22 +01:00
timoreo
423d72a6e8
Merge pull request #3197 from Trial97/fix_curseforge_import
...
Do not fail curseforge import if modrinth file check fails
2024-12-18 19:48:05 +01:00
timoreo
2a2ed9f8bd
Merge pull request #3214 from kthchew/fix/manifest-symlink
...
Correct symbolic link destination on manifest (Mojang) Java download
2024-12-18 19:42:25 +01:00
Trial97
0412ed3f78
Fix automatically choose mod provider option
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-12-16 14:51:59 +02:00
Trial97
f4d93a08ba
Fix curseforge/modrinth instance icons
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-12-16 13:27:44 +02:00
Kenneth Chew
8d53242952
Correct symbolic link destination on manifest Java download
...
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com >
2024-12-16 03:30:09 -05:00
github-actions[bot]
706e263050
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'flake-compat':
'github:edolstra/flake-compat/9ed2ac151eada2306ca8c418ebd97807bb08f6ac?narHash=sha256-HRJ/18p%2BWoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg%3D' (2024-11-27)
→ 'github:edolstra/flake-compat/ff81ac966bb2cae68946d5ed5fc4994f96d0ffec?narHash=sha256-NeCCThCEP3eCl2l/%2B27kNNK7QrwZB1IJCrXfrbv5oqU%3D' (2024-12-04)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/970e93b9f82e2a0f3675757eb0bfc73297cc6370?narHash=sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE%3D' (2024-11-28)
→ 'github:NixOS/nixpkgs/5d67ea6b4b63378b9c13be21e2ec9d1afc921713?narHash=sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g%3D' (2024-12-11)
2024-12-15 00:27:47 +00:00
Alexandru Ionut Tripon
507faf9f00
Merge pull request #3150 from kthchew/fix/unneeded-hr-exceptions
...
Remove unnecessary hardened runtime exceptions on macOS
2024-12-14 19:30:11 +02:00
Alexandru Ionut Tripon
c0803365ef
Merge pull request #3202 from kthchew/chore/bump-sparkle
...
[macOS] Update Sparkle to v2.6.4
2024-12-14 18:18:04 +02:00
Alexandru Ionut Tripon
02e527c15b
Merge pull request #3199 from kthchew/fix/launcher-settings-tab
...
Fix tab order in launcher settings
2024-12-14 18:17:08 +02:00
Alexandru Ionut Tripon
5659dad23d
Merge pull request #3198 from kthchew/fix/local-net-use-desc
...
[macOS] Add local network usage description
2024-12-14 18:16:34 +02:00
Alexandru Ionut Tripon
647bb04a0d
Merge pull request #3181 from Trial97/fix_mrpack_crash
...
fix crash with invalid mrpack format
2024-12-14 18:15:50 +02:00
Kenneth Chew
b6cd46ad27
Update Sparkle to v2.6.4
...
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com >
2024-12-14 00:42:08 -05:00
Kenneth Chew
c3712ba648
Fix tab order in launcher settings
...
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com >
2024-12-12 14:53:39 -05:00
Kenneth Chew
c3e44554ab
Add local network usage description
...
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com >
2024-12-12 14:43:28 -05:00
Trial97
a1c1c0b769
Do not fail curseforge import if modrinth file check fails
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-12-12 17:29:46 +02:00
Alexandru Ionut Tripon
15e58589d5
Merge pull request #3170 from leia-uwu/fix-icon-theme-path
...
[Linux] Don't use fallback icon search paths
2024-12-09 09:14:25 +02:00
Edgars Cirulis
eb8c375ec5
chore: update Qt to 6.8.1
...
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com >
2024-12-09 00:40:05 +02:00
Trial97
1dd0728a58
fix crash with invalid mrpack format
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-12-08 22:04:16 +02:00
sshcrack
cf2dcbd431
load meta first
...
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com >
2024-12-08 18:27:57 +01:00
sshcrack
dedb7a2343
change order of steps
...
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com >
2024-12-08 14:39:06 +01:00
sshcrack
c06f83507c
now its too much newlines??
...
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com >
2024-12-07 20:29:09 +01:00
sshcrack
1cd4b49789
git is making me crazy at this point
...
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com >
2024-12-07 20:26:48 +01:00
sshcrack
c4ba7fc401
add newline back
...
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com >
2024-12-07 20:25:12 +01:00
sshcrack
8bb35f5b0b
add macos support for shortcuts
...
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com >
2024-12-07 20:25:09 +01:00
leia uwu
614574f15c
fix icon theme search paths
...
using fallback search paths breaks qadwaitadecorations
Signed-off-by: leia uwu <leia@tutamail.com >
2024-12-06 23:26:46 -03:00
Alexandru Ionut Tripon
28a471777a
Merge pull request #2800 from QazCetelic/advanced-icon-dialog
...
Add search and support for subdirectories to icon picker
2024-12-06 12:37:45 +02:00
Alexandru Ionut Tripon
93526637cb
Merge pull request #3166 from PrismLauncher/renovate/actions-cache-4.x
...
chore(deps): update actions/cache action to v4.2.0
2024-12-06 08:47:04 +02:00
renovate[bot]
94c893bd86
chore(deps): update actions/cache action to v4.2.0
2024-12-05 20:29:11 +00:00
iTrooz
f9e450ace2
do not destroy the ping ConcurrentTask directly at the end of the task
...
Signed-off-by: iTrooz <hey@itrooz.fr >
2024-12-05 20:43:40 +01:00
iTrooz
4e48015868
currentQueryTask -> m_currentQueryTask
...
Signed-off-by: iTrooz <hey@itrooz.fr >
2024-12-05 20:43:40 +01:00
Alexandru Ionut Tripon
c99876f3d7
Merge pull request #3154 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-12-03 16:17:50 +02:00
Alexandru Ionut Tripon
a3b2f1a931
Merge pull request #3119 from guihkx/flathub-manifest-sync
...
Sync Flatpak manifest with Flathub's
2024-12-02 17:30:19 +02:00
TheKodeToad
488dc7815c
Merge pull request #3135 from Trial97/italic
...
Make FTB Import note italic to match others
2024-12-02 14:07:42 +00:00
Tayou
dbee4bee14
Merge pull request #3152 from leia-uwu/fix-system-icons
...
Fix system icons on Linux
2024-12-02 15:00:43 +01:00
github-actions[bot]
2cfd116947
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'flake-compat':
'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33?narHash=sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U%3D' (2023-10-04)
→ 'github:edolstra/flake-compat/9ed2ac151eada2306ca8c418ebd97807bb08f6ac?narHash=sha256-HRJ/18p%2BWoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg%3D' (2024-11-27)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/23e89b7da85c3640bbc2173fe04f4bd114342367?narHash=sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w%3D' (2024-11-19)
→ 'github:NixOS/nixpkgs/970e93b9f82e2a0f3675757eb0bfc73297cc6370?narHash=sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE%3D' (2024-11-28)
2024-12-01 00:30:03 +00:00
leia uwu
3f67ef968b
fix: icon search paths memory leak
...
Signed-off-by: leia uwu <leia@tutamail.com >
2024-11-30 12:51:39 -03:00
leia uwu
fd9c80db62
fix: fix system icons
...
This sets the fallback icon theme to the current(system default) icon theme before
launcher specific themes are applied
And removes `Inherits` line of multimc/legacy icon theme because it can end up making it
inherit a default theme set from /usr/share/icons/default/index.theme
instead of the user configured theme (probably a qt bug?)
Signed-off-by: leia uwu <leia@tutamail.com >
2024-11-30 11:35:41 -03:00
Kenneth Chew
7e76638f2c
Only disable library validation if using ad-hoc signature
...
While not needed for regular releases, it is needed for CI when an Apple Developer account isn't available and you can only perform an ad-hoc signature.
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com >
2024-11-29 21:18:07 -05:00
Kenneth Chew
884f15da1e
Remove unnecessary hardened runtime exceptions
...
These are cruft from an older time when the launcher was ad-hoc signed, and the OS couldn't tell the libraries and launcher were signed by the same party.
Additionally, add a workaround to send the necessary library injection to the game if Steam overlay is used despite library validation being on for the launcher.
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com >
2024-11-29 21:18:06 -05:00
iTrooz
ba0bd5fd74
Use shared pointer to store server query task
...
Signed-off-by: iTrooz <hey@itrooz.fr >
2024-11-29 19:42:54 +01:00
iTrooz
1477d64400
add m_ prefix to class members
...
Signed-off-by: iTrooz <hey@itrooz.fr >
2024-11-29 19:42:52 +01:00
iTrooz
4aaf7b9b09
chore
...
Signed-off-by: iTrooz <hey@itrooz.fr >
2024-11-29 14:07:39 +01:00
iTrooz
fd1cb1b58b
DCO Remediation Commit for iTrooz <hey@itrooz.fr>
...
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: fac521a312
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 43a54cafef
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: ee35ac5afd
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 99ac11bc40
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 8fa1dff17d
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 2f70115be5
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: ea2a2349f8
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 87c9066a2b
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: fe28a051d5
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 0a379a05ff
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 6a7678a6e9
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: cba7e2dc36
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 8cf0c2029c
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 0d830e56e9
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: b35cffb347
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 1f094b9803
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 2d06e0a111
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: c3543b104b
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 8b7040d416
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: b8035ca078
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 9d5727e36b
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 7cf24586c2
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 7d04f0ee75
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 60fb922ba2
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: a79a66c177
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 1fb0fe0171
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 5cfb5a6f0d
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 9ce5eaaa0c
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 0c6f78dee2
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 7c8d2c9b55
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 24b9815763
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 7d2da19418
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: ca6d66970e
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 520d6b0b42
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 4fad298d67
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 087ab70143
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 7c61fec8e0
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: fef8ee2d1b
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 3a9c030982
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: f05548f3a3
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 66f36195d8
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: ca52d00b80
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 26f50f9b81
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 873232ebe3
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 8b90a9f2b3
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: dbb88ca7df
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 6f9be258dc
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: d124e2e0cb
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: cfb0c97262
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 5eb417ff2b
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 3fb6764ea4
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: ae7d3379e4
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 09782745c6
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: b0778e7a1f
I, iTrooz <hey@itrooz.fr >, hereby add my Signed-off-by to this commit: 01db826ec9
Signed-off-by: iTrooz <hey@itrooz.fr >
2024-11-29 01:01:32 +01:00
iTrooz
01db826ec9
Reset online players UI component when refreshing
2024-11-29 00:58:08 +01:00
iTrooz
b0778e7a1f
chore
2024-11-29 00:44:31 +01:00
iTrooz
09782745c6
make writePacketToSocket() clear data automatically
2024-11-29 00:44:25 +01:00
iTrooz
ae7d3379e4
abort current query task if present when refreshing
2024-11-29 00:39:43 +01:00
iTrooz
3fb6764ea4
fix typo
2024-11-29 00:13:43 +01:00
iTrooz
5eb417ff2b
Always autodelete signal connections with this captured when the objet is deleted, just to be sure
2024-11-28 23:54:51 +01:00
TheKodeToad
616aa002e1
Merge pull request #2875 from Jan200101/PR/switcheroo
...
[Linux] Integrate switcheroo-control for discrete GPU support
2024-11-28 20:02:58 +00:00
iTrooz
cfb0c97262
use Json::requireInteger()
2024-11-28 18:09:38 +01:00
iTrooz
d124e2e0cb
cleanup
2024-11-28 17:50:55 +01:00
iTrooz
6f9be258dc
add documentation about task abortion
2024-11-28 17:49:35 +01:00
iTrooz
dbb88ca7df
move ServerPingTask in its own file
2024-11-28 17:46:42 +01:00
iTrooz
8b90a9f2b3
remove infinite loop from readVarInt()
2024-11-28 17:32:49 +01:00
iTrooz
873232ebe3
remove infinite loop in writeVarInt()
2024-11-28 17:29:35 +01:00
guihkx
e0faee7f26
ci(flatpak): update build artifact name
...
Just aligning the name of the Flatpak package with other build artifacts.
Signed-off-by: guihkx <626206+guihkx@users.noreply.github.com >
2024-11-27 14:35:15 -03:00
iTrooz
26f50f9b81
connect job to deletion task before starting it
...
This ensures the signal is not fired before we have connected it
2024-11-26 18:50:37 +01:00
iTrooz
ca52d00b80
replace std::string by QString in emitFail()
2024-11-26 18:47:13 +01:00
iTrooz
66f36195d8
simplify code
2024-11-26 18:44:21 +01:00
iTrooz
f05548f3a3
remove implicit captures
2024-11-26 18:43:14 +01:00
iTrooz
3a9c030982
Do not timeout after just 3000ms
...
Keep the network default timeout
2024-11-26 18:24:46 +01:00
iTrooz
fef8ee2d1b
Disconnect task finished signal when ServersModel is destroyed
2024-11-26 18:16:15 +01:00
iTrooz
7c61fec8e0
Make task output online players rather than updating Server itself
...
This doesn't really change anything
2024-11-26 18:03:35 +01:00
guihkx
f6770a847a
flatpak: update KDE runtime to 6.8
...
This also switches to the Docker image provided and maintained by
Flathub collaborators through the 'flathub-infra' organization on
GitHub, because it looks better maintained at the moment.
Signed-off-by: guihkx <626206+guihkx@users.noreply.github.com >
2024-11-26 13:51:09 -03:00
guihkx
4a50e94967
flatpak: update xrandr to 1.5.3
...
Signed-off-by: guihkx <626206+guihkx@users.noreply.github.com >
2024-11-26 13:51:09 -03:00
iTrooz
087ab70143
refresh UI when we got the players online
2024-11-26 14:33:02 +01:00
iTrooz
4fad298d67
put more McClient methods to private
2024-11-26 13:22:02 +01:00
iTrooz
520d6b0b42
run socket code in thread
2024-11-26 13:22:00 +01:00
iTrooz
ca6d66970e
add documentation for Task and ConcurrentTask
2024-11-25 23:49:03 +01:00
Jan200101
514ec99a03
Integrate switcheroo-control for discrete GPU support
...
Signed-off-by: Jan200101 <sentrycraft123@gmail.com >
2024-11-25 22:29:39 +01:00
TheKodeToad
6c062c48b4
Merge pull request #3130 from Kationor/trimversion
...
Improve MANIFEST.MF parsing
2024-11-25 10:05:02 +00:00
iTrooz
7d2da19418
make McResolver have the same signal name conventions as Task
2024-11-25 01:09:47 +01:00
iTrooz
24b9815763
cleanup
2024-11-25 00:16:46 +01:00
iTrooz
7c8d2c9b55
always delete McResolver object, even when it fails
2024-11-25 00:16:25 +01:00
iTrooz
0c6f78dee2
communicate when ServerPingTask succeeds/fails
2024-11-25 00:10:17 +01:00
iTrooz
9ce5eaaa0c
fix job being deleted before tasks are finished
2024-11-24 23:54:19 +01:00
Kationor
b40a1973bf
Improve MANIFEST.MF parsing
...
Previously, we would only properly parse LF-encoded manifests, and even
those only if they used the recommended casing.
This commit allows the parser to recognise CR and CRLF newlines, and
also makes the name comparison case insensitive to align with the
specification. (Though not completely: we still don't support multiline
values)
Signed-off-by: Kationor <n96211028@gmail.com >
2024-11-24 19:30:59 +01:00
Trial97
a09af619ce
Make FTB Import note italic to match others
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-11-24 20:29:07 +02:00
TheKodeToad
835944387b
Merge pull request #3128 from QazCetelic/naming-clang-tidy
...
Add naming check in `.clang-tidy` file
2024-11-24 16:10:41 +00:00
iTrooz
5cfb5a6f0d
do not capture things implicitely in lambdas
2024-11-24 16:37:42 +01:00
QazCetelic
d927c539b5
Update CONTRIBUTING.md conventions section
...
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com >
2024-11-23 19:55:40 +01:00
QazCetelic
14454faac8
Use old list style
...
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com >
2024-11-23 18:21:03 +01:00
QazCetelic
2351531e84
Add naming checks to clang-tidy
...
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com >
2024-11-23 18:15:07 +01:00
QazCetelic
33ff3b4f36
Fix naming
...
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com >
2024-11-23 18:10:33 +01:00
seth
11e7b218d4
Merge pull request #3113 from PrismLauncher/update_flake_lock_action
...
chore(nix): adopt new darwin SDK pattern
2024-11-22 18:25:21 -05:00
seth
fbbd64ddb7
chore(nix): sync with upstream nixpkgs
...
Signed-off-by: seth <getchoo@tuta.io >
2024-11-22 17:33:16 -05:00
github-actions[bot]
41db87c8cf
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nix-filter':
'github:numtide/nix-filter/776e68c1d014c3adde193a18db9d738458cd2ba4?narHash=sha256-SCHiL%2B1f7q9TAnxpasriP6fMarWE5H43t25F5/9e28I%3D' (2024-10-29)
→ 'github:numtide/nix-filter/f7653272fd234696ae94229839a99b73c9ab7de0?narHash=sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms%3D' (2024-11-13)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/4aa36568d413aca0ea84a1684d2d46f55dbabad7?narHash=sha256-Zwl8YgTVJTEum%2BL%2B0zVAWvXAGbWAuXHax3KzuejaDyo%3D' (2024-11-05)
→ 'github:NixOS/nixpkgs/23e89b7da85c3640bbc2173fe04f4bd114342367?narHash=sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w%3D' (2024-11-19)
2024-11-22 22:26:01 +00:00
Alexandru Ionut Tripon
79dd912126
Merge pull request #3091 from Awqre/develop
...
Lossless image asset compression
2024-11-20 10:12:34 +02:00
Awqre
00fa65c18b
Merge branch 'PrismLauncher:develop' into develop
2024-11-20 02:08:31 +00:00
iTrooz
1fb0fe0171
ping servers when opening Servers page
2024-11-19 20:48:17 +01:00
iTrooz
a79a66c177
remove debug print
2024-11-19 20:43:04 +01:00
iTrooz
60fb922ba2
remove QObject parent argument from ServerPingTask constructor
2024-11-19 20:43:04 +01:00
seth
59db80cb0e
Merge pull request #3068 from Scrumplex/chore/update-nixos-readme
...
[Linux] Update Nix README
2024-11-19 10:09:11 -05:00
Alexandru Ionut Tripon
e5a4dfdf16
Merge pull request #2962 from AOSC-Tracking/upstream/detect-aosc-os-jdks
...
javautils: add a filter for detecting Java paths on AOSC OS
2024-11-19 13:44:57 +02:00
QazCetelic
6ca18c6266
Refactoring
...
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com >
2024-11-18 19:19:02 +01:00
QazCetelic
e74592fa09
Code style conventions (camelCase, m_ prefix)
...
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com >
2024-11-17 20:43:09 +01:00
QazCetelic
abbebff400
Removed bug when renaming icon file in nested folder while application is running
...
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com >
2024-11-17 20:35:24 +01:00
iTrooz
7d04f0ee75
remove useless code when reading response
2024-11-17 20:06:08 +01:00
iTrooz
7cf24586c2
.hpp -> .h
2024-11-17 19:58:30 +01:00
iTrooz
9d5727e36b
MCResolver -> McResolver
2024-11-17 19:51:15 +01:00
iTrooz
b8035ca078
refactor header and code into 2 files
2024-11-17 19:50:52 +01:00
iTrooz
8b7040d416
use Qt5-compatible writeString() impl
2024-11-17 19:37:15 +01:00
iTrooz
c3543b104b
fix qDebug() call with string << append
2024-11-17 19:26:21 +01:00
iTrooz
2d06e0a111
Fix after rebase
2024-11-17 19:21:09 +01:00
iTrooz
1f094b9803
avoid translating back to stf string without reason
2024-11-17 19:10:15 +01:00
iTrooz
b35cffb347
fix warning about unused jsonLength
2024-11-17 19:10:15 +01:00
iTrooz
0d830e56e9
replace std::runtime_exception with PrismLauncher Exception + add try/catch
2024-11-17 19:10:15 +01:00
iTrooz
8cf0c2029c
No need to close the socket, it is done automatically
...
https://doc.qt.io/qt-6/qtcpsocket.html#dtor.QTcpSocket
2024-11-17 19:10:15 +01:00
iTrooz
cba7e2dc36
use std::optional<> to signify when there is no value
2024-11-17 19:10:15 +01:00
iTrooz
6a7678a6e9
Actually show online players when clicking on the button
2024-11-17 19:10:15 +01:00
iTrooz
0a379a05ff
replace my printf calls with qDebug
2024-11-17 19:10:15 +01:00
iTrooz
fe28a051d5
make MCResolver a dynamic object so it doesnt get deleted before the callback
...
See https://discord.com/channels/1031648380885147709/1031823065937629267/1307471566166167696
2024-11-17 19:10:15 +01:00
iTrooz
87c9066a2b
run the code in tasks
2024-11-17 19:10:15 +01:00
iTrooz
ea2a2349f8
make splitAddress() const
2024-11-17 19:10:15 +01:00
iTrooz
2f70115be5
add debug print
2024-11-17 19:10:15 +01:00
iTrooz
8fa1dff17d
remove space
2024-11-17 19:10:15 +01:00
iTrooz
99ac11bc40
add my classes to CMakeLists
2024-11-17 19:10:15 +01:00
iTrooz
ee35ac5afd
add method queryStatus() to servers and use it on click
2024-11-17 19:10:15 +01:00
iTrooz
43a54cafef
add my classes
2024-11-17 19:10:15 +01:00
iTrooz
fac521a312
Add dummy UI button
2024-11-17 19:10:15 +01:00
Awqre
3c88eccf17
Merge branch 'PrismLauncher:develop' into develop
2024-11-17 08:19:35 +00:00
TheKodeToad
48235f5b71
Merge pull request #3083 from Trial97/fix_resource_search
...
Fix resource search
2024-11-15 23:09:28 +00:00
timoreo
736ecf266d
Merge pull request #3019 from Trial97/task_parent
...
fixed double deletion for tasks
2024-11-15 06:19:40 +01:00
timoreo
b2a37452be
Merge pull request #3024 from Trial97/leak
...
fix leak on resource search
2024-11-15 06:18:33 +01:00
timoreo
54f2e75b9d
Merge pull request #3070 from TheKodeToad/general-scrollbar
...
Add scrollbar to Settings -> Launcher -> Features
2024-11-15 06:16:54 +01:00
timoreo
f7620a43aa
Merge pull request #3094 from Trial97/remove_resource_warning
...
Fix warnings regarding Resource static cast
2024-11-15 06:15:55 +01:00
timoreo
bcbe5da87f
Merge pull request #3096 from Trial97/dangling_file
...
Fix file remaingin open after program closure
2024-11-15 06:14:25 +01:00
Alexandru Ionut Tripon
e735ea7e63
Merge pull request #3003 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-11-14 22:50:53 +02:00
Trial97
ce61ed2f86
Fix file remaingin open after program closure
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-11-14 13:27:16 +02:00
Trial97
172e43cd3f
Fix warnings regarding Resource static cast
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-11-13 23:11:33 +02:00
Awqre
9f0b2bafd8
Further additional even better(er) compression
...
Truly unprecedented levels of optimization we're reaching here. (OxiPNG/ZopfliPNG/ECT/DeflOpt)
Signed-off-by: Awqre <32497511+Awqre@users.noreply.github.com >
2024-11-13 14:31:20 -05:00
txtsd
03b34e39f8
feat: Compression script with compressed images
...
Also modified genicons.sh
Signed-off-by: txtsd <code@ihavea.quest >
2024-11-13 19:04:31 +05:30
Awqre
885fc66c14
Lossless image compression
...
Applied lossless zopfli/ect/deflopt compression to PNG files including ones contained in ICO files.
Repacked ICO files with optidash icopack
Signed-off-by: Awqre <32497511+Awqre@users.noreply.github.com >
2024-11-12 20:17:17 -05:00
github-actions[bot]
f41380d91c
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nix-filter':
'github:numtide/nix-filter/3342559a24e85fc164b295c3444e8a139924675b?narHash=sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj%2BrL8sRQsSM%3D' (2024-03-11)
→ 'github:numtide/nix-filter/776e68c1d014c3adde193a18db9d738458cd2ba4?narHash=sha256-SCHiL%2B1f7q9TAnxpasriP6fMarWE5H43t25F5/9e28I%3D' (2024-10-29)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0?narHash=sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c%2BcHUJwA%3D' (2024-10-18)
→ 'github:NixOS/nixpkgs/4aa36568d413aca0ea84a1684d2d46f55dbabad7?narHash=sha256-Zwl8YgTVJTEum%2BL%2B0zVAWvXAGbWAuXHax3KzuejaDyo%3D' (2024-11-05)
2024-11-10 00:24:54 +00:00
Trial97
66883db645
Fix removed signal handler for filter resource
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-11-09 23:30:04 +02:00
Tayou
df45e5518f
Merge pull request #3081 from Trial97/fix_markdown
...
fix CONTRIBUTING.md formating
2024-11-09 22:19:41 +01:00
Trial97
4c8c6e543e
fix contrributing
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-11-08 00:18:12 +02:00
Alexandru Ionut Tripon
1d9508c268
Merge pull request #3074 from Trial97/lock
...
Close the window using the invokeMethod to not block
2024-11-07 23:45:44 +02:00
Alexandru Ionut Tripon
7d03cb114d
Merge pull request #3031 from Trial97/lambda
...
do not capture by default all values in lambdas
2024-11-07 23:45:31 +02:00
Tayou
2fcf03ead3
Merge pull request #3036 from Trial97/typo4
2024-11-07 17:30:47 +01:00
TheKodeToad
012bbca197
JavaSettingsWidget -> JavaWizardWidget
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-11-07 14:51:43 +00:00
TheKodeToad
8132828ad7
Phrasing fix
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-11-07 13:36:33 +00:00
Trial97
9601fbf2d5
Close the window using the invokeMethod to not block
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-11-07 15:07:17 +02:00
TheKodeToad
6e55239cec
Merge pull request #3073 from TheKodeToad/fix-formatting-guidelines-oversight
...
Fix formatting oversight
2024-11-07 13:01:15 +00:00
TheKodeToad
900235642c
Fix formatting oversight
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-11-07 12:16:22 +00:00
TheKodeToad
f667f56fb7
Merge pull request #3067 from TheKodeToad/updated-formatting-guidelines
...
Updated formatting guidelines
2024-11-07 11:43:12 +00:00
TheKodeToad
e06b3e7a7a
Implement open global settings
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-11-07 00:47:32 +00:00
TheKodeToad
223b6b3b2b
Fix non-Linux build
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-11-07 00:22:22 +00:00
TheKodeToad
71e55f8829
Add scrollbar to Settings -> Launcher -> Features
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-11-07 00:11:27 +00:00
TheKodeToad
e6d4e5d78d
Unify instance and global settings pt.1
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-11-06 23:46:30 +00:00
TheKodeToad
8ecc21c093
Make Ryex's suggested change
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-11-06 22:12:22 +00:00
Sefa Eyeoglu
0a80da28fa
chore: update Nix readme
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2024-11-06 19:29:57 +01:00
TheKodeToad
b67d400f60
Update formatting guidelines
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-11-06 16:27:03 +00:00
timoreo
1ab10bdd84
Merge pull request #3060 from Ryex/ci/bump_linux_qt
...
ci: bump linux qt version
2024-11-05 11:25:27 +01:00
Rachel Powers
ba6743d134
ci: libxcb-curcsor_dev ?
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-11-05 01:30:55 -07:00
Rachel Powers
d63a336411
ci: bump linux qt version
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-11-05 01:10:38 -07:00
Alexandru Ionut Tripon
4a92573235
Merge pull request #3042 from Trial97/isportable
...
use isPortable to determine if the MSAStep should check for url handler
2024-11-03 11:55:55 +02:00
Alexandru Ionut Tripon
db3d796275
Merge pull request #3045 from Trial97/ask_retry3
...
disable retry for modrinth currentVersions API
2024-11-03 11:55:37 +02:00
Trial97
6f2f3c2d3b
disable retry for modrinth currentVersions API
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-11-01 17:34:29 +02:00
Trial97
f77f0207f7
fix the flame loaders match
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-11-01 14:30:47 +02:00
Trial97
99cfb62370
use isPortable to determine if the MSAStep should check for url handler
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-11-01 11:03:47 +02:00
Trial97
2b590f24ed
remove task parent from constuctor
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-11-01 00:11:45 +02:00
Trial97
670c932f32
Fix installed typo
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-31 14:51:18 +02:00
TheKodeToad
ba07a136dc
Merge pull request #3035 from PrismLauncher/remove-BasicFolderLoadTask
...
Remove BasicFolderLoadTask
2024-10-31 09:17:27 +00:00
TheKodeToad
9ae16921bc
Remove BasicFolderLoadTask
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-30 21:10:43 +00:00
Tayou
887e4a964a
Merge pull request #3010 from Trial97/lock3
2024-10-30 21:56:17 +01:00
seth
8faff9ac6a
Merge pull request #3030 from Trial97/sys
2024-10-30 15:16:38 -04:00
Trial97
0e80aae1b8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into lambda
2024-10-30 19:35:25 +02:00
TheKodeToad
c142d38f08
Merge pull request #1588 from TheKodeToad/resource-meta
...
Implement tracking and updates for files other than mods
2024-10-30 17:03:54 +00:00
Trial97
82bffabb69
do not capture by default all values in lambdas
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-30 18:16:43 +02:00
Trial97
14c95b9d37
fix macos system detection
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-30 17:15:42 +02:00
Alexandru Ionut Tripon
b7598c6a41
Merge pull request #2331 from michaeltyson/develop
...
Support for launching from command line in offline mode
2024-10-30 09:49:33 +02:00
Michael Tyson
ced2f9d1a0
Applied clang formatting
...
Signed-off-by: Michael Tyson <michael@atastypixel.com >
2024-10-30 12:51:34 +11:00
Michael Tyson
5661444414
Removed “--name” flag in favour of specifying offline player name via “--offline” flag
...
Signed-off-by: Michael Tyson <michael@atastypixel.com >
2024-10-30 12:37:14 +11:00
Michael Tyson
afa1e0599a
Improved formatting
...
Signed-off-by: Michael Tyson <michael@atastypixel.com >
2024-10-30 12:34:33 +11:00
Michael Tyson
43e4481b70
Support for launching from command line in offline mode
...
This allows launching an offline instance with --offline --name=OfflineName. This is useful for playing split screen by creating two side-by-side instances, which is impossible online, unless one is using two separate paid accounts.
With this PR, it makes it possible to launch from a script - otherwise, one has to launch manually, which is a pain, or create offline profiles for each instance, which interferes with some functionality like skins (my autistic son takes great issue with his skin not being visible, when using offline profiles!).
Implementation is based on MultiMC, which supports this feature.
See also https://github.com/PrismLauncher/PrismLauncher/issues/1059 for discussion.
Signed-off-by: Michael Tyson <michael@atastypixel.com >
2024-10-30 12:30:20 +11:00
Tayou
65b0fdf08d
Merge pull request #3027 from benthetechguy/metadata
2024-10-29 23:06:01 +01:00
Ben Westover
f6511c601e
Fix some typos
...
Signed-off-by: Ben Westover <me@benthetechguy.net >
2024-10-29 20:45:10 +00:00
Ben Westover
fd109c4740
Shorten metainfo.xml app summary
...
Signed-off-by: Ben Westover <me@benthetechguy.net >
2024-10-29 20:45:06 +00:00
TheKodeToad
2368521a9a
Add missing semicolon
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-29 17:54:03 +00:00
TheKodeToad
d49e6187cd
Make requested changes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-29 17:17:51 +00:00
TheKodeToad
c1c198b84b
Combine if statements
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-29 15:45:30 +00:00
TheKodeToad
e7ff3146fe
Merge pull request #1953 from Trial97/account2
...
Auto reauthenticate account if expired
2024-10-29 14:08:50 +00:00
Trial97
8e7d84d05b
fix leak on resource search
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-29 00:40:13 +02:00
TheKodeToad
d157159106
Fix license headers and formatting
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-28 22:29:43 +00:00
TheKodeToad
bd8b30c606
Implement link for InfoFrame::updateWithResource
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-28 22:17:16 +00:00
TheKodeToad
f56a8feade
Merge pull request #2986 from Trial97/bump_10.x
...
bump develop to 10
2024-10-28 21:12:53 +00:00
TheKodeToad
f3cae427f1
Fix tests (make them green)
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-28 21:09:45 +00:00
Alexandru Ionut Tripon
51b7abec24
Merge pull request #3005 from Trial97/installed
...
add installed text to version select
2024-10-28 22:55:40 +02:00
Alexandru Ionut Tripon
d90ed89a30
Merge pull request #2989 from Trial97/what
...
add extra protection against empty download link
2024-10-28 22:55:21 +02:00
TheKodeToad
ad1d5ddcdf
Revert unwise refactor
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-28 20:42:59 +00:00
Alexandru Ionut Tripon
2dee936246
Merge pull request #2837 from Trial97/translate_standeard_butons
...
translate standard buttons
2024-10-28 22:31:47 +02:00
Alexandru Ionut Tripon
a0a74612e1
Merge pull request #1894 from Trial97/maximize
...
Fixed the maximized option on the newer Minecraft versions
2024-10-28 22:30:09 +02:00
Alexandru Ionut Tripon
fbd3aa36c4
Merge pull request #3006 from Trial97/relase_type
...
add release_type filer for mod/modpacks
2024-10-28 22:29:38 +02:00
Trial97
94f65f8727
add qassert
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-28 22:27:40 +02:00
TheKodeToad
2b22a1aebe
Reimplement View Homepage
...
I removed it for some reason, but now it's back for all pages!
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-28 20:14:56 +00:00
TheKodeToad
354a0ed46e
Fix column sizes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-28 18:01:01 +00:00
Trial97
9cdda4377b
remove message box
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-28 19:19:06 +02:00
TheKodeToad
49044e23de
Fix Export List placement
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-28 16:21:00 +00:00
TheKodeToad
f57ca1e79e
Add Change Version action to all pages
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-28 16:07:41 +00:00
Trial97
0f42f3cc5c
Added warning regarding maximized option
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-28 17:19:18 +02:00
Trial97
81c5866fa9
Made sure that the qt version check is in place
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-28 17:19:18 +02:00
Trial97
1be29076ea
When java disappoints try C++
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-28 17:19:18 +02:00
Trial97
3c17f606ed
Patched the maximized option on the newer Minecraft versions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-28 17:19:18 +02:00
Trial97
09a118e85e
expand env from wrapped cmd
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-28 16:23:33 +02:00
Trial97
c12beb43a0
correctly expand env vars
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-28 16:23:33 +02:00
Trial97
08f5148a9a
Added mouse interactions for labels in ProgressDialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-28 16:22:52 +02:00
Trial97
14ad720c58
fix conflict
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-28 16:21:40 +02:00
Trial97
0ee5665c95
Revert "Removed auto reauthenticate"
...
This reverts commit 400b518bc2 .
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-28 16:21:39 +02:00
Trial97
bd82737efb
translate standard buttons
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-28 15:46:47 +02:00
Trial97
f75e049675
add release_type filer for mod/modpacks
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-28 15:36:47 +02:00
Tayou
1f8ce9eb92
Merge pull request #3002 from Trial97/typo2
2024-10-28 14:19:53 +01:00
Alexandru Ionut Tripon
d4bf61da50
Merge pull request #3007 from Trial97/open_source
...
add open source filter
2024-10-28 15:04:33 +02:00
Tayou
33754db9b9
Merge pull request #3009 from Trial97/order
2024-10-28 14:04:20 +01:00
TheKodeToad
1809858fc7
Ignore .index in ExportPackDialog
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-28 11:01:30 +00:00
Trial97
0cafac84ac
replace currentData with itemData on QComboBox::currentIndexChanged slots
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-28 12:54:21 +02:00
Trial97
9eb1ce3ad7
replace unzipping with unpacking
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-28 12:39:26 +02:00
TheKodeToad
6a6fe60a5b
Revert "Use non-mod metadata in ModrinthPackExportTask"
...
Out-of-scope
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-28 10:29:49 +00:00
Alexandru Ionut Tripon
6338e2b362
Update launcher/ui/widgets/ModFilterWidget.ui
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-10-28 00:34:41 +02:00
txtsd
b1113f4293
Merge pull request #3008 from Trial97/about
...
change contributors name
2024-10-28 01:01:43 +05:30
Trial97
c4cd7cf6c1
change ZekeZ name
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-27 13:17:58 +02:00
Trial97
11d4d948aa
lock m_instanceExtras
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-27 12:36:14 +02:00
Trial97
61448a61ea
swap search with filter button for modpacks
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-27 12:06:45 +02:00
Trial97
f373a5cea0
change contributors name
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-27 11:58:34 +02:00
Trial97
935b2e8fb2
add open source filter
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-27 11:56:48 +02:00
Trial97
b1c8ab9350
add installed text to version select
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-27 10:56:14 +02:00
Trial97
b593ff09e9
fix #3001
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-27 03:05:56 +02:00
Trial97
44894a29b1
rename snake_case to camelCase
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-27 03:05:30 +02:00
Trial97
685d3c79ac
fix unzipping typo
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-27 03:02:13 +03:00
TheKodeToad
b66d6b2812
Unhardcode PREFIXES
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-26 13:24:03 +01:00
seth
5b8ea89092
Merge pull request #2992 from getchoo-contrib/nix/sync
2024-10-25 20:56:44 -04:00
TheKodeToad
13e13ea8fc
Use non-mod metadata in ModrinthPackExportTask
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-25 19:13:41 +01:00
sshcrack
7c60f375f3
hide actions if not available
...
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com >
2024-10-25 14:15:04 +02:00
sshcrack
cd3db28fce
fixed typo
...
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com >
2024-10-25 11:52:44 +02:00
sshcrack
43ccf18449
fix default action for flatpak
...
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com >
2024-10-25 11:51:47 +02:00
sshcrack
b16e12c9af
remove dot
...
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com >
2024-10-25 11:49:13 +02:00
sshcrack
f1048c2e0d
removed unnecessary macro
...
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com >
2024-10-25 11:47:02 +02:00
sshcrack
ef2f865159
add back folder checks / use specific extension
...
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com >
2024-10-25 11:45:50 +02:00
sshcrack
b182a888aa
revert changes to settings and used menu for shortcuts
...
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com >
2024-10-25 10:39:03 +02:00
seth
63b10738b2
chore(nix): use self for version
...
Signed-off-by: seth <getchoo@tuta.io >
2024-10-25 02:35:53 -04:00
seth
a5c554cf6e
chore(nix): sync with nixpkgs
...
Signed-off-by: seth <getchoo@tuta.io >
2024-10-25 02:35:53 -04:00
seth
6a2ed4a631
Merge pull request #2982 from TheKodeToad/launcher-level-autoinstalljava
...
Use Launcher log level in AutoInstallJava
2024-10-25 02:23:02 -04:00
seth
b7152e7010
Merge pull request #2963 from PrismLauncher/renovate/actions-cache-4.x
...
chore(deps): update actions/cache action to v4.1.2
2024-10-25 02:22:12 -04:00
seth
d766de5fbf
Merge pull request #2980 from Arcitec/flatpak-enhancements
...
fix: bring back Flathub manifest improvements to the repo
2024-10-25 02:19:09 -04:00
Trial97
8daa1219a5
add extra protection against empty download link
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-25 01:13:05 +03:00
Trial97
3bc40120cd
bump develop to 10
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-25 00:17:34 +03:00
Arcitec
4ce025c0a2
fix: bring back Flathub manifest improvements to the repo
...
- Brings back all manifest improvements, such as the incredibly important Mojang Java Downloader (without it, the Flatpak doesn't work), and important fixes for Wayland.
Signed-off-by: Arcitec <38923130+Arcitec@users.noreply.github.com >
2024-10-24 17:36:45 +02:00
TheKodeToad
d8702e1357
Use Launcher log level in AutoInstallJava
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-24 12:46:01 +01:00
TheKodeToad
9fe81ff564
Merge pull request #2975 from Ryex/fix/version-page-load-speed
...
fix: don't hang the ui for a full version load
2024-10-24 11:24:35 +01:00
TheKodeToad
5eff9b0934
Fix column crashes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-24 01:23:11 +01:00
TheKodeToad
8e586c883c
Fix Modrinth update crashing
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-24 01:16:06 +01:00
Rachel Powers
7bd04ae928
fix don't hang the ui for a full version load
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-10-23 16:23:10 -07:00
TheKodeToad
4a7d624e9b
Merge pull request #2972 from TheKodeToad/fix-clean-env
...
Fix launching Minecraft in portable Linux
2024-10-23 22:30:42 +01:00
TheKodeToad
92a906e0d4
Move everything in CheckUpdateTask::Update
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-23 14:58:52 +01:00
TheKodeToad
24cecf7b63
Fix compile
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-23 14:42:54 +01:00
TheKodeToad
89a327d363
Merge remote-tracking branch 'upstream/develop' into resource-meta
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-23 14:19:07 +01:00
TheKodeToad
e7cd8fe078
Fix CleanEnviroment()'s usage of stripVariableEntries
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-23 13:44:39 +01:00
sshcrack
59efca764c
removed creation of shortcuts for flatpak / appimage users
...
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com >
2024-10-22 21:20:41 +02:00
sshcrack
a737d5df42
added instance shortcut feature
...
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com >
2024-10-22 21:20:41 +02:00
Kaiyang Wu
3d82bc37af
javautils: add a filter for detecting Java paths on AOSC OS
...
Signed-off-by: Kaiyang Wu <origincode@aosc.io >
2024-10-22 11:58:00 -07:00
TheKodeToad
f13e875f0d
Try to fix ModrinthCheckUpdate (not working)
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-22 18:46:10 +01:00
Alexandru Ionut Tripon
79439a0217
Merge pull request #2958 from Trial97/crash_QsaveFile
...
skip parsing open QSaveFile temprary files as resources
2024-10-22 17:38:32 +03:00
renovate[bot]
210d0d8aa2
chore(deps): update actions/cache action to v4.1.2
2024-10-22 13:48:29 +00:00
Trial97
836aebc0d9
fix small leak
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-22 13:43:16 +03:00
Trial97
73d33f93b3
Replaced QSet with QHash
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-22 09:41:00 +03:00
Trial97
562c301326
skip QSaveFile temprary files
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-22 01:22:31 +03:00
Alexandru Ionut Tripon
a43ebefc97
Merge pull request #2954 from Trial97/skin_warn
...
do not try to import skin if path is empty
2024-10-22 00:14:16 +03:00
Alexandru Ionut Tripon
69028969f1
Update launcher/ui/dialogs/skins/SkinManageDialog.cpp
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-10-21 22:59:51 +03:00
Alexandru Ionut Tripon
671d5270eb
Merge pull request #2953 from TheKodeToad/portable-fix
...
Fix removing portable.txt on Linux portable build
2024-10-21 22:44:44 +03:00
Trial97
9a5b773e69
do not try to import skin if path is empty
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-21 19:28:34 +03:00
TheKodeToad
f3f4c44620
Fix removing portable.txt on Linux portable build
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-21 16:30:08 +01:00
TheKodeToad
b049e92697
Merge pull request #2947 from Trial97/fix_initial_setup
...
do not require java if auto-download is enabled
2024-10-21 15:57:47 +01:00
Tayou
ea703ba26e
Merge pull request #2948 from TheKodeToad/vc-redist-norestart
2024-10-21 16:54:18 +02:00
TheKodeToad
78e24962f9
Fix /norestart
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-21 14:41:48 +01:00
Trial97
fcadbbb739
do not require java if auto-download is enabled
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-21 16:17:48 +03:00
Alexandru Ionut Tripon
a8c3a49cb9
Merge pull request #2938 from Trial97/fix_sparkle
...
fix sparkle signature
2024-10-21 00:05:57 +03:00
Trial97
0586d38e03
fix sparkle signature
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-20 23:53:23 +03:00
ZekeZ
3ac080806d
Merge pull request #2831 from Trial97/fix_login
...
split the auth loading screen
2024-10-21 00:14:36 +10:00
seth
38e0e0cb73
Merge pull request #2935 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-10-20 02:11:26 -04:00
github-actions[bot]
0501c1e17a
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7?narHash=sha256-9UTxR8eukdg%2BXZeHgxW5hQA9fIKHsKCdOIUycTryeVw%3D' (2024-10-09)
→ 'github:NixOS/nixpkgs/4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0?narHash=sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c%2BcHUJwA%3D' (2024-10-18)
2024-10-20 00:25:22 +00:00
Alexandru Ionut Tripon
417bb3564d
Merge pull request #2933 from getchoo-contrib/flatpak/jdks
...
Don't bundle JREs in Flatpak
2024-10-19 22:33:05 +03:00
Alexandru Ionut Tripon
e43836a271
Merge pull request #2932 from getchoo-contrib/nix/enable-tests
...
Enable checks in Nix package
2024-10-19 22:32:59 +03:00
Alexandru Ionut Tripon
9a161a0335
Merge pull request #2930 from Trial97/fixes
...
Fix tests segfault
2024-10-19 22:32:51 +03:00
Trial97
2d234b127b
make sure that tests are only disabled fro cmark
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-19 22:07:31 +03:00
Rachel Powers
464c7c1d4d
Merge pull request #2929 from Trial97/https
...
Replace http with https on skins
2024-10-19 12:00:52 -07:00
Trial97
2030041fcc
Fix tests segfault
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-19 21:42:14 +03:00
seth
01721b593b
fix(flatpak): run tests for launcher
...
Signed-off-by: seth <getchoo@tuta.io >
2024-10-19 12:40:15 -04:00
seth
0bae14999f
chore(flatpak): don't bundle JREs
...
After https://github.com/PrismLauncher/PrismLauncher/pull/2069 , JREs can
be managed at runtime. This is great for the Flatpak, as previously
*all* JREs had to be installed and could not be updated independently of
the launcher's Flatpak. It also makes using unsupported Java versions
easier as the launcher can download any version in the sandbox
We don't need to include these anymore
Signed-off-by: seth <getchoo@tuta.io >
2024-10-19 12:40:15 -04:00
seth
522d105dbe
fix(nix): enable checks
...
Signed-off-by: seth <getchoo@tuta.io >
2024-10-19 12:32:36 -04:00
Trial97
7519c63f2e
Replace http with https on skins
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-19 01:11:27 +03:00
timoreo
f60d6e4d48
Merge pull request #2917 from Trial97/asan_log
...
fix heap-use-after-free in modrinth creation task
2024-10-18 12:09:24 +02:00
Alexandru Ionut Tripon
43eb27b695
Merge pull request #2916 from Ryex/fix/progress_dialog_use_after_free
...
fix: ensure all connections to the ProgressDialogs's Task the dialog made are disconnected
2024-10-15 08:59:12 +03:00
Trial97
ac13579b99
fix heap-use-after-free in modrinth creation task
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-14 11:10:54 +03:00
Rachel Powers
a108b5b420
fix: ensure all connections to the ProgressDialogs's Task the dialog made are dissconnected
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-10-14 00:45:45 -07:00
Alexandru Ionut Tripon
f239f4c17c
Merge pull request #2914 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-10-13 22:46:00 +03:00
Alexandru Ionut Tripon
5685bc3407
Merge pull request #2913 from archessmn/fix/custom-command-tab-order
...
Fix tab order on custom command inputs
2024-10-13 09:49:13 +03:00
Alexandru Ionut Tripon
bd01c47dc9
Merge pull request #2906 from TheKodeToad/no-recursive-remove-on-update
...
Prevent directories from being removed on instance update
2024-10-13 09:48:27 +03:00
github-actions[bot]
3c836ece71
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb?narHash=sha256-NOiTvBbRLIOe5F6RbHaAh6%2B%2BBNjsb149fGZd1T4%2BKBg%3D' (2024-10-04)
→ 'github:NixOS/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7?narHash=sha256-9UTxR8eukdg%2BXZeHgxW5hQA9fIKHsKCdOIUycTryeVw%3D' (2024-10-09)
2024-10-13 00:24:52 +00:00
Mia Moir
3a1c06de02
fix: Tab order on custom command inputs
...
The tab order on the custom command UI in the instance settings is off, it goes 0 -> 2 -> 1, This re-orders the ui file to fix the order the inputs are in.
Signed-off-by: Mia Moir <63592337+archessmn@users.noreply.github.com >
2024-10-12 23:47:58 +01:00
Alexandru Ionut Tripon
ef0cb88dd3
Merge pull request #2907 from Ryex/fix/icon_cache_stack_overflow
...
Prevent infinite recursion when mod icon load fails
2024-10-12 12:21:09 +03:00
Alexandru Ionut Tripon
0b624a43d6
Merge pull request #2908 from Trial97/remove_client
...
remove client overrides instead of double deleting the normal ones
2024-10-12 00:49:57 +03:00
Trial97
97f4ead0fb
remove client overrides instead of double deleting the normal ones
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-12 00:19:54 +03:00
Alexandru Ionut Tripon
78ceae9c17
Merge pull request #2887 from Trial97/filters_modpack
...
Add filters for modpack search
2024-10-12 00:07:14 +03:00
TheKodeToad
72cfad8fee
Continue deleting before failing
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-11 21:35:13 +01:00
Rachel Powers
09c9da268f
fix: prevent inf recursion when mod icon load fails; cut max pixmapcache to 1/4 previous value
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-10-11 13:26:20 -07:00
TheKodeToad
2bc6ae9756
Prevent directories from being removed on instance update
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-11 19:53:28 +01:00
Tayou
0c4c86c41f
Merge pull request #2900 from TheKodeToad/log-utf8
...
Use UTF-8 to decode logs on Java 18 or newer
2024-10-11 19:10:55 +02:00
Edgars Cirulis
0beaa94311
ci: uprev qt install action to v4
...
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com >
2024-10-10 15:26:36 +03:00
Edgars Cirulis
b39098dbc5
ci: fix qt-6.8 workflow
...
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com >
2024-10-10 15:26:19 +03:00
Edgars Cirulis
5b6d551650
chore: update Qt to 6.8.0
...
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com >
2024-10-10 03:45:35 +03:00
TheKodeToad
98adcc60a3
Use UTF-8 to decode logs on Java 18 or newer
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-09 17:15:53 +01:00
TheKodeToad
909114bf2a
Change LaunchTask to only accept MinecraftInstance
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-09 15:07:09 +01:00
txtsd
2abbcdfa6f
Merge pull request #2896 from PrismLauncher/renovate/actions-cache-4.x
...
chore(deps): update actions/cache action to v4.1.1
2024-10-09 13:01:15 +05:30
renovate[bot]
093313e591
chore(deps): update actions/cache action to v4.1.1
2024-10-09 07:14:47 +00:00
Alexandru Ionut Tripon
c72cce6572
Merge pull request #2897 from Trial97/fix_crash
...
fix crash when no resorce version is available
2024-10-09 08:37:22 +03:00
TheKodeToad
4b66320f63
Move x-prism-launcher to unnamed table for consistency
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-08 22:51:03 +01:00
TheKodeToad
a76f37760c
Fix log spam when opening files from older versions
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-08 22:30:50 +01:00
Trial97
d31c947b36
fix crash when no resorce version is available
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-08 22:02:38 +03:00
seth
e2b346fc53
Merge pull request #2888 from PrismLauncher/renovate/actions-cache-4.x
...
chore(deps): update actions/cache action to v4.1.0
2024-10-08 13:15:05 -04:00
seth
7c45f88769
Merge pull request #2883 from PrismLauncher/renovate/cachix-install-nix-action-30.x
...
chore(deps): update cachix/install-nix-action action to v30
2024-10-08 13:14:47 -04:00
seth
acd4dceafa
Merge pull request #2890 from arnfaldur/patch-1
...
Keep libGLU in Flatpak
2024-10-08 13:14:18 -04:00
Trial97
df9f54454a
removed static functions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-08 19:19:03 +03:00
TheKodeToad
538815e033
Merge remote-tracking branch 'upstream/develop' into resource-meta
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-08 17:16:10 +01:00
TheKodeToad
3fae659b30
Merge remote-tracking branch 'upstream/develop' into resource-meta
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-08 17:15:42 +01:00
Trial97
5bd5627a96
extended the modrinth search and applied the suggested change
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-08 15:06:50 +03:00
TheKodeToad
a200fca45c
Merge pull request #2869 from Edgars-Cirulis/patch-1
...
chore: update Qt to 6.7.3
2024-10-08 12:36:11 +01:00
Alexandru Ionut Tripon
dc1f56e108
Merge pull request #2865 from Ryex/nsis_vc_redist
...
add vc_redist as a NSIS install section
2024-10-08 14:09:22 +03:00
Trial97
6e5f616ced
move checkMcVersions to Filter struct
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-07 00:21:28 +03:00
Alexandru Ionut Tripon
1eee5c924b
Merge pull request #2891 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-10-06 23:21:16 +03:00
Alexandru Ionut Tripon
999dec18dd
Merge pull request #2893 from PrismLauncher/ftb-private-no-retry
...
Disable retry for private pack fetch
2024-10-06 23:20:14 +03:00
TheKodeToad
d5990cca43
Disable retry for private pack fetch
...
This is already handled with a dialog asking whether you want it to be removed.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-10-06 13:51:36 +01:00
github-actions[bot]
03294f0000
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/1925c603f17fc89f4c8f6bf6f631a802ad85d784?narHash=sha256-J%2BPeFKSDV%2BpHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI%3D' (2024-09-26)
→ 'github:NixOS/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb?narHash=sha256-NOiTvBbRLIOe5F6RbHaAh6%2B%2BBNjsb149fGZd1T4%2BKBg%3D' (2024-10-04)
2024-10-06 00:24:57 +00:00
arnfaldur
f7bd76c7d4
flatpak: don't cleanup libGLU
...
The mod AAA Particles (found in the modpack Prominence II RPG) fails to start due to a missing `libGLU.so.1` file.
Removing this cleanup command fixes the issue and makes the modpack run without issue.
I reproduced the issue at the head of the develop branch, with and without the change. No other issue was detected by adding the library, and I could not find the initial justification for removing it.
Signed-off-by: arnfaldur <a.arnaldur+git@gmail.com >
2024-10-05 17:58:53 +00:00
renovate[bot]
cc0c9d208d
chore(deps): update actions/cache action to v4.1.0
2024-10-04 22:22:10 +00:00
Trial97
859fac604b
add modrinth modpack filter
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-04 17:06:47 +03:00
Rachel Powers
a61c93bede
Update .github/workflows/build.yml
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-10-04 07:06:19 -07:00
Rachel Powers
023aa18e85
ci: NSCurl only needed on MSVC
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-10-03 23:14:29 -07:00
Rachel Powers
63172540fb
fix: nisi needs !include "x64.nsh" now. also, there were some broken varible
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-10-03 22:38:30 -07:00
Rachel Powers
bcb1d456d4
fix: version NSCurl plugin in workflow, detect and use arm64 vc_redist for arm64
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-10-03 21:56:19 -07:00
renovate[bot]
010678da53
chore(deps): update cachix/install-nix-action action to v30
2024-10-03 13:46:28 +00:00
Trial97
dfe3cd849d
add curseforge modpack filter
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-02 01:06:45 +03:00
Alexandru Ionut Tripon
44b4262f3c
Merge pull request #2862 from PrismLauncher/renovate/cachix-install-nix-action-29.x
...
chore(deps): update cachix/install-nix-action action to v29
2024-10-01 14:04:55 +03:00
Alexandru Ionut Tripon
2539aa42da
Merge pull request #2851 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-10-01 14:04:28 +03:00
timoreo
62f19a6ac9
Merge pull request #2863 from Trial97/fix_resource_search_equal
2024-10-01 11:41:11 +02:00
timoreo
c57e26cf57
Merge pull request #2874 from Trial97/modpack_equal
2024-10-01 11:40:42 +02:00
timoreo
1b58645c52
Merge pull request #2857 from Trial97/translation_warnings
2024-10-01 10:20:56 +02:00
Trial97
946e791d39
sync modpack search field
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-01 08:53:27 +03:00
Trial97
5ea2dece54
fix search term not remaining the same between providers on resource download
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-01 08:52:07 +03:00
Trial97
0eefa52dbc
fix some transtaions warnings
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-01 08:51:06 +03:00
Trial97
b676a67b3c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_login
2024-10-01 08:49:03 +03:00
Alexandru Ionut Tripon
fa92e6bd29
Merge pull request #2859 from Trial97/packwiz_prefix
...
add prefix to non-standard packwiz fields
2024-10-01 08:23:10 +03:00
renovate[bot]
79be2fc062
chore(deps): update cachix/install-nix-action action to v29
2024-10-01 00:32:42 +00:00
seth
974c89b9c3
Merge pull request #2843 from getchoo-contrib/ci/fix-nix
...
Fix Nix CI
2024-09-30 20:32:08 -04:00
seth
38fa2e0cd4
style: format with clang-format
...
Signed-off-by: seth <getchoo@tuta.io >
2024-09-30 16:32:55 -04:00
seth
988ef32019
fix(nix): don't write to files in formatting check
...
Signed-off-by: seth <getchoo@tuta.io >
2024-09-30 16:32:50 -04:00
seth
bf432b5514
chore(nix): use cachix for binary cache
...
Signed-off-by: seth <getchoo@tuta.io >
2024-09-30 16:25:58 -04:00
seth
68bf500f7e
chore: add nix reformat to .git-blame-ignore-revs
...
Signed-off-by: seth <getchoo@tuta.io >
2024-09-30 16:25:58 -04:00
seth
5adca58337
ci: add nix job
...
Signed-off-by: seth <getchoo@tuta.io >
2024-09-30 16:25:56 -04:00
seth
2663ac5405
build(nix): add debug builds
...
This will lead to build times on par with our other CI jobs, as now
we're not always building for release
Signed-off-by: seth <getchoo@tuta.io >
2024-09-30 16:18:20 -04:00
seth
732008db20
ci: drop garnix
...
Signed-off-by: seth <getchoo@tuta.io >
2024-09-30 16:18:17 -04:00
Tayou
a63451212f
Merge pull request #2867 from turret-dev/turret/tmpdir_noexec_jvmarg_noannoy
...
fix: don't annoy when java tmpdir jvmarg is set & /tmp is noexec
2024-09-29 09:07:25 +02:00
github-actions[bot]
c899043816
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/4f807e8940284ad7925ebd0a0993d2a1791acb2f?narHash=sha256-IiA3jfbR7K/B5%2B9byVi9BZGWTD4VSbWe8VLpp9B/iYk%3D' (2024-09-11)
→ 'github:NixOS/nixpkgs/1925c603f17fc89f4c8f6bf6f631a802ad85d784?narHash=sha256-J%2BPeFKSDV%2BpHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI%3D' (2024-09-26)
2024-09-29 00:25:33 +00:00
Rachel Powers
ed15a28eb3
fix : baking the redist into the installer breaks GPL, download at runtime instead
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-09-28 14:58:13 -07:00
Edgars Cīrulis
a897b012d9
chore: update Qt to 6.7.3
...
Only bug fixes no new / breaking changes
Signed-off-by: Edgars Cīrulis <edgarsciruliss@gmail.com >
2024-09-28 12:11:25 +03:00
Rachel Powers
00f4221a83
reorg MSVC set(CMAKE_INSTALL_SYSTEM_RUNTIMES_LIBS_SKIP true) call
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-09-27 19:16:50 -07:00
Mason Rocha
b9c19fd3f7
fix: don't annoy when java tmpdir jvmarg is set & /tmp is noexec
...
Signed-off-by: Mason Rocha <mrocha@turretllc.us >
Got annoyed, didn't want to see it anymore.
Java tmpdir noexec warning modified to include information about
possible remedies available
2024-09-27 16:42:59 -05:00
Rachel Powers
8fa4467a36
use /norestart with redist install
...
Co-authored-by: seth <getchoo@tuta.io >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-09-27 13:29:00 -07:00
Rachel Powers
c5daca3b01
include vc_redist in portable build
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-09-27 00:57:28 -07:00
Rachel Powers
37d3b2a4f6
prevent the unauthorised reditribution of MSVC CRT files
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-09-27 00:49:00 -07:00
Rachel Powers
2dc6f7504b
add vc_redist as a NSIS install section
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-09-27 00:18:35 -07:00
Alexandru Ionut Tripon
b9a6c13d47
Merge pull request #2861 from Cartrigger/FixStringCases
...
Fix case for Java strings
2024-09-26 20:35:14 +03:00
Cart
6475dc5786
Lots of J's for Java needed to be uppercased
2024-09-26 01:58:21 -04:00
Trial97
1b2e9b95e2
add prefix to non-standard packwiz fields
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-25 21:17:44 +03:00
seth
3e60713257
Merge pull request #2838 from Trial97/view_log
...
Always display Minecraft log tab
2024-09-24 20:00:54 -04:00
seth
48904c0d66
Merge pull request #2806 from Trial97/technic_client
...
Add Technic client ID
2024-09-24 19:55:21 -04:00
QazCetelic
f641f3acda
Refactoring
...
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com >
2024-09-24 12:32:49 +02:00
QazCetelic
b675406b1a
Split set creation into a separate function for readability
...
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com >
2024-09-24 10:16:26 +02:00
QazCetelic
a58e81d744
snake_case to camelCase
...
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com >
2024-09-24 09:58:47 +02:00
Alexandru Ionut Tripon
4a40b53e5f
Merge pull request #2845 from Trial97/typo
...
fix updater typo
2024-09-22 19:09:40 +03:00
TheKodeToad
4a5749f4d9
Merge pull request #2844 from Trial97/fix_modrith_update
...
fix folder duplication for modrinth
2024-09-22 11:28:19 +01:00
Trial97
9567d763c1
fix java archive typo
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-21 22:17:44 +03:00
Trial97
3e1cf6b2a7
fix updater typo
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-20 16:58:22 +03:00
Trial97
1243328876
fix folder duplication for modrinth
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-20 16:53:36 +03:00
Trial97
77463c6d33
display minecraft log before instance run
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-18 21:17:15 +03:00
timoreo
dc67807894
Merge pull request #2825 from Trial97/skin_fix
2024-09-17 08:50:19 +02:00
Alexandru Ionut Tripon
926a6bc72a
Merge pull request #2583 from Trial97/metadata2
...
Generate updater metadata for mods added/updated using modpack updater/installer
2024-09-17 08:45:09 +03:00
Alexandru Ionut Tripon
d06f0529a0
Merge pull request #2830 from Trial97/login_wizard_retry
...
Show login dialog again if account login fails
2024-09-17 08:44:41 +03:00
Alexandru Ionut Tripon
53c3d99bdd
Merge pull request #2828 from Trial97/cmake_fields
...
Allow configuring more URLs through CMake
2024-09-17 08:44:24 +03:00
Alexandru Ionut Tripon
c57b1d4227
Merge pull request #2820 from Trial97/mac_java
...
Add extra step to macos java install
2024-09-17 08:44:09 +03:00
Tayou
1b00d61587
Merge pull request #2819 from Trial97/java_dir
...
add open java folder action
2024-09-16 20:41:34 +02:00
Trial97
3ca67cc388
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2
2024-09-16 20:08:43 +03:00
Trial97
2fd8685894
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into java_dir
2024-09-16 20:08:20 +03:00
Trial97
0af639c20b
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_login
2024-09-16 20:07:18 +03:00
Trial97
7438c71fdd
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into login_wizard_retry
2024-09-16 20:06:50 +03:00
Trial97
b4ecb38ae5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cmake_fields
2024-09-16 20:06:18 +03:00
Trial97
f36cfaf878
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_fix
2024-09-16 20:05:44 +03:00
Trial97
aab82705cd
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mac_java
2024-09-16 20:05:18 +03:00
Alexandru Ionut Tripon
914ae6ead6
Use macOS 14 in CI ( #2826 )
...
* chore: fix mac CI build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
* try what the error says
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
* set -DCMAKE_OSX_ARCHITECTURES=x86_64
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
---------
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-16 13:00:38 -04:00
Trial97
e53a5b3eca
replace TRANSLATIONS_BASE_URL with TRANSLATION_FILES_URL
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-16 17:51:35 +03:00
Alexandru Ionut Tripon
2e537e55de
Apply suggestions from code review
...
Co-authored-by: seth <getchoo@tuta.io >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-09-16 17:47:58 +03:00
seth
7eac06cad9
Merge pull request #2829 from Trial97/ask_retry2
...
disable retry for translation files
2024-09-16 10:15:21 -04:00
Alexandru Ionut Tripon
8d14060ad1
Apply suggestions from code review
...
Co-authored-by: seth <getchoo@tuta.io >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-09-16 16:46:01 +03:00
seth
8faebe320e
Merge pull request #2807 from Trial97/fix_server_launch
...
fix server launch
2024-09-16 09:42:54 -04:00
Trial97
580fc32518
split the auth loading screen
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-16 16:41:16 +03:00
Alexandru Ionut Tripon
db3c7d01fd
Apply suggestions from code review
...
Co-authored-by: seth <getchoo@tuta.io >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-09-16 16:36:05 +03:00
seth
160d2962e6
Merge pull request #2827 from Trial97/prefix_option
...
add Launcher_ prefix to enable java option
2024-09-16 09:30:54 -04:00
Trial97
75756b49c3
reshow login dialog in case account login fails
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-16 16:15:36 +03:00
Trial97
81f30f0360
disable retry for translation files
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-16 15:53:54 +03:00
Trial97
ca6b62c773
move some URLs in cmake
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-16 15:51:51 +03:00
Trial97
2c2defb266
add Launcher_ prefix to enable java option
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-16 14:30:23 +03:00
Trial97
d2f0d1d8d5
Wrap FS::write in try catch
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-16 12:42:09 +03:00
Trial97
d38e7fa142
Add more null protection for skin management
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-16 12:41:33 +03:00
QazCetelic
e35faa5522
Feedback I
...
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com >
2024-09-15 09:04:23 +02:00
Alexandru Ionut Tripon
bee59c904a
Merge pull request #2773 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-09-15 08:49:07 +03:00
github-actions[bot]
8932a42644
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/c374d94f1536013ca8e92341b540eba4c22f9c62?narHash=sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh%2BaRKoCdaAv5fiO0%3D' (2024-08-21)
→ 'github:NixOS/nixpkgs/4f807e8940284ad7925ebd0a0993d2a1791acb2f?narHash=sha256-IiA3jfbR7K/B5%2B9byVi9BZGWTD4VSbWe8VLpp9B/iYk%3D' (2024-09-11)
2024-09-15 00:24:43 +00:00
Alexandru Ionut Tripon
71dda06276
Merge pull request #5 from QazCetelic/java_dir_disable_alt
...
Disable folder action instead of hiding it and add additional informa…
2024-09-14 23:27:57 +03:00
QazCetelic
1c6bd74ed8
Disable folder action instead of hiding it and add additional information in the tooltip.
...
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com >
2024-09-14 22:04:18 +02:00
Trial97
0afdce8a31
Add extra step to macos java install
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-14 21:18:20 +03:00
Alexandru Ionut Tripon
6492ad7076
Merge pull request #2813 from Trial97/fix_java_autodetect
...
fix java autodetect when instance settings are open
2024-09-14 20:19:15 +03:00
Alexandru Ionut Tripon
ad786fb983
Merge pull request #2811 from Trial97/fix_java_abort
...
fix download java abort being stuck
2024-09-14 20:19:02 +03:00
Alexandru Ionut Tripon
281621cfc0
Merge pull request #2808 from Trial97/fix_java_download_crash
...
fix java crash on refresh
2024-09-14 20:18:51 +03:00
Trial97
312009513d
add open java folder action
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-14 19:35:43 +03:00
Trial97
5073fc19d4
fix java autodetect when instance settings are open
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-14 00:36:31 +03:00
Alexandru Ionut Tripon
e59f90eca8
Update launcher/ui/pages/global/APIPage.cpp
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-09-14 00:19:48 +03:00
Trial97
22ebf7e961
fix download java abort being stuck
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-14 00:13:16 +03:00
Trial97
6706317f20
fix java crash on refresh
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-13 23:26:04 +03:00
Trial97
e18e9b0509
fix server launch
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-13 22:57:08 +03:00
timoreo
f46b73acb5
Merge pull request #2789 from Trial97/fix_concurrent_task
...
Remove all the slowdown code from CocurrentTask
2024-09-13 21:10:30 +02:00
Trial97
40b10ecf30
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_concurrent_task
2024-09-13 21:38:29 +03:00
Trial97
1db122f1a2
fix typo
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-13 21:37:50 +03:00
Trial97
e34ebc1a0d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2
2024-09-13 21:14:48 +03:00
Alexandru Ionut Tripon
d20f24d96f
Apply suggestions from code review
...
Co-authored-by: seth <getchoo@tuta.io >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-09-13 21:13:21 +03:00
seth
ef76894587
Merge pull request #2799 from PrismLauncher/renovate/determinatesystems-update-flake-lock-24.x
...
chore(deps): update determinatesystems/update-flake-lock action to v24
2024-09-13 14:03:42 -04:00
Alexandru Ionut Tripon
f1ef243617
Merge pull request #2803 from Trial97/java_setup
...
Improve wizzard page
2024-09-13 21:01:02 +03:00
Trial97
973b43ca7a
Add techinc client ID
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-13 20:01:45 +03:00
Trial97
c85294af9d
Improve wizzard page
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-13 19:33:24 +03:00
QazCetelic
7b49fd6508
fixes for ci errors IV
...
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com >
2024-09-11 10:07:05 +02:00
QazCetelic
f7f7c4b43e
fixes for ci errors III
...
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com >
2024-09-11 09:55:27 +02:00
QazCetelic
506ec64273
fixes for ci errors II
...
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com >
2024-09-11 09:43:45 +02:00
QazCetelic
0a576a0f67
fixes for ci errors
...
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com >
2024-09-11 09:31:16 +02:00
QazCetelic
40c3866f63
clang-tidy formatting
...
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com >
2024-09-11 09:22:28 +02:00
QazCetelic
6b0007291b
Added search and support for subdirectories to icon picker
...
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com >
2024-09-10 22:30:29 +02:00
Alexandru Ionut Tripon
fa68428a90
Merge pull request #2795 from Trial97/fix_mc_launch
...
Fix launch when no java is loaded
2024-09-10 18:57:09 +03:00
Alexandru Ionut Tripon
b17a688237
Merge pull request #2771 from Kurumi78/develop
...
Add webp to validIconExtensions
2024-09-10 12:27:02 +03:00
TheKodeToad
e3f78e0205
Merge pull request #2798 from QazCetelic/chronological-screenshot-list
...
Sort screenshots chronologically in descending order
2024-09-10 09:38:11 +01:00
renovate[bot]
7e49fa0426
chore(deps): update determinatesystems/update-flake-lock action to v24
2024-09-09 19:05:56 +00:00
QazCetelic
e2ef280da9
DCO Remediation Commit for QazCetelic <qaz.cetelic@protonmail.com>
...
I, QazCetelic <qaz.cetelic@protonmail.com >, hereby add my Signed-off-by to this commit: 7fbf0d3bf3
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com >
2024-09-09 16:24:40 +02:00
QazCetelic
7fbf0d3bf3
Sort files chronologically in descending order
...
Signed-off-by: Qaz <dev@malplena.net >
2024-09-09 15:40:31 +02:00
Trial97
2622d3daa9
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_mc_launch
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-09 08:11:11 +03:00
TheKodeToad
01015a7345
Merge pull request #2547 from Ryex/fix/component-version-resolusion
...
Component version resolusion on Minecraft version change
2024-09-08 23:44:07 +01:00
Trial97
14fb54afd9
Fix launch when no java is loaded
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-08 09:10:29 +03:00
Alexandru Ionut Tripon
42eedd1afa
Merge pull request #2784 from Trial97/ensure_desktop
...
ensure that the shortcut destination exists
2024-09-08 08:52:53 +03:00
Rachel Powers
c2a2e95183
fix: Forge and neoforge conflict with quilt, not fabric twice
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-09-07 21:35:01 -07:00
Trial97
c5592a446a
Remove all the slowdown code from CocurrentTask
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-06 21:47:35 +03:00
Trial97
166207753c
ensure that the shortcut destination exists
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-09-05 09:36:45 +03:00
Kurumi78
4ea7132bdf
Add webp validIconExtensions
...
Add webp to list of valid file extensions for Icons
Signed-off-by: Kurumi78 <30587387+Kurumi78@users.noreply.github.com >
2024-08-30 02:08:07 -05:00
timoreo
828acef7e9
Merge pull request #2760 from Trial97/mangohid
...
fix mangohud detection for absolute path
2024-08-29 06:24:09 +02:00
Alexandru Ionut Tripon
685519d12f
Merge pull request #2758 from Edgars-Cirulis/improvements/instanceview-navigation
...
Improve left and right cursor navigation in Instances
2024-08-26 23:55:03 +03:00
Alexandru Ionut Tripon
74acb483af
Merge pull request #2757 from Trial97/hash_maybe
...
Add checksum validator to resource download
2024-08-26 23:54:29 +03:00
Alexandru Ionut Tripon
cf12365358
Merge pull request #2755 from Trial97/fix_java_typo
...
fix java 64 bit condition
2024-08-26 23:49:35 +03:00
Edgars Cirulis
630df29010
feat: Improve left and right cursor navigation in Instances
...
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com >
2024-08-26 22:45:01 +03:00
Trial97
034e2a44ad
update thresholds each time java result changes
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-26 17:43:49 +03:00
Trial97
c64b7cd693
fix mangohud detection for absolute path
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-26 09:00:46 +03:00
Trial97
430013737a
add checksum validator
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-26 00:27:23 +03:00
Trial97
d55ebefac3
fix java 64 bit condition
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-25 21:42:40 +03:00
maskers
6a12c43c78
fix off by one error
...
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com >
2024-08-25 16:02:32 +03:00
TheKodeToad
43fc9ba932
Confirm Truncate -> Truncation
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-08-25 13:05:08 +01:00
TheKodeToad
23c69e7f94
Merge pull request #2018 from Trial97/coremods
...
Ensure that core mods tab is visible on correct versions
2024-08-25 13:01:27 +01:00
timoreo
70a0a71f10
Merge pull request #2753 from TheKodeToad/modrinth-hashes-parse-fix
2024-08-25 13:34:54 +02:00
TheKodeToad
ff9fa6aa4f
Stop accepting malformed hashes object
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-08-25 11:45:45 +01:00
seth
faf9086705
Merge pull request #2750 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-08-25 05:12:32 -04:00
Trial97
465c9498d4
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-25 09:50:41 +03:00
Alexandru Ionut Tripon
44f589817f
Merge pull request #2749 from TheKodeToad/theme-bugfixes
...
Fix system theme detection
2024-08-25 08:58:42 +03:00
Alexandru Ionut Tripon
aa206f4c89
Merge pull request #2748 from TheKodeToad/gentoo-java-perf
...
Improve Java checking speed by using startsWith for gentoo paths
2024-08-25 08:58:22 +03:00
ZekeZ
1bb7f35ddb
Merge pull request #2751 from Ryex/security/modrith-hash-priority
...
Prefer stronger hashes from Modrinth
2024-08-25 13:53:04 +10:00
Rachel Powers
5f874330d5
security(modrinth) reorder hash algo priority, prefer stronger hashes.
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-08-24 20:24:35 -07:00
github-actions[bot]
96414d7153
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/c3aa7b8938b17aebd2deecf7be0636000d62a2b9?narHash=sha256-med8%2B5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c%3D' (2024-08-14)
→ 'github:NixOS/nixpkgs/c374d94f1536013ca8e92341b540eba4c22f9c62?narHash=sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh%2BaRKoCdaAv5fiO0%3D' (2024-08-21)
2024-08-25 00:22:51 +00:00
TheKodeToad
cbdacf81ee
Fix system theme detection
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-08-24 22:50:51 +01:00
TheKodeToad
d2304b6698
Improve Java checking speed by using startsWith for gentoo paths
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-08-24 22:13:18 +01:00
Sefa Eyeoglu
fac28a81ae
Merge pull request #2738 from getchoo/nix-omnibus
2024-08-23 10:08:59 +02:00
Trial97
2a86ceb5d6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2
2024-08-23 08:34:15 +03:00
Trial97
575cdb043b
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix/component-version-resolusion
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-23 08:29:43 +03:00
Alexandru Ionut Tripon
eae5d70385
Merge pull request #2069 from Trial97/feature/java-downloader
...
Feature/java downloader
2024-08-23 08:17:15 +03:00
Trial97
92495494ca
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-23 08:16:59 +03:00
Alexandru Ionut Tripon
e4be8f97cd
Merge pull request #2740 from TheKodeToad/themeable-logs
...
Allow themes to modify log colours
2024-08-23 08:12:34 +03:00
seth
fd14d3e9b0
Merge pull request #2745 from TheKodeToad/fix-java-message
...
Fix invalid Java path message
2024-08-22 21:33:24 -04:00
seth
11927e9bf2
Merge pull request #2739 from PrismLauncher/renovate/korthout-backport-action-3.x
...
chore(deps): update korthout/backport-action action to v3.1.0
2024-08-22 21:32:03 -04:00
TheKodeToad
e2f3641395
Merge branch 'develop' into data-packs
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-08-22 20:00:49 +01:00
maskers
762d24bd02
don't mention prism in the middle of the log
...
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com >
2024-08-22 21:44:53 +03:00
maskers
a910337e9d
apply suggestion from code review
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: maskers <97827489+maskersss@users.noreply.github.com >
2024-08-22 21:42:05 +03:00
TheKodeToad
89ed85182c
Fix invalid Java path message
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-08-22 19:07:15 +01:00
Trial97
5f64d7dc47
update adoptium icon
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-22 20:38:08 +03:00
Trial97
0b05c7cb07
fix bug with buton not updating corectly for java dialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-22 18:59:09 +03:00
Trial97
7d9e47ac18
Change major java column name
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-22 18:58:38 +03:00
Trial97
aa3a4585ee
Add icons
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-22 18:58:04 +03:00
TheKodeToad
2ad34c724e
Make log colours themeable
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-08-21 22:19:50 +01:00
maskers
6d017b5f0b
fix formatting
...
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com >
2024-08-21 22:39:27 +03:00
maskers
65f8526152
add a Cancel option
...
Co-authored-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
Signed-off-by: maskers <97827489+maskersss@users.noreply.github.com >
2024-08-21 22:14:11 +03:00
renovate[bot]
7472233033
chore(deps): update korthout/backport-action action to v3.1.0
2024-08-21 17:22:09 +00:00
maskers
99bd4a8937
Apply suggestions from code review
...
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
Signed-off-by: maskers <97827489+maskersss@users.noreply.github.com >
2024-08-21 19:42:35 +03:00
maskers
cf914526bf
add a warning about the log being too large
...
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com >
2024-08-21 15:59:51 +03:00
Trial97
26ae608685
fix initial java dialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-21 15:01:42 +03:00
Trial97
da7cc529f0
Enable auto-detect java if java path is not set
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-21 14:54:47 +03:00
seth
99ecab01fc
ci(garnix): explicitly declare systems
...
as we now create outputs for each system in `lib.systems.flakeExposed`,
we should ensure garnix only builds the systems we officially support
dev shells are also no longer built as they really don't need to be
"built" on the developer's machine in any case; everything should be
cached
Signed-off-by: seth <getchoo@tuta.io >
2024-08-21 04:02:48 -04:00
seth
a49a58bc45
Revert "refactor(nix): nix-filter -> lib.fileset"
...
This reverts commit 8312713dc2 .
See nix#9428. Path coercion like `"${./.}"` in flakes causes the path to
be copied to the store twice; using the `self` argument works around
this. However, as `lib.fileset` doesn't support using `self`, so we need
to go back to `nix-filter`
Signed-off-by: seth <getchoo@tuta.io >
2024-08-21 04:01:32 -04:00
seth
13eedbb7de
doc(nix): prefer packages output
...
overlays can cause issues we don't run into upstream, especially when
used on stable channels for example. preferring the pure `packages`
output also encourages the use of our binary cache by users, who
probably don't like building the launcher all too much
Signed-off-by: seth <getchoo@tuta.io >
2024-08-21 04:01:32 -04:00
seth
e29ea4efb0
build(nix): add formatting checks
...
Signed-off-by: seth <getchoo@tuta.io >
2024-08-21 04:01:32 -04:00
seth
0ae421c265
chore(nix): drop flake-parts
...
The primary goals here include making the flake easier to contribute to
by having it follow the standard boilerplate, while also limiting the
size of our flake.lock to lower the chance of duplicate inputs for users
Signed-off-by: seth <getchoo@tuta.io >
2024-08-21 04:01:30 -04:00
seth
e85b364748
refactor(nix): use final in overlay
...
this allows to implictly pass `prismlauncher-unwrapped`
it won't have an effect on our package set as directly inheriting from
the scope we create filters out the extra attributes usually introduced
with a scope
Signed-off-by: seth <getchoo@tuta.io >
2024-08-21 03:49:37 -04:00
seth
271c38bc56
doc(nix): update package names and params
...
Signed-off-by: seth <getchoo@tuta.io >
2024-08-21 03:49:36 -04:00
seth
7a83d0cea0
ci(nix): drop pre-commit-hooks
...
Signed-off-by: seth <getchoo@tuta.io >
2024-08-21 03:49:36 -04:00
seth
4c81d8c53d
style(nix): format with nixfmt
...
Signed-off-by: seth <getchoo@tuta.io >
2024-08-21 03:49:36 -04:00
seth
7dff77ca35
style(nix): alejandra -> nixfmt-rfc-style
...
Signed-off-by: seth <getchoo@tuta.io >
2024-08-21 03:49:36 -04:00
seth
1edfbeec8d
Merge pull request #2732 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-08-20 22:36:33 -04:00
maskers
858f6aa9b8
fix formatting
...
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com >
2024-08-20 22:16:40 +03:00
maskers
e6f30c0ebe
fix formatting
...
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com >
2024-08-20 22:14:40 +03:00
maskers
014fc14291
truncate logs for mclo.gs upload to fit 25k line limit
...
Signed-off-by: maskers <97827489+mskrss@users.noreply.github.com >
2024-08-20 21:53:05 +03:00
timoreo
7f594a342e
Merge pull request #2735 from Trial97/force_load_java
2024-08-20 08:04:21 +02:00
Trial97
002fc71b8d
allways load java list on autodetect
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-20 01:18:37 +03:00
Trial97
ca298d1ed5
add automatic java switch on minecraft version switch
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-20 01:08:03 +03:00
Trial97
7a66276838
fix conflicts
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-20 01:07:23 +03:00
Trial97
4d24213aa3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
2024-08-20 00:02:14 +03:00
Trial97
23c06f23c3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix/component-version-resolusion
2024-08-19 22:35:11 +03:00
Alexandru Ionut Tripon
1b756b99bb
Merge pull request #2528 from Trial97/validate_metadata
...
validate metadata on instance launch
2024-08-19 22:34:13 +03:00
Trial97
38b5ee198a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into validate_metadata
2024-08-18 22:39:46 +03:00
Trial97
6bd8b72f68
fix meta not validating for specific versions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-18 22:38:45 +03:00
Alexandru Ionut Tripon
efac063797
Merge pull request #2729 from Trial97/currentTextChanged
...
replaced currentTextChanged with currentIndexChanged
2024-08-18 19:00:29 +03:00
TheKodeToad
e9791d6bc1
Merge pull request #2633 from Trial97/refactor_minecraft_update
...
refactor MinecraftUpdate Task
2024-08-18 11:44:44 +01:00
github-actions[bot]
91d6465d45
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/5e0ca22929f3342b19569b21b2f3462f053e497b?narHash=sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI%3D' (2024-08-09)
→ 'github:NixOS/nixpkgs/c3aa7b8938b17aebd2deecf7be0636000d62a2b9?narHash=sha256-med8%2B5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c%3D' (2024-08-14)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/c7012d0c18567c889b948781bc74a501e92275d1?narHash=sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q%3D' (2024-08-09)
→ 'github:cachix/pre-commit-hooks.nix/bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba?narHash=sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc%3D' (2024-08-16)
2024-08-18 00:22:22 +00: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
b0cd412926
use index instead of currentIndex function
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-16 15:41:31 +03:00
Trial97
e6bc61d6d0
add overload for qt5
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-16 14:44:57 +03:00
Trial97
6de026bfcf
replaced currentTextChanged with currentIndexChanged
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-16 14:34:28 +03:00
Sefa Eyeoglu
d6a825dd47
Merge pull request #2707 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x
2024-08-12 10:40:26 +02:00
Sefa Eyeoglu
3d4be7ac8c
Merge pull request #2669 from PrismLauncher/update_flake_lock_action
2024-08-12 10:40:00 +02:00
Sefa Eyeoglu
af83fc84a7
Merge pull request #2585 from PrismLauncher/renovate/determinatesystems-update-flake-lock-23.x
2024-08-12 10:39:19 +02:00
Alexandru Ionut Tripon
6b07e8e72d
Merge pull request #2718 from cthbleachbit/develop
...
mangohud support: MangoHud::getLibraryString should return absolute path
2024-08-12 11:26:30 +03:00
Alexandru Ionut Tripon
d2daacf736
Merge pull request #2716 from Trial97/quickPlaySingleplayer
...
add setting for quickplay singleplayer
2024-08-12 11:25:25 +03:00
github-actions[bot]
96dad63173
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7?narHash=sha256-pQMhCCHyQGRzdfAkdJ4cIWiw%2BJNuWsTX7f0ZYSyz0VY%3D' (2024-07-03)
→ 'github:hercules-ci/flake-parts/8471fe90ad337a8074e957b69ca4d0089218391d?narHash=sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC%2Bx4%3D' (2024-08-01)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9?narHash=sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y%3D' (2024-07-12)
→ 'github:NixOS/nixpkgs/5e0ca22929f3342b19569b21b2f3462f053e497b?narHash=sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI%3D' (2024-08-09)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/8d6a17d0cdf411c55f12602624df6368ad86fac1?narHash=sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY%3D' (2024-07-09)
→ 'github:cachix/pre-commit-hooks.nix/c7012d0c18567c889b948781bc74a501e92275d1?narHash=sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q%3D' (2024-08-09)
2024-08-11 00:22:53 +00:00
Tianhao Chai
c2192cfa98
mangohud support: getLibraryString should return absolute path when possible
...
Some distros ship MangoHub vulkan layer json with bare shared object name
instead of an absolute path. This breaks environment config as
`MinecraftInstance::createLaunchEnvironment()` seems to require absolute
path of `libMangoHud.so`.
Since we already have `MangoHud::findLibrary()` lying around, use that to
figure out where `libMangoHud.so` really is. In case of a platform that
doesn't support `dlopen()`, fallback to old behavior and return the path
verbatim as it is recorded in vk layer json.
Signed-off-by: Tianhao Chai <cth451@gmail.com >
2024-08-09 14:11:44 -04:00
Trial97
dcca175b36
snake_case to m_camelCase
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-09 11:06:31 +03:00
Trial97
a9c7e95c66
fix widebar action removal
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-08 19:39:32 +03:00
Trial97
c9809fff6d
add setting for quickplay singleplayer
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-08 16:53:26 +03:00
Tayou
b41e730707
Merge pull request #2714 from Kationor/fix-local-installs
...
Improve Java auto-detection
2024-08-07 18:48:24 +02:00
Kationor
659fa7fbfb
fix/windows: Check registry for per-user java installations
...
Signed-off-by: Kationor <n96211028@gmail.com >
2024-08-07 18:00:42 +02:00
Sefa Eyeoglu
0215af828d
Merge pull request #2667 from unmojang/evan-goode/nix-sync
2024-08-07 09:18:03 +02:00
Tayou
7a5e4a4293
Merge pull request #2706 from Edgars-Cirulis/develop
...
Restore connect line for device authorization in MSADeviceCodeStep
2024-08-05 22:08:40 +02:00
renovate[bot]
128827cef5
chore(deps): update hendrikmuhs/ccache-action action to v1.2.14
2024-08-05 20:02:40 +00:00
Edgars Cirulis
ba7391308e
Restore connect line for device authorization in MSADeviceCodeStep
...
Parent PRs: https://github.com/PrismLauncher/PrismLauncher/pull/2617
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/2705
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com >
2024-08-05 22:12:18 +03:00
Alexandru Ionut Tripon
0308710211
Merge pull request #2639 from Edgars-Cirulis/qt672
...
chore: update Qt to 6.7.2
2024-08-05 14:06:52 +03:00
Trial97
fe23e76714
fix codeql
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-05 12:04:08 +03:00
Trial97
af65eb17cf
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-08-05 11:54:58 +03:00
Alexandru Ionut Tripon
9d684dcb82
Merge pull request #2617 from Trial97/clean_net
...
remove duplicate code from net folder
2024-08-05 10:56:40 +03:00
Alexandru Ionut Tripon
e4967f8d08
Merge pull request #2694 from Trial97/zip_folder_permissions
...
ensure minimal folder permissions when extracting files
2024-08-05 10:56:06 +03:00
Alexandru Ionut Tripon
5702b8e3c2
Merge pull request #2692 from srcres258/pr
...
Fix a typo in comment
2024-08-05 10:55:24 +03:00
Alexandru Ionut Tripon
110efb7259
Merge pull request #2627 from Edgars-Cirulis/build-instructions
...
readme: build instructions
2024-08-05 10:54:47 +03:00
TheKodeToad
b77dc47c6c
Merge pull request #1526 from Trial97/disablemods
...
feat:Removed update disabled warning
2024-08-03 15:38:46 +01: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
src_resources
61e62dce1b
Fix a typo in comment
...
Signed-off-by: src_resources <src.res.211@gmail.com >
2024-07-29 21:07:28 +08:00
Trial97
d5c5f5d4fc
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-07-24 11:47:45 +03:00
Trial97
2c0b17d107
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-07-24 11:40:23 +03:00
Trial97
0ac62f9ddf
Recommend java major
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-07-23 01:41:41 +03:00
Trial97
4928706d8c
Merge branch 'clean_net' of github.com:Trial97/PrismLauncher into clean_net
2024-07-22 22:06:27 +03:00
Trial97
63a380a039
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into clean_net
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-07-22 22:06:09 +03:00
Alexandru Ionut Tripon
33bf370d17
Update launcher/net/RawHeaderProxy.h
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-07-22 21:51:20 +03:00
Trial97
5d3549a5e9
Add tooltips and fix archive download task
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-07-22 09:18:20 +03:00
Trial97
29a6db171f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
2024-07-22 08:57:31 +03:00
Evan Goode
ff31e88cf8
nix: sync changes from nixpkgs
...
Brings in changes from the Prism Launcher derivation(s) in nixpkgs, notably
from https://github.com/NixOS/nixpkgs/pull/321851 and
https://github.com/NixOS/nixpkgs/pull/303880
Signed-off-by: Evan Goode <mail@evangoo.de >
2024-07-21 15:47:38 -04:00
Trial97
91d03b34ac
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into validate_metadata
2024-07-21 02:24:30 +03:00
Alexandru Ionut Tripon
6352362907
Merge pull request #2662 from Edgars-Cirulis/ui
...
ui: swap timeoutSecondsLabel and numberOfManualRetriesLabel order
2024-07-20 11:39:51 +03:00
Edgars Cirulis
fc2d013402
ui: swap timeoutSecondsLabel and numberOfManualRetriesLabel order
...
fixes: 7a200a337f
conflicted with 6078a771c1
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com >
2024-07-20 01:55:23 +03:00
Trial97
c666d060fc
fix merge issue
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-07-19 17:10:04 +03:00
Trial97
cae1fbc171
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix/component-version-resolusion
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-07-19 15:59:43 +03:00
Alexandru Ionut Tripon
0041d2a126
Merge pull request #2440 from Trial97/fix_retry_dialog
...
update retry netjob dialog
2024-07-19 15:47:12 +03:00
Alexandru Ionut Tripon
69c55d90ce
Merge pull request #2558 from Trial97/update_filters
...
Resolve issue with multiple loaders during mod update
2024-07-19 15:46:15 +03:00
Alexandru Ionut Tripon
ddcaf25149
Merge pull request #2650 from Trial97/help-pages
...
fix a few missing help pages
2024-07-19 15:45:57 +03:00
Alexandru Ionut Tripon
fcdedc795c
Merge pull request #2660 from benthetechguy/typo
...
Fix a few typos
2024-07-19 08:50:11 +03:00
Ben Westover
fb10cb5fdf
Fix a few typos
...
As part of packaging Prism Launcher for Debian, I have run a package linter
called lintian which found a few spelling errors throughout the source.
I am not a fan of contributions that only fix cosmetics like spelling errors,
but Debian encourages forwarding this stuff upstream instead of letting it get
fixed naturally over time.
Signed-off-by: Ben Westover <me@benthetechguy.net >
2024-07-18 22:08:18 -04:00
Tayou
dcc58c8b75
Merge pull request #2655 from Ryex/fix/json-parsing-validator-buffer-reset
...
fix(net/validators): ensure buffers are cleared and reset;
2024-07-18 09:11:29 +02:00
Rachel Powers
cb65f6dfb5
fix(net/validators): ensure buffers are cleared and reset;
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-07-17 23:05:45 -07:00
Alexandru Ionut Tripon
d7579319e0
Merge pull request #2653 from UnownPlain/patch-1
...
Fix dead link to Modrinth authentication docs
2024-07-18 08:40:59 +03:00
UnownPlain
e6019ab396
Fix dead link to Modrinth authentication docs
...
Signed-off-by: UnownPlain <38232575+UnownPlain@users.noreply.github.com >
2024-07-17 23:04:52 -04:00
Trial97
6d425717e9
fix a few missing help pages
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-07-16 14:42:23 +03:00
Sefa Eyeoglu
84263cd94c
Merge pull request #2644 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-07-14 09:31:41 +02:00
github-actions[bot]
303f3303f6
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/9f4128e00b0ae8ec65918efeba59db998750ead6?narHash=sha256-rwz8NJZV%2B387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ%3D' (2024-07-03)
→ 'github:NixOS/nixpkgs/7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9?narHash=sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y%3D' (2024-07-12)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07?narHash=sha256-F1h%2BXIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4%3D' (2024-06-24)
→ 'github:cachix/pre-commit-hooks.nix/8d6a17d0cdf411c55f12602624df6368ad86fac1?narHash=sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY%3D' (2024-07-09)
2024-07-14 00:22:27 +00:00
Alexandru Ionut Tripon
2df5d4012c
Merge pull request #2635 from Izder456/develop
...
FIX launcher/java/JavaUtils.cpp to properly autodetect JVM paths on …
2024-07-13 11:16:35 +03:00
Edgars Cirulis
d3ca8864c2
chore: update Qt to 6.7.2
...
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com >
2024-07-12 23:54:22 +03:00
izder456
0a543cb66b
FIX launcher/java/JavaUtils.cpp to properly autodetect JVM paths on OpenBSD and FreeBSD
...
Signed-off-by: izder456 <izder456@disroot.org >
2024-07-11 20:32:04 -05:00
Trial97
b989c5a36c
refactor MinecraftUpdate Task
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-07-10 16:24:31 +03:00
Edgars Cirulis
3076e5b961
remove useless BUILD.md orphaned file
...
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com >
2024-07-09 22:21:13 +03:00
Edgars Cirulis
e5b1fa1e3a
readme: build instructions
...
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com >
2024-07-09 22:15:52 +03:00
Trial97
061fdc1ada
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into clean_net
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-07-09 18:36:23 +03:00
Alexandru Ionut Tripon
5f345cedea
Merge pull request #2596 from TayouVR/more-system-themes
...
Display all system themes in widget theme selector
2024-07-09 12:55:22 +03:00
timoreo
39b4293a62
Merge pull request #1752 from Trial97/fix_duplicate_mod
2024-07-09 10:32:56 +02:00
timoreo
ebd7974fcc
Merge pull request #2416 from Trial97/retry_auth
2024-07-09 09:57:32 +02:00
Trial97
71c7dd1c5d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-07-08 21:51:34 +03:00
Alexandru Ionut Tripon
ca2dda5547
Merge pull request #2626 from Trial97/remove_poly
...
remove some poly mentions from the code
2024-07-08 21:46:39 +03:00
Alexandru Ionut Tripon
aeb7f29a5b
Update launcher/InstanceList.cpp
...
Co-authored-by: Tayou <git@tayou.org >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-07-08 15:04:27 +03:00
Trial97
fdcd1068f3
remove some poly mentions from the code
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-07-08 14:53:39 +03:00
Alexandru Ionut Tripon
08cab11cfe
Merge pull request #2554 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-07-07 08:01:42 +03:00
github-actions[bot]
e49e2622fc
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8?narHash=sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw%3D' (2024-06-01)
→ 'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7?narHash=sha256-pQMhCCHyQGRzdfAkdJ4cIWiw%2BJNuWsTX7f0ZYSyz0VY%3D' (2024-07-03)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/3f84a279f1a6290ce154c5531378acc827836fbb?narHash=sha256-u1fA0DYQYdeG%2B5kDm1bOoGcHtX0rtC7qs2YA2N1X%2B%2BI%3D' (2024-06-13)
→ 'github:NixOS/nixpkgs/9f4128e00b0ae8ec65918efeba59db998750ead6?narHash=sha256-rwz8NJZV%2B387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ%3D' (2024-07-03)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/cc4d466cb1254af050ff7bdf47f6d404a7c646d1?narHash=sha256-7XfBuLULizXjXfBYy/VV%2BSpYMHreNRHk9nKMsm1bgb4%3D' (2024-06-06)
→ 'github:cachix/pre-commit-hooks.nix/0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07?narHash=sha256-F1h%2BXIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4%3D' (2024-06-24)
2024-07-07 00:21:50 +00:00
Trial97
c07260e836
remove duplicate code from net folder
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-07-07 02:49:27 +03:00
Tayou
330c95e55b
Merge pull request #2612 from Trial97/lib_doc
...
add docs to Library.cpp
2024-07-06 14:21:28 +02:00
Trial97
a6ae078e7e
add docs to Library.cpp
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-07-06 09:30:26 +03:00
Trial97
c886111e18
format the code
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-07-06 09:09:54 +03:00
Trial97
a09742a406
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
2024-07-06 01:07:00 +03:00
Alexandru Ionut Tripon
5973c1c45e
Merge pull request #2607 from Kationor/noupdateprompt
...
Add ModpackUpdatePromptDisabled setting
2024-07-06 00:49:06 +03:00
Alexandru Ionut Tripon
9596e6fb01
Merge pull request #2609 from Trial97/crash_hash
...
fix crash with hash task
2024-07-06 00:48:19 +03:00
Trial97
5d8d1c4b90
transform hashFile to lambda
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-07-04 16:47:27 +03:00
Trial97
1dd21a5e4a
fix crash with hash task
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-07-04 16:38:40 +03:00
Kationor
83a5fe1984
Rename setting to SkipModpackUpdatePrompt
...
Was ModpackUpdatePromptDisabled
Signed-off-by: Kationor <n96211028@gmail.com >
2024-07-03 23:13:39 +02:00
timoreo
219de66783
Merge pull request #2567 from Ryex/feat/ungrouped-group-persist-state
2024-07-03 18:21:54 +02:00
Kationor
9b172278f8
Add ModpackUpdatePromptDisabled setting
...
When creating an instance of a modpack that's already associated with
another instance, the user gets asked if they want to update that
instance instead. This commit introduces a setting to suppress the
prompt and directly create the new instance.
Signed-off-by: Kationor <n96211028@gmail.com >
2024-07-03 12:43:05 +02:00
Tayou
dbcfefca1b
fix system theme
...
Signed-off-by: Tayou <git@tayou.org >
2024-07-01 23:05:54 +02:00
Tayou
d70be5121c
tooltips
...
Signed-off-by: Tayou <git@tayou.org >
2024-06-30 23:27:45 +02:00
Tayou
4f795eb6ef
format
...
Signed-off-by: Tayou <git@tayou.org >
2024-06-30 22:06:01 +02:00
Trial97
0f311453e1
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-30 22:54:23 +03:00
Tayou
7104f8909d
another oop
...
Signed-off-by: Tayou <git@tayou.org >
2024-06-30 21:52:26 +02:00
Tayou
a184b26a00
#ifdef, not #if... I'm smort
...
Signed-off-by: Tayou <git@tayou.org >
2024-06-30 21:47:52 +02:00
Trial97
4b4da8e6f6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-30 22:41:49 +03:00
Tayou
f0c9b52055
oop
...
Signed-off-by: Tayou <git@tayou.org >
2024-06-30 21:41:37 +02:00
Tayou
046e3588af
more system themes initial changes
...
Signed-off-by: Tayou <git@tayou.org >
2024-06-30 21:35:03 +02:00
Alexandru Ionut Tripon
fc445078cd
Merge pull request #2415 from Trial97/configure_timeout
...
Add config for transfer timeout
2024-06-30 22:26:19 +03:00
Alexandru Ionut Tripon
7ff173d72a
Merge pull request #2173 from Trial97/dependency_removal
...
Remove dependencies if review mods is rejected
2024-06-30 22:21:38 +03:00
Alexandru Ionut Tripon
aa24d70a24
Merge pull request #2590 from Trial97/env_dir
...
control Prism data directory via env variable
2024-06-30 20:45:22 +03:00
Alexandru Ionut Tripon
80243ab554
Merge pull request #2588 from Ryex/fix/updater-support-linux-nonportable
...
Fix linux non portable update
2024-06-30 07:54:05 +03:00
Alexandru Ionut Tripon
5d9f4f9ee7
Merge pull request #2589 from Trial97/portabledatadir2
...
make sure updater take into consideration UserData
2024-06-30 07:53:54 +03:00
Alexandru Ionut Tripon
de9df31efa
Merge pull request #2592 from Trial97/import_whitespace
...
trim input from import page
2024-06-30 07:53:39 +03:00
Rachel Powers
8488d11c69
review suggestions + spelling
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-06-29 20:34:10 -07:00
Trial97
492c78a570
format the code
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-29 20:34:10 -07:00
Rachel Powers
c4cc1cfe4f
Warn about known conflicting modloaders
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-06-29 20:34:10 -07:00
Rachel Powers
4ed92a95c2
fix segfaults consistently set component problems
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-06-29 20:34:09 -07:00
Rachel Powers
a85d6cb1f2
move resolution into update actions in task.
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-06-29 20:34:09 -07:00
Trial97
474effe7c7
clang-format
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-29 20:34:09 -07:00
Rachel Powers
cf319649f9
fix qt5 lwjgl recommend + spelling
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-06-29 20:34:09 -07:00
Rachel Powers
a94a081b9c
add better profile logging properly resolve important dependencies
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-06-29 20:34:08 -07:00
Rachel Powers
ce280c2d04
fix misepellings
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-06-29 20:34:08 -07:00
Rachel Powers
a791e22853
fix(instance components): resolve instance componants when changing minecraft version
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-06-29 20:34:08 -07:00
Rachel Powers
44bf0315ad
feat(components) recomend the correct lwjgl version for the minecraft version
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-06-29 20:33:51 -07:00
Trial97
25bae20db4
trim input from import page
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-30 00:17:25 +03:00
Trial97
7a0b299be9
control Prism data directory via env variable
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-29 18:08:28 +03:00
Rachel Powers
ae3e4ed528
fix Build Artifact Checks
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-06-29 04:29:19 -07:00
Rachel Powers
b4f5c3d241
Update launcher/updater/prismupdater/PrismUpdater.cpp
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-06-29 04:21:13 -07:00
Rachel Powers
9d1fffff27
reject zsync file as valid build artifact
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-06-29 04:21:13 -07:00
Rachel Powers
41bcfb3c07
Fix #2586
...
non portable linux update technically works even if not genraly a good idea.
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-06-29 04:21:06 -07:00
Alexandru Ionut Tripon
e6234b5086
Merge pull request #2504 from Trial97/auth3
...
update login flow
2024-06-29 14:09:49 +03:00
Trial97
eab53c6e42
make sure updater take into consideration UserData
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-29 14:02:09 +03:00
Trial97
f1a4a1e8ee
increase 'or' font size for login dialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-29 08:41:35 +03:00
renovate[bot]
63a458ca0c
Update DeterminateSystems/update-flake-lock action to v23
2024-06-28 21:48:40 +00:00
Alexandru Ionut Tripon
196b2b5a3e
Merge pull request #2580 from Trial97/silent_background_update_check
...
do not display message that no update is avvailable if the check was …
2024-06-28 23:27:00 +03:00
Trial97
ebad11d34f
made sure const method is respected
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-28 22:04:11 +03:00
Trial97
06add2b0a8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_filters
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-28 20:55:16 +03:00
Trial97
9d903175ab
format
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-28 20:51:52 +03:00
Trial97
cf220356b1
fixed panic with recursive eventloop
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-28 20:51:28 +03:00
Trial97
715c99636d
fix offline mode for meta
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-28 20:51:28 +03:00
Trial97
0a95b57c0a
moved QEventLoops inside functions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-28 20:51:28 +03:00
Trial97
06e1cab41f
force online in case the offline load failed
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-28 20:51:28 +03:00
Trial97
2af6902b42
validate metadata on launch
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-28 20:51:26 +03:00
Trial97
4f8b20437f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3
2024-06-28 20:49:37 +03:00
Trial97
515baffb8e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog
2024-06-28 20:48:28 +03:00
Trial97
4ad19cded5
format
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-28 20:45:54 +03:00
Trial97
0b79abcdcd
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-28 20:45:30 +03:00
Trial97
90e756c041
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into coremods
2024-06-28 20:41:48 +03:00
Trial97
ddf1ea014c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod
2024-06-28 20:39:37 +03:00
Alexandru Ionut Tripon
4aa2e5b85d
Merge pull request #2571 from Trial97/account_refresh
...
refresh account if it should refresh on instance launch
2024-06-28 20:38:05 +03:00
Trial97
55f740453c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
2024-06-28 20:34:59 +03:00
Trial97
72dd3dfba5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-28 20:30:05 +03:00
Trial97
1021222c95
create mod meta information when importing modrinth pack
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-28 20:28:52 +03:00
Alexandru Ionut Tripon
2cd0223cff
Merge pull request #2578 from Trial97/clang-format
...
chore:increment clang-tools version
2024-06-28 19:33:18 +03:00
Trial97
09d258670a
create mod meta information when importing curseforge pack
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-28 19:26:11 +03:00
Trial97
2c02d02214
do not display message that no update is avvailable if the check was done in the background
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-28 14:11:27 +03:00
Trial97
bac678a7fc
format files outside launcher
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-28 12:54:37 +03:00
Trial97
147741e616
increment clang-tools version
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-28 12:48:52 +03:00
seth
66e6fc04d3
Merge pull request #2520 from Trial97/metadata
2024-06-28 04:57:39 +00:00
Trial97
9d7c36c2fc
made identty certain if the login ended
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-27 15:35:44 +03:00
Alexandru Ionut Tripon
5928bc30e1
Merge pull request #2572 from Trial97/sdkman_macos
...
fix sdkman on macos
2024-06-27 13:20:10 +03:00
Alexandru Ionut Tripon
68292aff6c
Merge pull request #2574 from ajerick/develop
...
fix non-persistent user icon selection in NewInstanceDialog.cpp
2024-06-27 08:38:46 +03:00
seth
3f3351f89e
Merge pull request #1892 from Trial97/change_version
...
Added mod reinstall dialog
2024-06-27 02:12:00 +00:00
Aiden J Erickson
37388e1d48
fix non-persistent user icon selection in NewInstanceDialog.cpp
...
Signed-off-by: Aiden J Erickson <aiden.j.erickson@gmail.com >
2024-06-26 20:54:04 -04:00
Trial97
3b473b24d8
fix sdkman on macos
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-26 10:16:27 +03:00
Trial97
b1a86bec34
refresh account if it should refresh on instance launch
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-26 09:51:12 +03:00
Alexandru Ionut Tripon
3aaa36a2bc
Merge pull request #2566 from Trial97/mod_warning
...
add warnning when user closes the resource download dialog with selec…
2024-06-26 08:17:16 +03:00
Alexandru Ionut Tripon
8e2bb21e23
Merge pull request #2570 from porterporter/patch-1
...
add ~/Library/Java/JavaVirtualMachines/* to java installation detection
2024-06-26 08:16:37 +03:00
porter milton
2958691857
add ~/Library/Java/JavaVirtualMachines/* to java installation detection
...
Signed-off-by: porter milton <57007161+porterporter@users.noreply.github.com >
2024-06-25 23:16:26 +00:00
Trial97
7c38edc93d
Apply suggestion from code review
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-25 16:10:05 +03:00
Alexandru Ionut Tripon
555c4a7c59
Apply suggestions from code review
...
Co-authored-by: seth <getchoo@tuta.io >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-06-25 15:33:11 +03:00
Alexandru Ionut Tripon
4e9e7212a6
Apply suggestions from code review
...
Co-authored-by: seth <getchoo@tuta.io >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-06-25 15:22:30 +03:00
Alexandru Ionut Tripon
52839774e6
Apply suggestions from code review
...
Co-authored-by: seth <getchoo@tuta.io >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-06-25 15:19:23 +03:00
Alexandru Ionut Tripon
1a66db78a9
Apply text change suggestions from code review
...
Co-authored-by: seth <getchoo@tuta.io >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-06-25 15:17:51 +03:00
Rachel Powers
14b09549e1
feat(instanceList) persist "ungrouped" hidden state
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2024-06-25 01:55:54 -07:00
Trial97
2f88da9de2
add warnning when user closes the resource download dialog with selection
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-25 09:50:33 +03:00
Alexandru Ionut Tripon
12db1efd20
Merge pull request #2561 from Trial97/fix_curseforge_logo
...
fix missing curseforge logo
2024-06-25 00:01:03 +03:00
Tayou
6b1c16b01a
Merge pull request #2562 from Trial97/fix_update_message
...
fix update message
2024-06-24 22:17:48 +02:00
Alexandru Ionut Tripon
1fcad8d427
Merge pull request #1886 from Trial97/time4
...
Fixed playtime recording
2024-06-24 23:07:41 +03:00
Trial97
096266c141
fix update message
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-24 21:31:26 +03:00
Trial97
73db320bff
fix missing curseforge logo
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-24 21:13:21 +03:00
Trial97
00b83efb9a
fix build
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-24 20:12:40 +03:00
Trial97
e57c2180da
Resolve issue with multiple loaders during update
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-24 03:06:10 +03:00
Trial97
bb48d1ec9d
made sure that the retry dialog is not displayed offline
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-24 00:29:21 +03:00
Trial97
c04031ff00
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog
2024-06-23 23:40:12 +03:00
Alexandru Ionut Tripon
98d68bafeb
Merge pull request #2481 from DioEgizio/qt671
...
chore: update Qt to 6.7.1
2024-06-23 08:41:02 +03:00
seth
92b9f1a3e3
Merge pull request #2515 from Trial97/size_for_skin
...
force aspect ratio for skin preview
2024-06-22 19:21:59 -04:00
seth
e0063b1ee7
Merge pull request #2429 from Richard-Rogalski/GENTOOweloveyou
...
[Linux] Auto-detect Gentoo installed JDKs
2024-06-22 19:14:46 -04:00
seth
d8b47f5c8a
Merge pull request #2466 from PrismLauncher/renovate/determinatesystems-update-flake-lock-22.x
...
chore(deps): update determinatesystems/update-flake-lock action to v22
2024-06-22 19:11:20 -04:00
Alexandru Ionut Tripon
369d7d83f5
Merge pull request #2542 from leia-uwu/perf/async-print-servers
...
perf: print api servers asynchronously on instance launch
2024-06-23 01:51:53 +03:00
Alexandru Ionut Tripon
5f1d86d91a
Merge pull request #2553 from TayouVR/tr-file-types-in-dialogs
...
don't translate file types on file save/open, etc. dialogs
2024-06-23 01:51:27 +03:00
Trial97
2ac89c2378
add more states for account refresh fail
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-23 01:49:37 +03:00
Trial97
b0386a4c2f
added better error handling
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-23 00:47:48 +03:00
Trial97
24aa337a64
fixed offline accounts
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-23 00:27:49 +03:00
Trial97
27ee8374e7
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3
2024-06-22 22:54:38 +03:00
Tayou
178bd4a9c3
don't tr() file types on file save/open, etc. dialogs
...
Signed-off-by: Tayou <git@tayou.org >
2024-06-22 17:28:59 +02:00
leia uwu
c1d0560524
perf: print api servers asynchronously on instance launch
...
Doing this on the main thread can cause the launcher to freeze for up to
5 seconds when launching an instance on my system
so i moved it to a launch step where it gets all the servers info
asynchronously to print
Signed-off-by: leia uwu <leia@tutamail.com >
2024-06-20 17:58:00 -03:00
Alexandru Ionut Tripon
8014283bf4
Merge pull request #2536 from Trial97/refactor_hash
...
Refactor hash task
2024-06-18 22:55:32 +03:00
Trial97
888b22b4c7
rename variable
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-18 22:36:39 +03:00
Sefa Eyeoglu
8607dd46b5
Merge pull request #2361 from Scrumplex/fix/nix/drop-qt5
2024-06-18 21:32:31 +02:00
Trial97
97147f2d24
fix(nix): drop unsupported Qt 5 package
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-18 22:31:41 +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
ac8c7baff2
fix tipo
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-18 17:49:07 +03:00
Trial97
9cbdbddb08
made hasing task async
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-18 17:27:17 +03:00
Trial97
766ddc80e3
refactored hassing task
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-18 16:51:26 +03:00
Alexandru Ionut Tripon
3f68b68691
Merge pull request #2531 from Trial97/relax_fat
...
relax fat FS filename restrictions
2024-06-18 12:51:22 +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
Alexandru Ionut Tripon
35e195b397
Merge pull request #2533 from Cartrigger/patch-1
...
Spelling mistake for Minecraft
2024-06-18 10:59:39 +03: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
a587de8553
relax fat FS filename restrictions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-17 13:35:23 +03:00
Trial97
2fb3e12492
fix auto java install
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-16 17:54:13 +03:00
Trial97
8d3e6667cd
fix java download tasks
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-16 15:09:49 +03:00
Trial97
94fd02a34f
fix java download button
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-16 14:26:19 +03:00
Alexandru Ionut Tripon
fdd302bc11
Merge pull request #2521 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-06-16 09:00:16 +03:00
github-actions[bot]
8dde773486
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/d226935fd75012939397c83f6c385e4d6d832288?narHash=sha256-HV97wqUQv9wvptiHCb3Y0/YH0lJ60uZ8FYfEOIzYEqI%3D' (2024-06-07)
→ 'github:nixos/nixpkgs/3f84a279f1a6290ce154c5531378acc827836fbb?narHash=sha256-u1fA0DYQYdeG%2B5kDm1bOoGcHtX0rtC7qs2YA2N1X%2B%2BI%3D' (2024-06-13)
2024-06-16 00:21:16 +00:00
Trial97
bbf52e3549
renamed dialog and button action
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-16 01:59:50 +03:00
Trial97
d0584684f2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
2024-06-16 01:17:01 +03:00
Trial97
2108ddcc1d
completly remove metadata on refresh
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-16 01:16:09 +03:00
Trial97
5fbbdb9707
fix merge issues
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-16 00:31:31 +03:00
Trial97
c01f3107a4
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into change_version
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-16 00:18:11 +03:00
Alexandru Ionut Tripon
978e96916d
Merge pull request #1728 from Trial97/filters
...
feat: add more filters to the mod download dialog
2024-06-16 00:05:42 +03: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
98f8bc526d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
2024-06-15 10:21:53 +03:00
Trial97
d5fb9f0935
force aspect ratio for skin preview
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-15 10:21:21 +03:00
Trial97
8cdaf5d05f
fix tests
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-14 23:27:27 +03:00
Trial97
cfdf4a9e1f
Merge branch 'develop' of github.com:Trial97/PrismLauncher into feature/java-downloader
2024-06-14 22:50:20 +03:00
Trial97
1a84dc9bca
no need for extra exist check
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-14 22:47:42 +03:00
Trial97
b872f88617
do not double rename
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-14 22:46:39 +03:00
Trial97
d2510b851b
mark files as duplicate
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-14 22:45:15 +03:00
Trial97
2d51008304
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod
2024-06-14 21:05:11 +03:00
Alexandru Ionut Tripon
3c4eed13a3
Merge pull request #1829 from Trial97/demo
...
Fixed demo mode
2024-06-14 18:41:02 +03:00
Trial97
9d16557328
simplify constructor
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-14 16:40:27 +03:00
Trial97
863ebe421c
randomize server port
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-14 16:38:41 +03:00
Trial97
52490743b4
revert desktop file creation
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-14 14:16:23 +03:00
Trial97
164d31dcb1
fix win build take#2
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-14 13:09:22 +03:00
Trial97
3db4f4dc2b
fix build
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-14 13:00:59 +03:00
Trial97
8db0b5f421
Register mime-type on the fly
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-14 12:48:37 +03:00
Trial97
f60d0135f7
made login link to open browser
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-14 12:47:44 +03:00
Trial97
74a86df53c
update the desktop file
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-14 12:41:37 +03:00
Trial97
1bd4e60e99
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3
2024-06-14 11:23:52 +03:00
Trial97
c35461b314
remove aspect ratio
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-14 11:23:14 +03:00
Trial97
014721ca10
remove unused import
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-14 11:19:54 +03:00
Trial97
712fbc3a4b
reverse login layout
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-14 11:15:40 +03:00
Alexandru Ionut Tripon
e9d681a088
Merge pull request #2509 from Scrumplex/fix/flatpak/glfw
...
fix(flatpak): disable docs for glfw
2024-06-14 08:57:50 +03:00
Sefa Eyeoglu
52338f0e88
fix(flatpak): disable docs for glfw
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2024-06-13 19:55:50 +02:00
Trial97
6e8dc6ccc0
add mouse interaction on microsoft link
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-13 19:20:32 +03:00
Alexandru Ionut Tripon
3fc5f56ed6
Merge pull request #2405 from Trial97/fix_missing_manifest
...
Fix portable if manifest is missing
2024-06-13 19:16:12 +03:00
Alexandru Ionut Tripon
ce5b2c54c5
Merge pull request #2439 from Trial97/fix_vanila_technic
...
fix vanilla technic modpacks
2024-06-13 19:15:43 +03:00
Trial97
f7c3e08ac8
add prismlauncher to plist
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-13 18:27:37 +03:00
Trial97
7fdc65eda8
add tooltip to url button
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-13 08:51:11 +03:00
Trial97
2b229d7326
increase qr code size
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-13 00:20:16 +03:00
Trial97
80ea67f7cf
finish login dialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-13 00:00:08 +03:00
Alexandru Ionut Tripon
a74bebb358
Merge pull request #2499 from Trial97/imgur3
...
update imgur upload
2024-06-12 23:45:17 +03:00
Trial97
125fb2eaf2
remove png qr code
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-12 19:34:58 +03:00
Trial97
5f5296ef5e
update ui once again
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-12 19:34:19 +03:00
Trial97
bbbe7c879e
update callback
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-12 12:35:02 +03:00
Trial97
df142550fe
update Add account question
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-12 11:55:56 +03:00
Trial97
c4a65dd861
update login flow
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-12 00:34:39 +03:00
Tayou
6b1c4981e7
Merge pull request #2498 from LaoshuBaby/patch-1
...
fix(SkinManageDialog.cpp): typo
2024-06-10 13:21:51 +02:00
Trial97
c1c182fd0c
update imgur upload
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-10 12:38:59 +03:00
快乐的老鼠宝宝
1c1e296960
fix(SkinManageDialog.cpp): typo
...
Signed-off-by: 快乐的老鼠宝宝 <laoshubaby@protonmail.com >
2024-06-10 17:15:38 +08: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
Alexandru Ionut Tripon
93a0277479
Merge pull request #2450 from Trial97/remove_search
...
remove search button
2024-06-10 10:56:54 +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
11ae169087
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-10 09:34:48 +03:00
Alexandru Ionut Tripon
95e7f36732
Merge pull request #2054 from Trial97/add_configurable_updater_interval
...
Made updater interval configurable
2024-06-10 09:22:54 +03:00
Trial97
6607c3bfa4
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-10 09:04:09 +03:00
Trial97
3f0fa54fe8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into retry_auth
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-10 09:03:04 +03:00
Trial97
e63f25c9e4
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-10 09:01:01 +03:00
Alexandru Ionut Tripon
dc39698c48
Merge pull request #1609 from Trial97/skin_selector
...
Skin management
2024-06-10 08:43:37 +03:00
Alexandru Ionut Tripon
12e04c412b
Merge pull request #1776 from Trial97/resource_size
...
feat:added size column
2024-06-10 08:42:29 +03:00
Alexandru Ionut Tripon
154f4811c0
Merge pull request #2166 from Trial97/ftb2
...
Updated ftb app import instance detection
2024-06-10 00:45:22 +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
1e0db46728
add a more verbose error message in case user skin import fails
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-09 21:29:56 +03:00
Alexandru Ionut Tripon
6c76ba5163
Merge pull request #1032 from deadmeu/shorten-description
...
refactor: shorten desktop entry comment field
2024-06-09 20:59:23 +03:00
Trial97
04b2ac2efa
update fail url skin messagebox
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-09 20:48:49 +03:00
Trial97
689b76885c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
2024-06-09 20:13:09 +03:00
Trial97
6a99312df5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
2024-06-09 19:57:16 +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
Alexandru Ionut Tripon
9560f9ed98
Merge pull request #2474 from coolguy1842/develop
...
simple fix for resizing too small causing an index out of range crash
2024-06-09 16:10:57 +03:00
Alexandru Ionut Tripon
d6a03d3f2c
Merge pull request #1554 from Trial97/instance_copy_progress
...
updated instance copy
2024-06-09 16:05:11 +03:00
Alexandru Ionut Tripon
3af4c94612
Merge pull request #2390 from Trial97/delete_tmp
...
Delete instaces tmp diectory on startup
2024-06-09 16:03:51 +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
Alexandru Ionut Tripon
7e5db651fd
Merge pull request #1823 from Trial97/refresh_cats
...
Added button to refresh themes and catpacks
2024-06-09 16:02:26 +03:00
Alexandru Ionut Tripon
6f6ddc00c8
Merge pull request #2486 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-06-09 16:01:15 +03:00
Alexandru Ionut Tripon
0e996270b7
Merge pull request #2055 from Trial97/show_minecraft_version_modrinth
...
Display minecraft version if not mentioned for modrinth/curse packs
2024-06-09 15:59:24 +03:00
github-actions[bot]
24cf671370
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/6132b0f6e344ce2fe34fc051b72fb46e34f668e0?narHash=sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY%3D' (2024-05-30)
→ 'github:nixos/nixpkgs/d226935fd75012939397c83f6c385e4d6d832288?narHash=sha256-HV97wqUQv9wvptiHCb3Y0/YH0lJ60uZ8FYfEOIzYEqI%3D' (2024-06-07)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/0e8fcc54b842ad8428c9e705cb5994eaf05c26a0?narHash=sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA%3D' (2024-05-20)
→ 'github:cachix/pre-commit-hooks.nix/cc4d466cb1254af050ff7bdf47f6d404a7c646d1?narHash=sha256-7XfBuLULizXjXfBYy/VV%2BSpYMHreNRHk9nKMsm1bgb4%3D' (2024-06-06)
2024-06-09 00:22:00 +00:00
TheKodeToad
3ef5cd20f4
Merge pull request #2428 from Fourmisain/semeru
...
add detection for IBM Semeru Java runtime and fix x86 detection on 64 bit Windows
2024-06-07 20:17:20 +01:00
DioEgizio
052ee0d71c
chore: update Qt to 6.7.1
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2024-06-07 15:48:19 +02:00
ZekeZ
39b8451130
Merge pull request #2383 from Trial97/scroll_new_instance
...
Made Custom New Instance scrollable
2024-06-07 16:37:21 +10:00
Trial97
8ff53e47e8
Merge branch 'develop' of github.com:Trial97/PrismLauncher into feature/java-downloader
2024-06-07 00:22:54 +03:00
Alexandru Ionut Tripon
6e5c41fc8e
Merge pull request #2471 from Trial97/replace_auth_ping
...
replace auth server ping
2024-06-07 00:18:48 +03:00
Alexandru Ionut Tripon
e961cab352
Merge pull request #1409 from Trial97/import_zip
...
feat: refactored Instance ImportTask
2024-06-07 00:11:37 +03:00
Trial97
b096ee6a0c
fix file permisions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-06 14:12:55 +03:00
coolguy1842
aeb174fc55
DCO Remediation Commit for coolguy1842 <kian.goslett@protonmail.com>
...
I, coolguy1842 <kian.goslett@protonmail.com >, hereby add my Signed-off-by to this commit: 448ded2387
Signed-off-by: coolguy1842 <kian.goslett@protonmail.com >
2024-06-06 16:58:12 +10:00
coolguy1842
71b2c4b1fd
fix formatting
...
Signed-off-by: coolguy1842 <kian.goslett@protonmail.com >
2024-06-06 16:32:49 +10:00
coolguy1842
448ded2387
simple fix for resizing too small causing an index out of range crash
...
Signed-off-by: coolguy1842 <coolguy1842.deport391@passfwd.com >
2024-06-06 16:18:47 +10:00
Trial97
b7008d2880
replace auth server ping
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-06-06 00:09:08 +03:00
Trial97
45463dcd75
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
2024-06-04 11:04:02 +03:00
renovate[bot]
3263a706b4
chore(deps): update determinatesystems/update-flake-lock action to v22
2024-06-03 18:39:15 +00:00
Alexandru Ionut Tripon
080e64faaf
Merge pull request #2346 from SabrePenguin/list-image-append-fix
...
List image append
2024-06-02 18:53:17 +03:00
Sefa Eyeoglu
a6788a92cf
Merge pull request #2459 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-06-02 08:23:23 +02:00
github-actions[bot]
bbff31bcc0
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/8dc45382d5206bd292f9c2768b8058a8fd8311d9?narHash=sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78%3D' (2024-05-16)
→ 'github:hercules-ci/flake-parts/2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8?narHash=sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw%3D' (2024-06-01)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/47e03a624662ce399e55c45a5f6da698fc72c797?narHash=sha256-9dUxZf8MOqJH3vjbhrz7LH4qTcnRsPSBU1Q50T7q/X8%3D' (2024-05-25)
→ 'github:nixos/nixpkgs/6132b0f6e344ce2fe34fc051b72fb46e34f668e0?narHash=sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY%3D' (2024-05-30)
2024-06-02 00:20:40 +00:00
TheKodeToad
a70aeeea2b
Merge branch 'develop' into list-image-append-fix
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-06-01 15:20:21 +01:00
Trial97
83883cadf9
fix qt5 build
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-31 19:30:10 +03:00
Trial97
f350918186
force initial size for the Add Instance dialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-31 19:03:40 +03:00
Trial97
c9c39b8203
fix double borders
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-31 17:47:39 +03:00
Trial97
f7120a4f6f
Made Custom New Instance scrollable
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-31 16:46:46 +03:00
Trial97
f4f0a61bf2
fix vanilla technic modpacks
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-31 16:15:12 +03:00
Trial97
817ff1ecbd
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into change_version
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-31 10:20:48 +03:00
Alexandru Ionut Tripon
2145f9f0ac
Merge pull request #1847 from Trial97/move_export2
...
Improvements to modlist export
2024-05-31 09:58:32 +03:00
timoreo
7ab8f8ef54
Merge pull request #2423 from Trial97/fix_time3
...
fix incorrect launch time
2024-05-31 08:17:07 +02:00
timoreo
da76b72800
Merge pull request #2438 from KernelFreeze/develop
...
Added support for bcachefs
2024-05-31 08:12:28 +02:00
Trial97
2635d7c3be
replaced grid with vertical layout on all add modpack pages
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-31 09:07:51 +03:00
Trial97
d1286bbe90
add some comments
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-30 21:54:32 +03:00
Trial97
eaccdca02d
added error message for import skin from user
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-30 16:21:08 +03:00
Trial97
75fbdc2df5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
2024-05-30 14:25:51 +03:00
Trial97
44a16c1ca1
fix CI
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-30 14:20:35 +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
8704cd8402
remove duplicate proggress bar
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-30 11:49:09 +03:00
Trial97
e94243f99b
fix blocked mods api
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-30 09:56:55 +03:00
Trial97
a289e0c849
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog
2024-05-30 09:35:47 +03:00
Trial97
7fed5e9173
Capitalize the mod categories
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-30 08:51:36 +03:00
Trial97
5e36def18b
remove search button
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-30 00:36:02 +03:00
Trial97
469f051e30
remove search button
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-30 00:14:37 +03:00
Alexandru Ionut Tripon
6d60a6f4e3
Merge pull request #3 from TayouVR/filters
...
fix & clean ResourcePage.ui
2024-05-29 23:58:06 +03:00
Tayou
b8fe93efa3
fix & clean ResourcePage.ui
...
Qt is cursed.
Signed-off-by: Tayou <git@tayou.org >
2024-05-29 20:00:36 +02:00
Trial97
29444cfe0f
fix win combobox take#2
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-29 17:19:15 +03:00
Trial97
660772d4d7
swap buttons
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-29 01:06:11 +03:00
Trial97
b256d325f7
fix win combobox
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-29 01:03:17 +03:00
Alexandru Ionut Tripon
f332503088
Apply suggestions from code review
...
Co-authored-by: Tayou <git@tayou.org >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-05-29 00:32:17 +03:00
Sefa Eyeoglu
f34c263964
Merge pull request #2441 from PrismLauncher/renovate/korthout-backport-action-3.x
2024-05-28 18:30:14 +02:00
renovate[bot]
4917287292
chore(deps): update korthout/backport-action action to v3
2024-05-28 14:35:10 +00:00
Trial97
5012178a98
trigger search on filter change
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-28 14:48:03 +03:00
Trial97
3f7847ad34
made ResourcePage elements resizable
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-28 14:47:44 +03:00
Trial97
4b52c72629
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
2024-05-27 22:35:38 +03:00
Trial97
59a8b91274
add spacing to retry modal
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-26 16:28:07 +03:00
Trial97
694ea65457
disable retry dialog for logo fetching
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-26 11:13:01 +03:00
Trial97
7a200a337f
update retry netjob dialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-26 11:04:41 +03:00
Sefa Eyeoglu
764463ada7
Merge pull request #2436 from PrismLauncher/update_flake_lock_action
2024-05-26 09:29:18 +02:00
Celeste Peláez
f5f32e2c6e
Reformatted FileSystem.h
...
Signed-off-by: Celeste Peláez <KernelFreeze@users.noreply.github.com >
2024-05-26 01:40:31 -05:00
Celeste Peláez
a2b5ac73ff
Added support for bcachefs
...
Signed-off-by: Celeste Peláez <KernelFreeze@users.noreply.github.com >
2024-05-26 01:33:22 -05:00
github-actions[bot]
a8712f7126
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/02923630b89aa1ab36ef8e422501a6f4fd4b2016?narHash=sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA%3D' (2024-05-18)
→ 'github:nixos/nixpkgs/47e03a624662ce399e55c45a5f6da698fc72c797?narHash=sha256-9dUxZf8MOqJH3vjbhrz7LH4qTcnRsPSBU1Q50T7q/X8%3D' (2024-05-25)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/fa606cccd7b0ccebe2880051208e4a0f61bfc8c1?narHash=sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0%3D' (2024-05-16)
→ 'github:cachix/pre-commit-hooks.nix/0e8fcc54b842ad8428c9e705cb5994eaf05c26a0?narHash=sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA%3D' (2024-05-20)
2024-05-26 00:20:28 +00:00
Trial97
eacd7758e9
fix pre-commit hook
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-22 22:49:28 +03:00
Trial97
2b949a8059
improve login account checking
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-22 10:53:24 +03:00
Richard-Rogalski
399071c717
Fix Java auto-detect so it finds Gentoo installed JDKs
...
Signed-off-by: Richard-Rogalski <rrogalski@tutanota.com >
2024-05-21 11:41:47 -05:00
Fourmisain
23095b70a4
please the pre-commit check
...
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com >
2024-05-21 13:44:00 +02:00
Fourmisain
dbe4adc034
detect IBM Semeru Certified Edition on linux
...
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com >
2024-05-21 10:51:37 +02:00
Trial97
f6a7fc215a
update java sorting by taking into consideration release time
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-21 08:33:26 +03:00
Fourmisain
af157c1613
fix x86 detection on 64 bit windows
...
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com >
2024-05-20 23:13:44 +02:00
Fourmisain
08918be11e
add detection for IBM Semeru Java runtime
...
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com >
2024-05-20 21:44:35 +02:00
Trial97
7a42fb284a
reverse java version
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-20 18:33:40 +03:00
Trial97
0e239dfb2a
fix crash on first display with java downloader off
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-20 18:24:19 +03:00
Trial97
abb628edb3
remove OverrideJava
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-20 18:23:43 +03:00
Sefa Eyeoglu
0ecdceccd2
Merge pull request #2426 from Luk-ESC/develop
2024-05-20 17:18:25 +02:00
Lukas Eschbacher
201c4d2cc6
nix: replace mesa-demos with glxinfo
...
Signed-off-by: Lukas Eschbacher <eschbacher.lukas@gmail.com >
2024-05-20 14:39:24 +02:00
Alexandru Ionut Tripon
529dc7c6b7
Merge pull request #2412 from DioEgizio/update-upstreamflatpak
...
fix: update bundled flatpak to switch it to Qt 6
2024-05-19 22:54:35 +03:00
Trial97
428889a68d
removed + from bad chars in filenames
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-19 19:38:06 +03:00
Trial97
1b0e8260ac
fix zero launch time
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-19 15:36:39 +03:00
Sefa Eyeoglu
be66a91295
Merge pull request #2418 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-05-19 10:36:16 +02:00
Trial97
425a6e0919
Fix code format
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-19 10:09:34 +03:00
Trial97
d9e2badf71
Rename timeout option
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-19 08:54:19 +03:00
github-actions[bot]
d21597cf89
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e?narHash=sha256-yzcRNDoyVP7%2BSCNX0wmuDju1NUCt8Dz9%2BlyUXEI0dbI%3D' (2024-05-02)
→ 'github:hercules-ci/flake-parts/8dc45382d5206bd292f9c2768b8058a8fd8311d9?narHash=sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78%3D' (2024-05-16)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d?narHash=sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4%3D' (2024-05-11)
→ 'github:nixos/nixpkgs/02923630b89aa1ab36ef8e422501a6f4fd4b2016?narHash=sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA%3D' (2024-05-18)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/2849da033884f54822af194400f8dff435ada242?narHash=sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk%3D' (2024-04-30)
→ 'github:cachix/pre-commit-hooks.nix/fa606cccd7b0ccebe2880051208e4a0f61bfc8c1?narHash=sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0%3D' (2024-05-16)
• Removed input 'pre-commit-hooks/flake-utils'
• Removed input 'pre-commit-hooks/flake-utils/systems'
2024-05-19 00:20:26 +00:00
Trial97
76a656a017
retry auth step on fail
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-18 22:44:17 +03:00
Trial97
6078a771c1
add config for transfer timeout
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-18 21:46:05 +03:00
Alexandru Ionut Tripon
5cf7466e4c
Merge pull request #2404 from PrismLauncher/renovate/cachix-install-nix-action-27.x
...
Update cachix/install-nix-action action to v27
2024-05-18 19:49:58 +03:00
Alexandru Ionut Tripon
74c2f2599f
Merge pull request #1365 from Trial97/netjob_retry
...
Ask user to retry if netjob fails
2024-05-18 17:54:12 +03:00
Trial97
5a598db608
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
2024-05-18 17:40:54 +03:00
Trial97
5bd28e2cc8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
2024-05-18 17:11:41 +03:00
Trial97
e42dfbc391
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod
2024-05-18 17:02:10 +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
83fdfe8091
fix regression
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-18 16:52:29 +03:00
Trial97
4d21f71ccf
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refresh_cats
2024-05-18 16:34:21 +03:00
Trial97
31d0cad377
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into demo
2024-05-18 16:24:22 +03:00
Trial97
c9c67ef79e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into change_version
2024-05-18 15:27:02 +03:00
Trial97
d77d1f3be3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into coremods
2024-05-18 14:44:33 +03:00
Trial97
b23b53d98d
Add missing header
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-18 14:43:58 +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
DioEgizio
3ba84cb844
fix: update bundled flatpak
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2024-05-18 12:57:09 +02:00
Trial97
633489884d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-18 13:27:31 +03:00
Alexandru Ionut Tripon
3887cfe5df
Merge pull request #1525 from Trial97/waitprofiler
...
Add wait profiler
2024-05-18 13:17:24 +03:00
Alexandru Ionut Tripon
7b39ec5048
Merge pull request #2377 from dqfan2012/AddSdkmanToMacOs
...
Adding sdkman java location to MacOs
2024-05-18 13:15:57 +03:00
Trial97
ba947993c2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
2024-05-18 12:47:01 +03:00
Tayou
acd23ff163
Merge pull request #2402 from Trial97/refactor_auth
...
Improve Microsoft login
2024-05-18 11:07:16 +02:00
Alexandru Ionut Tripon
c8ff768d64
Merge pull request #1827 from Trial97/shader
...
fixed shader packs detection
2024-05-18 12:02:13 +03:00
Trial97
b6d87fc090
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into instance_copy_progress
2024-05-18 11:57:41 +03:00
Trial97
6aaf3a3ed4
Merge branch 'skin_selector' of github.com:Trial97/PrismLauncher into skin_selector
2024-05-18 11:57:06 +03:00
Trial97
2ac6efaa4a
Fix reggresion
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-18 11:56:43 +03:00
Trial97
23134d4b72
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
2024-05-18 11:38:18 +03:00
Trial97
318819afc6
Made recommended button default
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-18 11:36:46 +03:00
Alexandru Ionut Tripon
eb0d0450e3
Merge pull request #2382 from Trial97/neoforge_technic
...
Add neoforge support for technic packs and atlauncher packs
2024-05-18 10:40:45 +03:00
Alexandru Ionut Tripon
0f2736306e
Update launcher/ui/dialogs/skins/SkinManageDialog.ui
...
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-05-18 10:36:15 +03:00
Trial97
639c6e7f80
Add cancel to Add account dialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-17 00:49:00 +03:00
Trial97
78804b26ee
Maybe fix nix
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-17 00:34:39 +03:00
Trial97
75a457ebfa
Add custom page to land after microsoft login
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-17 00:31:04 +03:00
Trial97
ce09f06bda
Fix CI3
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-16 22:16:42 +03:00
Trial97
09c0c11033
Add back device code flow
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-16 21:58:25 +03:00
Alexandru Ionut Tripon
ab5f628453
Update launcher/updater/prismupdater/PrismUpdater.cpp
...
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-05-16 19:45:43 +03:00
Alexandru Ionut Tripon
051e788683
Update launcher/updater/prismupdater/PrismUpdater.cpp
...
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-05-16 19:45:00 +03:00
Trial97
2a58fb0ac5
Remove cobrandid
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-16 17:31:25 +03:00
Trial97
c15f6fcd2a
Fix portable if manifest is missing
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-16 17:21:30 +03:00
Alexandru Ionut Tripon
898ee67a07
Update launcher/ui/dialogs/MSALoginDialog.cpp
...
Co-authored-by: Tayou <git@tayou.org >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-05-16 00:41:07 +03:00
renovate[bot]
1d384544d3
chore(deps): update cachix/install-nix-action action to v27
2024-05-15 19:40:15 +00:00
Trial97
8b051b97fd
Fix CI2
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-15 17:54:35 +03:00
Trial97
abedc6a23c
Improve login UI
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-15 17:25:15 +03:00
Trial97
849c3faeb4
Fix CI
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-15 14:07:03 +03:00
Trial97
80d8e3ee06
Remove katabasis
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-15 12:53:06 +03:00
Trial97
c2ed50627d
Added back qt version check
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-14 00:36:35 +03:00
Trial97
e285a85fe8
Removed AccountTask
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-14 00:21:51 +03:00
Trial97
3336f8107c
Removed AuthRequest and NetAction
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-14 00:21:45 +03:00
Sefa Eyeoglu
93da066aa2
Merge pull request #2398 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-05-12 09:24:48 +02:00
github-actions[bot]
d74926e60d
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/5fd8536a9a5932d4ae8de52b7dc08d92041237fc' (2024-05-03)
→ 'github:nixos/nixpkgs/e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d' (2024-05-11)
2024-05-12 00:20:20 +00:00
Trial97
d795ba25e7
Delete instaces tmp diectory on startup
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-10 20:55:26 +03:00
Alexandru Ionut Tripon
f15981d786
Merge pull request #2358 from DioEgizio/nosystem-portablewithqt
...
Remove prebuilt system tarballs on Linux, bundle Qt with Linux portable
2024-05-09 08:22:43 +03:00
Alexandru Ionut Tripon
c703babda9
Merge pull request #2379 from kthchew/fix/blocked-desc
...
Improve blocked mods dialog (permissions prompt, misc. fixes) on macOS
2024-05-09 08:17:03 +03:00
Alexandru Ionut Tripon
72e9d7b148
Merge pull request #2366 from Trial97/modrint_import2
...
Fix download packs with invalid characters
2024-05-09 08:16:16 +03:00
Alexandru Ionut Tripon
7bcb1777a1
Merge pull request #2341 from Trial97/image_size
...
Fix image width in project description
2024-05-09 08:15:35 +03:00
Alexandru Ionut Tripon
a4142573ac
Merge pull request #2311 from SolidStateDj/gen->ui
...
Rename object name "userInterfaceTab" from "generalTab"
2024-05-09 08:15:15 +03:00
Trial97
a95c1768a7
Add neoforge support for technic packs and atlauncher packs
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-05-08 14:16:12 +03:00
Kenneth Chew
e7c95c9ccb
Fix bug where watched directories are not clickable on macOS
...
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com >
2024-05-07 18:57:04 -04:00
Kenneth Chew
4787141698
Improved blocked mods dialog permissions prompt
...
Targeted to macOS (where `~/Downloads` is considered a sensitive location that the system protects behind a prompt even from non-sandboxed apps)
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com >
2024-05-07 18:30:06 -04:00
Samuel Stidham
adf0cfdebf
Fixed the code.
...
Signed-off-by: Samuel Stidham <dqfan2012@gmail.com >
2024-05-05 20:01:29 -04:00
Samuel Stidham
8e0af16de9
Add extra java locations for MacOs.
...
Signed-off-by: Samuel Stidham <dqfan2012@gmail.com >
2024-05-05 19:53:18 -04:00
Sefa Eyeoglu
5ce8cd6b84
Merge pull request #2375 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-05-05 08:09:00 +02:00
github-actions[bot]
5d36ed9cf9
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d' (2024-04-01)
→ 'github:hercules-ci/flake-parts/e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e' (2024-05-02)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/d6f6eb2a984f2ba9a366c31e4d36d65465683450' (2024-04-27)
→ 'github:nixos/nixpkgs/5fd8536a9a5932d4ae8de52b7dc08d92041237fc' (2024-05-03)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/6fb82e44254d6a0ece014ec423cb62d92435336f' (2024-04-24)
→ 'github:cachix/pre-commit-hooks.nix/2849da033884f54822af194400f8dff435ada242' (2024-04-30)
2024-05-05 00:19:38 +00:00
SabrePenguin
0c76e7ab20
Made Regex static and const, removed dist
...
Signed-off-by: SabrePenguin <lknofczynski@gmail.com >
2024-05-01 13:00:55 -04:00
SabrePenguin
ce873e4a0d
Regex correction
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com >
2024-05-01 12:49:34 -04:00
SabrePenguin
814f84efab
Fixed more clang formatting
...
Signed-off-by: SabrePenguin <lknofczynski@gmail.com >
2024-05-01 00:21:32 -04:00
SabrePenguin
51f4ede797
Fixing CI format issues
...
Signed-off-by: SabrePenguin <lknofczynski@gmail.com >
2024-05-01 00:11:53 -04:00
SabrePenguin
b9c010ffb2
Added patch to all setHtml calls
...
Signed-off-by: SabrePenguin <lknofczynski@gmail.com >
2024-04-30 23:43:36 -04:00
SabrePenguin
e3d64608b9
Switched </ul> to a Regex expression
...
Signed-off-by: SabrePenguin <lknofczynski@gmail.com >
2024-04-30 23:28:50 -04:00
SabrePenguin
cec27fd014
Moved html patch to StringUtils
...
Signed-off-by: SabrePenguin <lknofczynski@gmail.com >
2024-04-30 23:14:26 -04:00
Trial97
30ce8ecb5f
Fixed imports
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-30 23:20:24 +03:00
Trial97
5400c24c73
Ensure valid file names for resource names
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-30 23:04:50 +03:00
Trial97
e068120375
Fix invalid characters filename download on windows
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-30 22:56:40 +03:00
Trial97
48f3ca56ba
Fixed NetRequest not failing on sink init
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-30 22:38:01 +03:00
Sefa Eyeoglu
bfac12604e
Merge pull request #2348 from TheKodeToad/single-click-hint
2024-04-30 07:55:48 +02:00
Sefa Eyeoglu
4dddf62e5e
Merge pull request #2345 from Jan200101/PR/ssdfixmegamescope
2024-04-30 07:54:17 +02:00
Sefa Eyeoglu
603d196dac
Merge pull request #2292 from ColonelGerdauf/develop
2024-04-30 07:53:32 +02: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
Alexandru Ionut Tripon
9b70606d7e
Merge pull request #2353 from Trial97/fix_curseforge4
...
Fix CurseForge export caused by utf8 enabled
2024-04-29 19:30:01 +03:00
DioEgizio
cb9a83320c
chore: make Qt 5 Linux use official Qt builds
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2024-04-29 15:51:31 +02:00
DioEgizio
be8ac0b5bb
fix: make portable builds bundle Qt
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2024-04-29 15:08:10 +02:00
Trial97
a5b059ebad
Fixed curseforge export
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-29 00:27:15 +03:00
Sefa Eyeoglu
23a38b19f2
Merge pull request #2351 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-04-28 10:42:34 +02:00
github-actions[bot]
890fd0b09c
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/fd16bb6d3bcca96039b11aa52038fafeb6e4f4be' (2024-04-20)
→ 'github:nixos/nixpkgs/d6f6eb2a984f2ba9a366c31e4d36d65465683450' (2024-04-27)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/40e6053ecb65fcbf12863338a6dcefb3f55f1bf8' (2024-04-12)
→ 'github:cachix/pre-commit-hooks.nix/6fb82e44254d6a0ece014ec423cb62d92435336f' (2024-04-24)
2024-04-28 00:20:12 +00:00
Alexandru Ionut Tripon
c14e6a67a8
Merge pull request #2349 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x
...
chore(deps): update hendrikmuhs/ccache-action action to v1.2.13
2024-04-27 13:11:07 +03:00
DioEgizio
ccf0b01de7
chore!: make install_bundle work on linux, removed prebuilt tarballs
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2024-04-27 11:06:08 +02:00
renovate[bot]
46b291d02e
chore(deps): update hendrikmuhs/ccache-action action to v1.2.13
2024-04-27 07:16:54 +00:00
SabrePenguin
5348a90a15
Fix img tag allowing img....
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com >
2024-04-26 18:21:17 -04:00
TheKodeToad
e3f55f6865
Use proxy style to force ActivateItemOnSingleClick off
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-04-26 22:08:45 +01:00
SabrePenguin
a988415028
Pleasing the format check
...
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com >
2024-04-26 16:59:51 -04:00
SabrePenguin
6ecd2c7f31
Update launcher/Markdown.cpp
...
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com >
2024-04-26 16:51:23 -04:00
Alexandru Ionut Tripon
3c9a207192
Update launcher/ui/widgets/VariableSizedImageObject.cpp
...
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-04-26 22:04:50 +03:00
TheKodeToad
60bd8104c4
Merge remote-tracking branch 'upstream/develop' into resource-meta
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-04-26 01:53:51 +01:00
TheKodeToad
9ce10231ed
Remove redundant event handler
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-04-26 01:44:43 +01:00
TheKodeToad
803e26a401
Make actions more consistent
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-04-26 01:40:18 +01:00
Trial97
e1ed317c13
Updated CheckComboBox to look more like QComboBox
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-26 00:16:48 +03:00
SabrePenguin
2cfe482298
Formatting and fixed img_pos allowed as negative
...
Signed-off-by: SabrePenguin <lknofczynski@gmail.com >
2024-04-25 16:38:14 -04:00
SabrePenguin
dedea2c05d
Added a naive implementation of a <br> inserter
...
Signed-off-by: SabrePenguin <lknofczynski@gmail.com >
2024-04-25 16:38:14 -04:00
Jan200101
a30c7193a2
remove server side decorations FIXME and document why its needed
...
Signed-off-by: Jan200101 <sentrycraft123@gmail.com >
2024-04-25 17:00:03 +02:00
Trial97
1961e2081f
Removed scroll from version checkbox
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-25 00:48:40 +03:00
Trial97
e07e182e95
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
2024-04-24 23:51:43 +03:00
Trial97
e33ddbadd2
Merge branch 'filters' of github.com:Trial97/PrismLauncher into filters
2024-04-24 23:51:33 +03:00
Alexandru Ionut Tripon
be15abda90
Merge pull request #2 from TheKodeToad/better-filters
...
Rework filter widget
2024-04-24 23:52:08 +03:00
Trial97
c902da4461
Fix image width in project description
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-24 22:02:55 +03:00
Sefa Eyeoglu
e777201187
Merge pull request #2337 from Trial97/java_path
2024-04-24 17:46:08 +02:00
Trial97
5ae98f4f90
Fixed windows bundled java path
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-24 15:49:05 +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
f6f0f3b08d
Merge pull request #2333 from Trial97/fix_bundled_java_mac
...
Fix Minecraft Launcher runtime detection on Windows and macOS
2024-04-23 17:19:37 +01:00
Trial97
10d1720da5
Removed duplicate local
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-23 19:08:14 +03:00
Trial97
73c3794c1b
Changed env variable
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-23 19:03:19 +03:00
Trial97
dac7027846
Fixed windows appdata path
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-23 18:59:31 +03:00
Trial97
dbfd535b38
Fix bundled java detection on mac
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-23 08:52:17 +03:00
Tayou
5eeb3b7768
Merge pull request #2328 from Trial97/appimage
...
Removed java from appimage
2024-04-22 22:51:57 +02:00
Tayou
8e8877cf8c
Merge pull request #2327 from wagyourtail/patch-1
...
Add Gradle Toolchains to java scan list
2024-04-21 19:45:02 +02:00
Trial97
1c8d333bfd
Fixed build
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-21 15:07:10 +03:00
Trial97
a96f957b02
Removed java from appimage
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-21 14:48:27 +03:00
William Gray
9f4654ede9
Update JavaUtils.cpp
...
Signed-off-by: William Gray <ruwagray@gmail.com >
2024-04-21 03:35:27 -05:00
Sefa Eyeoglu
de5de6f88f
Merge pull request #2325 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-04-21 09:49:14 +02:00
github-actions[bot]
210841606c
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9' (2024-04-12)
→ 'github:nixos/nixpkgs/fd16bb6d3bcca96039b11aa52038fafeb6e4f4be' (2024-04-20)
2024-04-21 00:19:37 +00:00
Trial97
89230c4f8a
Moved the export modlist out of the sub-menu
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-20 18:01:25 +03:00
Trial97
d88fb266a5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2
2024-04-20 17:42:58 +03:00
Sefa Eyeoglu
d185f6b856
Merge pull request #2319 from TheKodeToad/neoforge-mods-toml
...
Support mod info for NeoForge 20.5
2024-04-20 09:49:47 +02:00
TheKodeToad
252406ba3e
Support neoforge.mods.toml
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-04-19 21:19:36 +01:00
Alexandru Ionut Tripon
a8a234b666
Merge pull request #2294 from Trial97/import_crash
...
Fixed application close on open file dialog
2024-04-19 00:12:47 +03:00
Alexandru Ionut Tripon
0cae155380
Merge pull request #2304 from Trial97/modrint_import
...
Fixed modrinth pack update
2024-04-18 23:42:07 +03:00
DylanJOrr
77aead6470
Rename object name "userInterfaceTab" from "generalTab"
...
The "User Interface" tab was innacurately named "General" which I just
went in and fixed.
This also renamed the object for respective vertical spacers.
Signed-off-by: SolidStateDj <solidstatedj@proton.me >
2024-04-16 16:01:34 -04:00
seth
ef230b7ae4
Merge pull request #2305 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-04-15 18:24:42 +00:00
github-actions[bot]
cb8936ed68
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/9e7f26f82acb057498335362905fde6fea4ca50a' (2024-04-06)
→ 'github:nixos/nixpkgs/a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9' (2024-04-12)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/e35aed5fda3cc79f88ed7f1795021e559582093a' (2024-04-02)
→ 'github:cachix/pre-commit-hooks.nix/40e6053ecb65fcbf12863338a6dcefb3f55f1bf8' (2024-04-12)
2024-04-14 00:21:24 +00:00
Trial97
8121a6536b
Fixed pack update
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-12 23:45:31 +03:00
Trial97
9f48694eb2
Fixed application close on open file dialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-09 08:28:09 +03:00
Alexandru Ionut Tripon
1a994e8aed
Merge pull request #2291 from Trial97/import_crash
...
Fixed crash on invalid curseforge link on import
2024-04-09 00:19:55 +03:00
ColonelGerdauf
a877f9146d
Change of parameters
...
To help deal with adjustments
Signed-off-by: ColonelGerdauf <ColonelGerdauf@users.noreply.github.com >
2024-04-07 16:53:53 -04:00
ColonelGerdauf
f91f97e56d
Renaming and removing redundancies
...
old's do not make sense here
Signed-off-by: ColonelGerdauf <ColonelGerdauf@users.noreply.github.com >
2024-04-07 16:49:39 -04:00
Trial97
9cc58fe62c
Fixed crash on invalid curseforge link on import
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-07 21:25:08 +03:00
Trial97
1c3c9d2457
Added the new ftb settings path
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-07 13:48:34 +03:00
Sefa Eyeoglu
70f7e0878e
Merge pull request #2287 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-04-07 10:49:43 +02:00
github-actions[bot]
74fcfbae32
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2' (2024-03-01)
→ 'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d' (2024-04-01)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/807c549feabce7eddbf259dbdcec9e0600a0660d' (2024-03-29)
→ 'github:nixos/nixpkgs/9e7f26f82acb057498335362905fde6fea4ca50a' (2024-04-06)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/c11e43aed6f17336c25cd120eac886b96c455731' (2024-03-30)
→ 'github:cachix/pre-commit-hooks.nix/e35aed5fda3cc79f88ed7f1795021e559582093a' (2024-04-02)
2024-04-07 00:20:19 +00:00
timoreo
5bc415d512
Merge pull request #2225 from TheKodeToad/zip-utf8
2024-04-06 14:43:35 +02:00
Alexandru Ionut Tripon
a88cc2133c
Merge pull request #2277 from TheKodeToad/invalid-zip-files
...
Fix unicode characters being invalid in filenames
2024-04-06 15:41:51 +03:00
timoreo
9323dcb9dc
Merge pull request #2247 from Trial97/names
2024-04-06 14:35:06 +02:00
TheKodeToad
9986fe4c45
Fix unicode characters being invalid in filenames
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-04-06 13:33:13 +01:00
timoreo
363273a17b
Merge pull request #2275 from TheKodeToad/invalid-zip-files
2024-04-06 14:18:13 +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
Alexandru Ionut Tripon
44ea8cd885
Merge pull request #2268 from Scrumplex/fix/nix/jdk21
...
[Linux] Add jdk21 to Nix packages
2024-04-04 20:38:35 +03:00
TheKodeToad
df209c7b44
Merge pull request #2272 from DioEgizio/flatpakupdate
...
fix: update flatpak manifest for java 21
2024-04-04 17:38:07 +01:00
DioEgizio
e704fbbcec
fix: update flatpak manifest for java 21
...
backport of https://github.com/flathub/org.prismlauncher.PrismLauncher/pull/54 for our CI builds
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2024-04-04 17:53:30 +02:00
Trial97
3ddcadcdd1
Moved getPathNameInLocal8bit inside FileSystem namespace
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-04 18:01:24 +03:00
Trial97
8ecab305ac
Moved the creation of natives folder in ExtractNatives task
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-04 13:49:27 +03:00
Sefa Eyeoglu
0d372d2fbf
fix(nix): add jdk21
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2024-04-03 21:04:26 +02:00
Trial97
450b73328e
Fixed crash on non-latin instance name
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-03 19:34:35 +03:00
Sefa Eyeoglu
90097f1309
Merge pull request #2263 from DioEgizio/update-qt670
2024-04-02 21:49:35 +02:00
DioEgizio
5f11b2e77f
chore: update to Qt 6.7.0
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2024-04-02 19:10:40 +02:00
TheKodeToad
186a6d0c52
Make filters vertical
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-04-01 17:00:10 +01:00
TheKodeToad
71904b52c1
Make option groups plural
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-04-01 15:31:18 +01:00
TheKodeToad
71998cb7d9
Rework filter widget
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-04-01 15:22:27 +01:00
Trial97
a0eba1ace6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
2024-03-31 21:15:49 +03:00
Sefa Eyeoglu
a2d28f6872
Merge pull request #2257 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-03-31 11:23:57 +02:00
github-actions[bot]
f1351a143e
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/20bc93ca7b2158ebc99b8cef987a2173a81cde35' (2024-03-23)
→ 'github:nixos/nixpkgs/807c549feabce7eddbf259dbdcec9e0600a0660d' (2024-03-29)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/e611897ddfdde3ed3eaac4758635d7177ff78673' (2024-03-20)
→ 'github:cachix/pre-commit-hooks.nix/c11e43aed6f17336c25cd120eac886b96c455731' (2024-03-30)
2024-03-31 00:20:10 +00:00
Alexandru Ionut Tripon
b7835036d4
Merge pull request #2255 from PrismLauncher/renovate/korthout-backport-action-2.x
...
chore(deps): update korthout/backport-action action to v2.5.0
2024-03-30 13:03:21 +02:00
renovate[bot]
e6a9badb73
chore(deps): update korthout/backport-action action to v2.5.0
2024-03-30 10:42:48 +00:00
Trial97
28cfd31269
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-03-29 10:30:42 +02:00
Trial97
1930689a27
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into dependency_removal
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-03-29 10:12:02 +02:00
Trial97
81874f22f7
Fixed tar extract
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-03-29 00:10:59 +02:00
Trial97
45028ddc61
Added java downloader to CI build
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-03-28 14:58:05 +02:00
Alexandru Ionut Tripon
2012b2c243
Merge pull request #1977 from Trial97/resource_clear
...
Force clear the resource selection
2024-03-28 14:49:03 +02:00
Alexandru Ionut Tripon
b3abc052b5
Merge pull request #1529 from Trial97/portabledatadir
...
Added UserData as another posible path for portable builds
2024-03-28 14:48:34 +02:00
Alexandru Ionut Tripon
6b967d3f76
Merge pull request #1822 from Trial97/new_cats
...
Add random and slideshow modes to Catpacks
2024-03-28 14:48:18 +02:00
timoreo
e4742fdb3d
Merge pull request #2221 from Trial97/fix_curseforge3
...
Set Forge version correctly when exporting to CurseForge
2024-03-28 09:41:11 +01:00
Tayou
0f178270be
Merge pull request #1786 from Trial97/deps_improve
...
Make dependency checking more lax
2024-03-27 20:42:26 +01:00
Alexandru Ionut Tripon
93f6315b16
Update CMakeLists.txt
...
Co-authored-by: seth <getchoo@tuta.io >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-03-27 19:34:04 +02:00
Tayou
0e5727315b
Merge pull request #2243 from Trial97/quick-play2
...
Allow joining servers to work on 1.20 take 2
2024-03-27 18:20:22 +01:00
Trial97
f6572c1244
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader
2024-03-27 18:55:34 +02:00
Alexandru Ionut Tripon
e212c019a0
Merge pull request #2209 from chouzz/add-totalPlayTime-ftb-import
...
Add totalTimePlayed for FTBApp import
2024-03-27 16:20:21 +02:00
Alexandru Ionut Tripon
ccf3a1582d
Merge pull request #2231 from DioEgizio/bzip2-fix
...
fix: include libbz2.so.1.0
2024-03-27 16:19:53 +02:00
Alexandru Ionut Tripon
5117b21262
Merge pull request #1769 from Trial97/error_codes
...
added more microsoft error codes
2024-03-27 16:19:31 +02:00
Sefa Eyeoglu
5d72ee1c4f
Merge pull request #1837 from Trial97/import_ok
2024-03-27 10:50:58 +01:00
Trial97
765bdf67c9
Changed the trait name
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-03-27 00:56:12 +02:00
Trial97
23bdccc91d
Merge branch 'develop' of github.com:Trial97/PrismLauncher into quick-play
2024-03-26 23:58:56 +02:00
Sefa Eyeoglu
df0280f52b
Merge pull request #2237 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-03-24 09:35:07 +01:00
github-actions[bot]
3a833b659a
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/9af9c1c87ed3e3ed271934cb896e0cdd33dae212' (2024-03-15)
→ 'github:nixos/nixpkgs/20bc93ca7b2158ebc99b8cef987a2173a81cde35' (2024-03-23)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/5df5a70ad7575f6601d91f0efec95dd9bc619431' (2024-02-15)
→ 'github:cachix/pre-commit-hooks.nix/e611897ddfdde3ed3eaac4758635d7177ff78673' (2024-03-20)
• Updated input 'pre-commit-hooks/flake-utils':
'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04)
→ 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11)
• Updated input 'pre-commit-hooks/gitignore':
'github:hercules-ci/gitignore.nix/43e1aa1308018f37118e34d3a9cb4f5e75dc11d5' (2023-12-29)
→ 'github:hercules-ci/gitignore.nix/637db329424fd7e46cf4185293b9cc8c88c95394' (2024-02-28)
2024-03-24 00:19:57 +00:00
Trial97
3c12e27226
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
2024-03-23 23:53:25 +02:00
Trial97
c0754b80a2
Add resize to last column
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-03-22 22:17:58 +02:00
Trial97
0b87e4c03b
Fiexed codeql warning
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-03-22 12:29:15 +02:00
Trial97
a7029a9e53
Fixed qMin
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-03-21 20:01:40 +02:00
Trial97
3046822272
Fixed buid
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-03-21 19:53:52 +02:00
Trial97
1a6dfd04d6
Made tar.gz parser
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-03-21 19:46:57 +02:00
DioEgizio
37d348e60e
fix: include libbz2.so.1.0
...
fixes portable installs not working on fedora anymore
i did this only on portable builds and not system installs so that it doesn't create problems to people packaging them, as to fix system installs i would have to put it in bin/
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2024-03-21 10:39:12 +01:00
txtsd
794a60b684
Merge pull request #2224 from PrismLauncher/renovate/actions-cache-4.x
...
chore(deps): update actions/cache action to v4.0.2
2024-03-21 05:51:22 +00:00
Trial97
ab7fc2e46c
Fixed archive java download
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-03-21 00:42:04 +02:00
Alexandru Ionut Tripon
93f19bda6e
Update launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp
...
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-03-21 00:07:06 +02:00
Trial97
1c809f0fb1
Added more logs for auto java install
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-03-20 17:39:10 +02:00
Trial97
703470e57d
Hopefully fix codeql
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-03-20 08:24:40 +02:00
Trial97
5f8269f5e1
Small class rename
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-03-20 00:29:46 +02:00
Trial97
09c2c6793b
Improve UI
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-03-20 00:15:02 +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
renovate[bot]
7ffebcad72
chore(deps): update actions/cache action to v4.0.2
2024-03-19 17:41:32 +00:00
Trial97
ef4e5eb3cf
fixed java build option
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-03-18 19:15:36 +02:00
Trial97
1322277ae6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
2024-03-17 20:57:53 +02:00
Trial97
05487152fe
Fixed curesforge export
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-03-17 20:53:26 +02:00
Sefa Eyeoglu
46616d1c5d
Merge pull request #2219 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-03-17 09:33:55 +01:00
github-actions[bot]
95c3daca59
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/0e7f98a5f30166cbed344569426850b21e4091d4' (2024-03-09)
→ 'github:nixos/nixpkgs/9af9c1c87ed3e3ed271934cb896e0cdd33dae212' (2024-03-15)
2024-03-17 00:19:13 +00:00
Sefa Eyeoglu
e288ee6ddd
Merge pull request #2217 from AtomHare/develop
2024-03-16 13:04:18 +01:00
AtomHare
853e4a13ab
fix: Compressing typo
...
Signed-off-by: AtomHare <29772841+AtomHare@users.noreply.github.com >
2024-03-16 12:44:55 +01:00
Sefa Eyeoglu
3b0564f098
Merge pull request #2183 from PrismLauncher/update_flake_lock_action
2024-03-10 02:45:42 +01:00
github-actions[bot]
75628bf81e
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/b253292d9c0a5ead9bc98c4e9a26c6312e27d69f' (2024-02-01)
→ 'github:hercules-ci/flake-parts/f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2' (2024-03-01)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/f63ce824cd2f036216eb5f637dfef31e1a03ee89' (2024-02-24)
→ 'github:nixos/nixpkgs/0e7f98a5f30166cbed344569426850b21e4091d4' (2024-03-09)
2024-03-10 00:19:11 +00:00
chouzz
92113e233a
Add totalTimePlayed for FTBApp import
...
Signed-off-by: chouzz <zhouhua852@gmail.com >
2024-03-09 19:36:40 +08:00
Sefa Eyeoglu
51443fce8b
Merge pull request #2206 from PrismLauncher/renovate/softprops-action-gh-release-2.x
2024-03-08 22:41:23 +01:00
renovate[bot]
03def913ad
chore(deps): update softprops/action-gh-release action to v2
2024-03-08 21:26:24 +00:00
Alexandru Ionut Tripon
634ab279b0
Merge pull request #2204 from PrismLauncher/renovate/cachix-install-nix-action-26.x
...
chore(deps): update cachix/install-nix-action action to v26
2024-03-08 10:08:00 +02:00
renovate[bot]
6591379a8a
chore(deps): update cachix/install-nix-action action to v26
2024-03-08 07:47:18 +00:00
Trial97
9120848278
Made java downloader as a build option
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-03-06 19:33:14 +02:00
Alexandru Ionut Tripon
a0311780c1
Merge pull request #1866 from Trial97/supported_files
...
Added all supported files filter
2024-03-06 17:21:56 +02:00
TheKodeToad
27780cc7ae
Add update UI for all resource types
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-03-06 14:56:04 +00:00
Alexandru Ionut Tripon
fd9a4eed9e
Merge pull request #2196 from DioEgizio/bump-9.0
...
chore: bump develop to 9.0
2024-03-04 17:45:22 +02:00
DioEgizio
d6abcb73c5
chore: bump develop to 9.0
...
until it's too late lol
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2024-03-04 16:32:45 +01:00
Tayou
1627f3c63b
Merge pull request #2178 from TheKodeToad/mrpack-fixes
...
(More) mrpack fixes
2024-03-03 16:30:40 +01:00
Sefa Eyeoglu
0dc2bf2681
Merge pull request #2160 from TheKodeToad/temp_folder
2024-03-03 15:06:52 +01:00
txtsd
ad8c3ca54b
Merge pull request #2177 from PrismLauncher/renovate/actions-cache-4.x
...
chore(deps): update actions/cache action to v4.0.1
2024-03-03 07:52:47 +00:00
TheKodeToad
4101fbb634
Allow multiline description
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-03-01 01:05:03 +00:00
TheKodeToad
138df66355
Fix server side mods being marked as unsupported on client
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-03-01 00:03:20 +00:00
renovate[bot]
e1146455a3
chore(deps): update actions/cache action to v4.0.1
2024-02-29 23:16:59 +00:00
Sefa Eyeoglu
850e48ec67
Merge pull request #2176 from PrismLauncher/renovate/determinatesystems-update-flake-lock-21.x
2024-02-29 19:06:29 +01:00
renovate[bot]
322a8899ed
chore(deps): update determinatesystems/update-flake-lock action to v21
2024-02-29 17:19:39 +00:00
Trial97
41d52dc347
Remove dependencies if review mods is rejected
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-29 00:06:28 +02:00
Trial97
27e76d0dcb
Removed static path
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-27 17:11:19 +02:00
Trial97
24fd07861b
format code
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-26 22:25:14 +02:00
Alexandru Ionut Tripon
da96172b0b
Apply suggestions from code review
...
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-02-26 22:00:40 +02:00
Trial97
344398f238
Updated ftb app import instance detection
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-26 21:20:14 +02:00
Alexandru Ionut Tripon
fba2ce3c9f
Merge pull request #2161 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-02-25 12:46:12 +02:00
github-actions[bot]
1b89c63ad4
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/6e2f00c83911461438301db0dba5281197fe4b3a' (2024-02-17)
→ 'github:nixos/nixpkgs/f63ce824cd2f036216eb5f637dfef31e1a03ee89' (2024-02-24)
2024-02-25 00:18:54 +00:00
TheKodeToad
c0eb80947d
Fix build on Windows and formatting
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-02-24 21:50:51 +00:00
TheKodeToad
fccf857d8e
Fix a mistake
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-02-24 19:16:39 +00:00
TheKodeToad
bd0cd82826
Add upper-bound for randomisation
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-02-24 18:41:45 +00:00
TheKodeToad
df60f5cc96
Add error when staging folder could not be created
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-02-24 18:41:35 +00:00
TheKodeToad
9574ebe480
Delete staging on abort
...
Previously instances would get "stuck" in the folder
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-02-24 18:41:35 +00:00
TheKodeToad
6a9f5540d3
Re-randomise key until it does not collide
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-02-24 13:38:19 +00:00
Trial97
aac6fea724
Updated application manifest
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-22 20:34:34 +02:00
Trial97
726b0ffb3b
Reduced temporary instance folder name
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-22 19:40:24 +02:00
Sefa Eyeoglu
1cdb9bd5af
Merge pull request #2141 from crpz1/welcome_label_consistency
2024-02-22 12:36:00 +01:00
seth
02340f19a5
Merge pull request #2152 from PrismLauncher/getchoo-patch-1
...
ci: fix permissions for backport workflow
2024-02-22 06:15:57 -05:00
seth
f747ae949c
ci: fix permissions for backport workflow
...
Signed-off-by: seth <getchoo@tuta.io >
2024-02-22 06:13:27 -05:00
Sefa Eyeoglu
bff8d7220d
Merge pull request #2150 from DioEgizio/fix-ghactions-macos
2024-02-22 11:02:09 +01:00
DioEgizio
4421746c0e
fix: fix sparkle signing
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2024-02-22 10:00:21 +01:00
DioEgizio
01c4e6a65c
Merge pull request #2137 from DioEgizio/zink
2024-02-21 17:42:11 +01:00
crpz1
9aa81cf005
Use empty list label code for welcome screen
...
Signed-off-by: crpz1 <8588315+crpz1@users.noreply.github.com >
2024-02-20 00:21:37 +11:00
Trial97
1c96ae5807
Fixed java refresh button
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-18 22:32:54 +02:00
Trial97
889f604a41
Removed JavaExtraSearchPaths
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-18 21:38:31 +02:00
Trial97
a288779790
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
2024-02-18 16:49:35 +02:00
Trial97
038d3e4596
Fixed asan complains
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-18 16:49:10 +02:00
DioEgizio
44327980db
feat: add "use zink" button
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2024-02-18 13:30: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
DioEgizio
99cbb5d0b2
Merge pull request #2110 from Trial97/fix_curseforge
2024-02-18 12:42:09 +01:00
DioEgizio
dbdd96edc3
Merge pull request #2130 from DioEgizio/updates
2024-02-18 12:41:49 +01:00
Trial97
4aafa98852
Improved the message boxes for java wizzard
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-18 12:58:34 +02:00
Trial97
2f489d1aec
Added auto java options to the java wizzard page
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-18 11:34:54 +02:00
Sefa Eyeoglu
976f5f10cf
Merge pull request #2132 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-02-18 09:38:24 +01:00
Trial97
4c76f7afe0
Made auto java checkbox dependent
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-18 09:46:44 +02:00
Trial97
a7dad96a70
Added refresh button on managed java list
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-18 09:32:31 +02:00
github-actions[bot]
54bfbe562e
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/442d407992384ed9c0e6d352de75b69079904e4e' (2024-02-09)
→ 'github:nixos/nixpkgs/6e2f00c83911461438301db0dba5281197fe4b3a' (2024-02-17)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/0db2e67ee49910adfa13010e7f012149660af7f0' (2024-02-07)
→ 'github:cachix/pre-commit-hooks.nix/5df5a70ad7575f6601d91f0efec95dd9bc619431' (2024-02-15)
2024-02-18 00:18:59 +00:00
Trial97
5232b3cd89
Added some logs and fixed natives extraction
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-17 12:17:00 +02:00
Trial97
ea2adf909d
Added progeess dialog to autodownload java
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-17 11:14:32 +02:00
seth
599a08d309
Merge pull request #2126 from TheComputerGuy96/mr/mangohud-fix
...
Use absolute path to load MangoHUD library
2024-02-16 19:57:12 -05:00
Trial97
2941307581
Added basic java auto-detect and auto-download
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-16 23:42:39 +02:00
DioEgizio
25b69b4c0d
fix: fix sparkle hash
...
:/ oops
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2024-02-16 17:29:49 +01:00
DioEgizio
94b48e9702
fix: remove cmark_static
...
cmark 0.31 removed CMARK_STATIC/CMARK_SHARED and replaced it with the native cmake BUILD_SHARED_LIBS
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2024-02-16 17:06:28 +01:00
DioEgizio
5d36067c74
chore: update libraries
...
updated qt to 6.6.2
updated some submodules
updated sparkle framework to the latest version
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2024-02-16 16:21:53 +01:00
Echo J
01180c20e1
Use absolute path to load MangoHUD library
...
This should finally fix the Arch Linux Java symbol issue with MangoHUD
enabled: https://bugs.archlinux.org/task/77183
Signed-off-by: Echo J <tcg96nougat@gmail.com >
2024-02-14 10:11:49 +02:00
Sefa Eyeoglu
e738b78044
Merge pull request #2112 from TheKodeToad/log-performance
2024-02-13 09:15:47 +01:00
Sefa Eyeoglu
b02eef9358
Merge pull request #2116 from TheKodeToad/use-after-free
2024-02-13 09:14:34 +01:00
TheKodeToad
8cf2a04f31
Fix formatting issues
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-02-12 15:24:56 +00:00
TheKodeToad
7f4c74ffbe
Fix immediate free in Exception.h
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-02-11 22:16:03 +00:00
Trial97
fdaaee64d1
Fixed curseforge neoforge export for 1.20.1
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-11 21:49:28 +02:00
TheKodeToad
ff989b4305
Fix ResourceModel error display
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-02-11 15:43:36 +00:00
TheKodeToad
ded77e6183
Fix NetJob use-after-free
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-02-11 15:43:36 +00:00
Sefa Eyeoglu
b0b77c2178
Merge pull request #2114 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-02-11 09:57:06 +01:00
github-actions[bot]
0f254c8425
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/79a13f1437e149dc7be2d1290c74d378dad60814' (2024-02-03)
→ 'github:nixos/nixpkgs/442d407992384ed9c0e6d352de75b69079904e4e' (2024-02-09)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf' (2024-01-28)
→ 'github:cachix/pre-commit-hooks.nix/0db2e67ee49910adfa13010e7f012149660af7f0' (2024-02-07)
2024-02-11 00:19:31 +00:00
Alexandru Ionut Tripon
29bf6cc68c
Update launcher/modplatform/flame/FlameInstanceCreationTask.cpp
...
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-02-10 23:15:26 +02:00
Trial97
830ce246e1
Fixed curseforge neoforge import for 1.20.1 versions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-10 13:48:02 +02:00
Trial97
f3600972a0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into instance_copy_progress
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-10 11:09:45 +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
5099061a5c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-10 11:02:29 +02:00
Trial97
c0fb053ccc
Added warning for x86 java
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-09 23:14:49 +02:00
Trial97
27d662e642
Added management for downloaded javas from prism
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-09 22:47:39 +02:00
Trial97
0a3303bcbd
Added button to add extra java path to the Java Wizzard
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-09 21:07:12 +02:00
Trial97
379f1a70e9
Leave headers alone
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-08 22:37:57 +02:00
Trial97
b3fc07d444
Added extra java search paths
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-08 21:47:59 +02:00
Trial97
3d29da916d
Made Java path configurable
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-08 20:15:19 +02:00
Trial97
ba990e075b
Added JavaPath function
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-08 19:45:46 +02:00
TheKodeToad
7cac8ad2b4
Use QTextFragment for inserting log lines
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-02-06 20:42:18 +00:00
Sefa Eyeoglu
6935c0dc3b
Merge pull request #2089 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-02-04 10:01:20 +01:00
github-actions[bot]
15670cc27b
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/07f6395285469419cf9d078f59b5b49993198c00' (2024-01-11)
→ 'github:hercules-ci/flake-parts/b253292d9c0a5ead9bc98c4e9a26c6312e27d69f' (2024-02-01)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/4fddc9be4eaf195d631333908f2a454b03628ee5' (2024-01-25)
→ 'github:nixos/nixpkgs/79a13f1437e149dc7be2d1290c74d378dad60814' (2024-02-03)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/f56597d53fd174f796b5a7d3ee0b494f9e2285cc' (2024-01-20)
→ 'github:cachix/pre-commit-hooks.nix/7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf' (2024-01-28)
2024-02-04 00:19:10 +00:00
Trial97
82b15268bc
preparing java autodownload
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-03 00:11:05 +02:00
Trial97
0384e652fb
Finished up the download dialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-02 22:42:42 +02:00
Trial97
3c58fb0677
Moving files around
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-02-02 15:51:32 +02:00
Tayou
5d223f6f93
Merge pull request #2050 from TheKodeToad/default-game-dir
...
Use `minecraft` instead of `.minecraft` for better accessibility
2024-02-01 18:16:14 +01:00
Trial97
6c5bb3817b
Cleaned some code
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-01-31 18:07:28 +02:00
Trial97
5afe75e821
Fixed some codeql warnings
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-01-30 12:37:34 +02:00
seth
b0a473a5ce
Merge pull request #2073 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-01-27 23:34:12 -05:00
github-actions[bot]
901cc4e4dd
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/e5d1c87f5813afde2dda384ac807c57a105721cc' (2024-01-19)
→ 'github:nixos/nixpkgs/4fddc9be4eaf195d631333908f2a454b03628ee5' (2024-01-25)
2024-01-28 00:19:08 +00:00
Trial97
7317105e4d
Code spaghetti and more chaos
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-01-27 22:47:28 +02:00
Trial97
b54410b48c
Added gameVersion for curseforge mod packs
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-01-26 19:10:39 +02:00
Trial97
ad98f600d5
corecly display core mods tab
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-01-26 18:36:31 +02:00
Alexandru Ionut Tripon
cff2f4b6ff
Merge pull request #2070 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x
...
chore(deps): update hendrikmuhs/ccache-action action to v1.2.12
2024-01-26 09:57:49 +02:00
renovate[bot]
ab4974629c
chore(deps): update hendrikmuhs/ccache-action action to v1.2.12
2024-01-26 07:12:13 +00:00
TheKodeToad
82d0f204e2
De-OOP ProviderCapabilities
...
There was no reason for it to be a class, and imo it created quite a code-smell needing to initialise it everywhere.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-01-26 03:06:05 +00:00
TheKodeToad
97ee0a19b5
Refactor updating mechanisms to work with all resources
...
Summary:
- It compiles
- I need to go to bed
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-01-26 02:53:57 +00:00
Trial97
4cd236ed80
missing header
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-01-26 00:31:43 +02:00
Trial97
81282bf7e0
Autodetect Java?
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-01-26 00:22:05 +02:00
Trial97
f36be3f0e3
Cleanup downloaders
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-01-25 22:58:12 +02:00
Trial97
e897032383
Added java metadata
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-01-25 22:22:21 +02:00
TheKodeToad
2c18d0f1a5
Store current version in packwiz metadata (temporarily using x-prismlauncher-version-number)
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-01-25 15:41:34 +00: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
Alexandru Ionut Tripon
1c3d63981b
Merge pull request #2063 from DioEgizio/no-alpha-mr
...
fix: remove alpha notice on modrinth packs
2024-01-24 18:13:15 +02:00
DioEgizio
8de1060bfb
fix: remove alpha notice on modrinth packs
...
with the modrinth app being released for quite a while now it's weird to still have this (tbh they've never been truly alpha)
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2024-01-24 16:43:38 +01:00
seth
1075a94034
Merge pull request #2040 from getchoo/nix/filesets
...
[Linux/MacOS] Replace nix-filter with lib.fileset
2024-01-24 03:05:30 -05:00
TheKodeToad
35b5c8097c
Merge branch 'develop' into resource-meta
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-01-23 23:20:40 +00:00
seth
8312713dc2
refactor(nix): nix-filter -> lib.fileset
...
with our own use of `map`, this is basically a drop-in replacement for
nix-filter, but already in nixpkgs!
Signed-off-by: seth <getchoo@tuta.io >
2024-01-23 16:10:41 -05:00
Sefa Eyeoglu
7bce88e83e
Merge pull request #2060 from PrismLauncher/renovate/korthout-backport-action-2.x
2024-01-23 20:45:36 +01:00
renovate[bot]
72e6218df9
chore(deps): update korthout/backport-action action to v2.4.1
2024-01-23 19:21:30 +00:00
Sefa Eyeoglu
e60235cb88
Merge pull request #2053 from Trial97/fix_open_path_take_two
2024-01-23 09:29:57 +01:00
Sefa Eyeoglu
913f6d8563
Merge pull request #2052 from PrismLauncher/renovate/korthout-backport-action-2.x
2024-01-22 22:32:38 +01:00
Trial97
6b637a8797
Display minecraft version if not mentioned for modrinth packs
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-01-22 22:32:42 +02:00
Trial97
9bbeb5ef3a
Made updater interval configurable
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-01-22 21:26:46 +02:00
Trial97
12bf913764
Fixed open path a second time
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-01-22 20:36:57 +02:00
renovate[bot]
0dc4a10f48
chore(deps): update korthout/backport-action action to v2.4.0
2024-01-22 17:26:37 +00:00
Trial97
f77749e448
Resized Refresh theme button
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-01-21 21:24:47 +02:00
Sefa Eyeoglu
78482d0d3e
Merge pull request #2049 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-01-21 08:28:49 +01:00
Alexandru Ionut Tripon
e4306d5cb6
Update launcher/ui/themes/CatPack.cpp
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2024-01-21 08:52:49 +02:00
TheKodeToad
f54ac25614
Use minecraft instead of .minecraft for better accessibility
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-01-21 02:28:55 +00:00
github-actions[bot]
c7cd8b7877
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nix-filter':
'github:numtide/nix-filter/c843418ecfd0344ecb85844b082ff5675e02c443' (2023-12-04)
→ 'github:numtide/nix-filter/3449dc925982ad46246cfc36469baf66e1b64f17' (2024-01-15)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/eabe8d3eface69f5bb16c18f8662a702f50c20d5' (2024-01-09)
→ 'github:nixos/nixpkgs/e5d1c87f5813afde2dda384ac807c57a105721cc' (2024-01-19)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/274ae3979a0eacae422e1bbcf63b8b7a335e1114' (2024-01-12)
→ 'github:cachix/pre-commit-hooks.nix/f56597d53fd174f796b5a7d3ee0b494f9e2285cc' (2024-01-20)
• Updated input 'pre-commit-hooks/flake-utils':
'github:numtide/flake-utils/a1720a10a6cfe8234c0e93907ffe81be440f4cef' (2023-05-31)
→ 'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04)
• Updated input 'pre-commit-hooks/gitignore':
'github:hercules-ci/gitignore.nix/a20de23b925fd8264fd7fad6454652e142fd7f73' (2022-08-14)
→ 'github:hercules-ci/gitignore.nix/43e1aa1308018f37118e34d3a9cb4f5e75dc11d5' (2023-12-29)
2024-01-21 00:20:26 +00: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
0303b1cc7f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refresh_cats
2024-01-20 00:27:30 +02:00
Alexandru Ionut Tripon
4cda04271f
Merge pull request #1913 from Trial97/dialog
...
Fixed askIfShouldUpdate dialog on mac
2024-01-18 22:02:04 +02:00
Sefa Eyeoglu
bc75bcdcca
Merge pull request #1768 from Trial97/toggle_deps2
2024-01-18 18:18:31 +01:00
Sefa Eyeoglu
a62eaba702
Merge pull request #1825 from Trial97/ftb_import
2024-01-18 18:18:17 +01:00
Sefa Eyeoglu
2c0274159f
Merge pull request #2034 from Scrumplex/feat/macos-signing
2024-01-18 16:56:39 +01:00
Sefa Eyeoglu
b2c2bf1460
Merge pull request #2039 from PrismLauncher/renovate/actions-cache-4.x
...
chore(deps): update actions/cache action to v4
2024-01-17 23:48:16 +01:00
renovate[bot]
bfd1262c14
chore(deps): update actions/cache action to v4
2024-01-17 20:29:50 +00:00
Sefa Eyeoglu
0b3e91ac62
Merge pull request #1954 from Scrumplex/fix/open-paths-immediately
2024-01-17 15:18:46 +01:00
Sefa Eyeoglu
de9232783e
chore: remove cachix auth token secret
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2024-01-17 13:12:38 +01:00
Sefa Eyeoglu
27c52eff8b
feat: add macOS notarization
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2024-01-17 13:12:36 +01:00
Sefa Eyeoglu
baebef982e
feat: add macOS code signing
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2024-01-17 13:10:14 +01:00
Sefa Eyeoglu
67d088dc53
fix: simplify openPath calls
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2024-01-14 11:36:17 +01:00
Sefa Eyeoglu
5a0240e709
Merge pull request #2030 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-01-14 09:50:59 +01:00
github-actions[bot]
96c714de6e
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/88a2cd8166694ba0b6cb374700799cec53aef527' (2024-01-01)
→ 'github:hercules-ci/flake-parts/07f6395285469419cf9d078f59b5b49993198c00' (2024-01-11)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/63143ac2c9186be6d9da6035fa22620018c85932' (2024-01-02)
→ 'github:nixos/nixpkgs/eabe8d3eface69f5bb16c18f8662a702f50c20d5' (2024-01-09)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/9d3d7e18c6bc4473d7520200d4ddab12f8402d38' (2023-12-30)
→ 'github:cachix/pre-commit-hooks.nix/274ae3979a0eacae422e1bbcf63b8b7a335e1114' (2024-01-12)
2024-01-14 00:20:26 +00:00
Sefa Eyeoglu
f931890e95
Merge pull request #2029 from PrismLauncher/renovate/cachix-install-nix-action-25.x
2024-01-12 19:14:02 +01:00
renovate[bot]
9c610b616a
chore(deps): update cachix/install-nix-action action to v25
2024-01-12 18:02:43 +00:00
Sefa Eyeoglu
c38f584fe9
Merge pull request #2026 from PrismLauncher/renovate/actions-cache-3.x
...
chore(deps): update actions/cache action to v3.3.3
2024-01-11 23:22:42 +01:00
renovate[bot]
b0f65476d9
chore(deps): update actions/cache action to v3.3.3
2024-01-11 18:59:17 +00:00
Sefa Eyeoglu
7549bf7da6
Merge pull request #2024 from getchoo/flake-fixups
2024-01-11 09:43:58 +01:00
seth
839adfc90b
nix: add garnix cache to nixConfig
...
Signed-off-by: seth <getchoo@tuta.io >
2024-01-11 03:20:20 -05:00
seth
26474d1374
nix: deduplicate nixpkgs input
...
Signed-off-by: seth <getchoo@tuta.io >
2024-01-11 03:06:37 -05:00
Alexandru Ionut Tripon
dbdec15ddb
Merge pull request #1771 from Trial97/account
...
Try refreshing account on launch if needed
2024-01-10 16:07:09 +02: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
a0ebd0714d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refresh_cats
2024-01-10 09:09:19 +02:00
Trial97
57913f1943
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into demo
2024-01-07 22:31:25 +02:00
Trial97
d94e641900
Load versions on first edit
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-01-07 22:00:31 +02:00
Sefa Eyeoglu
43dd929214
Merge pull request #2016 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-01-07 09:43:56 +01:00
github-actions[bot]
2cb07d3e38
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5' (2023-12-01)
→ 'github:hercules-ci/flake-parts/88a2cd8166694ba0b6cb374700799cec53aef527' (2024-01-01)
• Updated input 'flake-parts/nixpkgs-lib':
'github:NixOS/nixpkgs/e92039b55bcd58469325ded85d4f58dd5a4eaf58?dir=lib' (2023-11-29)
→ 'github:NixOS/nixpkgs/b0d36bd0a420ecee3bc916c91886caca87c894e9?dir=lib' (2023-12-30)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870' (2023-12-25)
→ 'github:nixos/nixpkgs/63143ac2c9186be6d9da6035fa22620018c85932' (2024-01-02)
2024-01-07 00:20:13 +00:00
Tayou
35ad4448d9
Merge pull request #2012 from Trial97/openal_settings
...
Fixed openAL placeholder
2024-01-07 00:21:21 +01:00
TheKodeToad
f285c3fe13
Merge pull request #1972 from lumiscosity/feature/cat_opacity
...
Add a cat opacity option
2024-01-06 19:42:17 +00:00
Trial97
219e2862f9
Fixed openAL placeholder
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-01-05 23:02:42 +02:00
TheKodeToad
d56d21f928
Merge pull request #1983 from tildejustin/develop
...
remove legacy processArguments code
2024-01-05 12:26:58 +00:00
seth
7783ef9285
Merge pull request #2005 from Trial97/develop
...
Format java code
2024-01-04 15:18:40 -05:00
Alexandru Ionut Tripon
b76c413936
Merge pull request #1 from theMackabu/refresh_cats
...
add: refresh on load
2024-01-03 22:56:43 +02:00
Trial97
048d34dc9d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refresh_cats
2024-01-03 22:53:36 +02:00
Trial97
786e03571b
Format java code
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-01-03 22:50:55 +02:00
Alexandru Ionut Tripon
57a589367f
Merge pull request #1979 from lumiscosity/feature/mod_page_improvements
...
Mod downloader page improvements
2024-01-03 22:43:18 +02:00
Sefa Eyeoglu
9523a2d77b
Merge pull request #1999 from TheKodeToad/more-legacy-fixes
2024-01-03 18:16:41 +01:00
Sefa Eyeoglu
e5b608447a
chore: improve param name
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2024-01-03 18:15:03 +01:00
Sefa Eyeoglu
f454333cc5
Merge pull request #1998 from TheKodeToad/happy-new-year
2024-01-03 18:13:14 +01:00
TheKodeToad
345cdf5c9d
Pass proxy
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-01-02 19:10:41 +00:00
TheKodeToad
05e4533096
Add online mode fix for legacy versions; minor refactors in legacy
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-01-02 18:11:54 +00:00
TheKodeToad
1130fe8510
Happy new year :D
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-01-02 18:04:42 +00:00
Alexandru Ionut Tripon
0cf9b6537b
Merge pull request #1996 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x
...
chore(deps): update hendrikmuhs/ccache-action action to v1.2.11
2024-01-02 13:28:27 +02:00
renovate[bot]
73f956c897
chore(deps): update hendrikmuhs/ccache-action action to v1.2.11
2024-01-02 07:30:12 +00:00
Sefa Eyeoglu
b280a6d36d
Merge pull request #1991 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2023-12-31 12:28:20 +01:00
github-actions[bot]
ad01102bad
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/d6863cbcbbb80e71cecfc03356db1cda38919523' (2023-12-21)
→ 'github:nixos/nixpkgs/e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870' (2023-12-25)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/007a45d064c1c32d04e1b8a0de5ef00984c419bc' (2023-12-13)
→ 'github:cachix/pre-commit-hooks.nix/9d3d7e18c6bc4473d7520200d4ddab12f8402d38' (2023-12-30)
2023-12-31 00:20:06 +00:00
timoreo
0ce0769842
Merge pull request #1978 from Trial97/double_links
2023-12-28 19:48:34 +01:00
tildejustin
eca5d88576
remove legacy processArguments code
...
Signed-off-by: tildejustin <spacepepper3.14@gmail.com >
2023-12-24 22:20:06 -05:00
Sajjaad Farzad
b0a4af7412
Merge branch 'PrismLauncher:develop' into refresh_cats
2023-12-24 16:03:13 -08:00
Sefa Eyeoglu
dbbbf5aa93
Merge pull request #1980 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2023-12-24 11:22:58 +01:00
github-actions[bot]
ea38f8168a
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/aa9d4729cbc99dabacb50e3994dcefb3ea0f7447' (2023-12-14)
→ 'github:nixos/nixpkgs/d6863cbcbbb80e71cecfc03356db1cda38919523' (2023-12-21)
2023-12-24 00:19:31 +00:00
lumiscosity
c29af83dc3
fix styling
...
Signed-off-by: lumiscosity <averyrudelphe@gmail.com >
2023-12-23 14:16:29 +01:00
lumiscosity
1e48bf838d
move simplify call to drawing
...
Signed-off-by: lumiscosity <averyrudelphe@gmail.com >
2023-12-23 12:05:07 +01:00
lumiscosity
1bf386603d
Strip newlines in mod descriptions
...
Mirrors Modrinth page behaviour.
Signed-off-by: lumiscosity <averyrudelphe@gmail.com >
2023-12-23 11:27:19 +01:00
Trial97
9a33bdcf50
Fixed openURL cast for resource
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-12-23 01:02:04 +02:00
Trial97
526e580fbb
Force clear the resource selection
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-12-23 00:33:38 +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
358cf5b348
add archived project warning
...
Signed-off-by: lumiscosity <averyrudelphe@gmail.com >
2023-12-22 22:04:33 +01:00
lumiscosity
43306350e0
Add cat opacity
...
Signed-off-by: lumiscosity <averyrudelphe@gmail.com >
2023-12-22 15:02:41 +01:00
TheKodeToad
e39a03421a
Merge pull request #1964 from Scrumplex/fix/dont-log-katabasis
...
Don't log Microsoft refresh tokens
2023-12-19 11:24:45 +00:00
Sefa Eyeoglu
a1e3901b3f
fix: don't log katabasis by default
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-12-17 12:39:17 +01:00
Sefa Eyeoglu
2993306226
Merge pull request #1963 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2023-12-17 10:19:15 +01:00
github-actions[bot]
74e2e49134
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/09dc04054ba2ff1f861357d0e7e76d021b273cd7' (2023-12-08)
→ 'github:nixos/nixpkgs/aa9d4729cbc99dabacb50e3994dcefb3ea0f7447' (2023-12-14)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/e5ee5c5f3844550c01d2131096c7271cec5e9b78' (2023-11-25)
→ 'github:cachix/pre-commit-hooks.nix/007a45d064c1c32d04e1b8a0de5ef00984c419bc' (2023-12-13)
2023-12-17 00:20:10 +00:00
Sefa Eyeoglu
e227826a90
Merge pull request #1955 from PrismLauncher/renovate/actions-download-artifact-4.x
...
chore(deps): update actions/download-artifact action to v4
2023-12-16 17:27:02 +01:00
Sefa Eyeoglu
211e62cedb
Merge pull request #1956 from PrismLauncher/renovate/actions-upload-artifact-4.x
...
chore(deps): update actions/upload-artifact action to v4
2023-12-16 17:26:28 +01:00
Sefa Eyeoglu
7382d33430
Merge pull request #1961 from PrismLauncher/renovate/korthout-backport-action-2.x
...
chore(deps): update korthout/backport-action action to v2.3.0
2023-12-16 17:25:53 +01:00
Tayou
1fcf405c88
Merge pull request #1960 from lumiscosity/fix/minor_spelling
...
Minor spelling fixes
2023-12-16 16:34:21 +01:00
renovate[bot]
8f29cdf195
chore(deps): update korthout/backport-action action to v2.3.0
2023-12-16 15:27:48 +00:00
Sefa Eyeoglu
a8220cd296
chore: remove unused methods
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-12-16 13:12:12 +01:00
Sefa Eyeoglu
213963257c
chore: remove maybe_unused
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-12-16 13:11:24 +01:00
lumiscosity
eb8e150fa8
one more
...
Signed-off-by: lumiscosity <averyrudelphe@gmail.com >
2023-12-16 13:00:22 +01:00
lumiscosity
56397446db
Update ModFolderPage.cpp
...
Signed-off-by: lumiscosity <averyrudelphe@gmail.com >
2023-12-16 12:53:59 +01:00
lumiscosity
8cbdecc454
Update GetModDependenciesTask.cpp
...
Signed-off-by: lumiscosity <averyrudelphe@gmail.com >
2023-12-16 12:52:59 +01:00
renovate[bot]
317d52b44a
chore(deps): update actions/upload-artifact action to v4
2023-12-14 20:23:30 +00:00
renovate[bot]
d0fe700b53
chore(deps): update actions/download-artifact action to v4
2023-12-14 20:23:26 +00:00
Sefa Eyeoglu
0ccdcd23e3
fix: open paths directly
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-12-14 13:02:29 +01:00
Trial97
f33110ee0c
Renamed function
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-12-14 00:19:22 +02:00
Trial97
9580f16c33
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into netjob_retry
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-12-14 00:16:29 +02:00
Trial97
400b518bc2
Removed auto reauthenticate
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-12-14 00:02:15 +02:00
Sefa Eyeoglu
32a9c37ecd
Merge pull request #1951 from guihkx/sync-flatpak
2023-12-13 19:32:56 +01:00
guihkx
3d50bef10c
chore: sync nightly flatpak manifest with flathub's
...
Signed-off-by: guihkx <626206+guihkx@users.noreply.github.com >
2023-12-13 15:17:19 -03:00
Sefa Eyeoglu
608a09d211
Merge pull request #1950 from PrismLauncher/renovate/github-codeql-action-3.x
2023-12-13 18:25:59 +01:00
renovate[bot]
469aaf6051
chore(deps): update github/codeql-action action to v3
2023-12-13 16:16:06 +00:00
Trial97
6a61900328
Fixed curseforge version filter
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-12-13 17:48:11 +02:00
Trial97
763eab6b96
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
2023-12-13 14:48:31 +02:00
Trial97
4498d32cc0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2
2023-12-13 14:37:02 +02:00
Trial97
d10b075677
Sort mods before export
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-12-13 14:36:58 +02:00
timoreo
a382754b1e
Merge pull request #1947 from theMackabu/patch-minimized
2023-12-13 11:10:39 +01:00
TheKodeToad
2391ad200f
Revert change to .gitignore
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-12-12 23:21:34 +00:00
theMackabu
648aa18e6f
add: refresh on load
...
Signed-off-by: theMackabu <theMackabu@gmail.com >
2023-12-12 14:26:45 -08:00
theMackabu
7c33a8e448
remove: maidfile.toml (local build tool)
...
Signed-off-by: theMackabu <theMackabu@gmail.com >
2023-12-12 13:37:24 -08:00
theMackabu
201c9783d5
clang-format: fix formatting
...
Signed-off-by: theMackabu <theMackabu@gmail.com >
2023-12-12 13:31:18 -08:00
theMackabu
836f74cd46
#1945 resolve issue on windows
...
Signed-off-by: theMackabu <theMackabu@gmail.com >
2023-12-12 13:26:44 -08:00
theMackabu
3567369d44
#1945 resolve minimized windows pull from dock
...
Signed-off-by: theMackabu <theMackabu@gmail.com >
2023-12-12 13:26:44 -08:00
timoreo
4612607803
Merge pull request #1712 from Trial97/current_time
2023-12-11 15:40:06 +01:00
Sefa Eyeoglu
a39e2a1145
Merge pull request #1916 from PrismLauncher/renovate/korthout-backport-action-2.x
2023-12-11 11:10:04 +01:00
Sefa Eyeoglu
79218cf13b
Merge pull request #1738 from Trial97/some_removals
2023-12-11 11:08:26 +01:00
Sefa Eyeoglu
f8a6a099c7
Merge pull request #1732 from Trial97/update_file2
2023-12-11 11:08:07 +01:00
Sefa Eyeoglu
9467b11897
Merge pull request #1694 from Trial97/concurrent
2023-12-11 11:07:03 +01:00
Sefa Eyeoglu
bcaeab1ddc
Merge pull request #1857 from Trial97/copy_time
2023-12-11 10:58:21 +01:00
Sefa Eyeoglu
f8db991727
Merge pull request #1908 from DioEgizio/update-qt661
2023-12-11 10:57:56 +01:00
Sefa Eyeoglu
ad6ca1c6ea
Merge pull request #1931 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2023-12-10 10:16:00 +01:00
github-actions[bot]
d7cb139235
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nix-filter':
'github:numtide/nix-filter/41fd48e00c22b4ced525af521ead8792402de0ea' (2023-09-16)
→ 'github:numtide/nix-filter/c843418ecfd0344ecb85844b082ff5675e02c443' (2023-12-04)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/f5c27c6136db4d76c30e533c20517df6864c46ee' (2023-11-30)
→ 'github:nixos/nixpkgs/09dc04054ba2ff1f861357d0e7e76d021b273cd7' (2023-12-08)
2023-12-10 00:20:06 +00:00
TheKodeToad
4db00897c6
Merge pull request #1922 from IceCryptonym/togglable-status-bar
...
Add togglable status bar
2023-12-07 20:37:36 +00:00
Sefa Eyeoglu
e408a047ed
Merge pull request #1923 from TayouVR/more-instance-group-seperator
2023-12-07 21:34:41 +01:00
Tayou
877eb4172a
add line back to group separator
...
Signed-off-by: Tayou <git@tayou.org >
2023-12-07 17:26:47 +01:00
Archy
faedd0fd65
Add togglable status bar
...
Signed-off-by: Archy <59789660+IceCryptonym@users.noreply.github.com >
2023-12-06 23:40:22 +10:00
renovate[bot]
132344df1c
chore(deps): update korthout/backport-action action to v2.2.0
2023-12-04 12:06:39 +00:00
Trial97
657416fe30
Removed header
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-12-03 21:29:02 +02:00
Trial97
577c737d68
Fixed askIfShouldUpdate dialog on mac
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-12-03 20:00:50 +02:00
Sefa Eyeoglu
c721fa795d
Merge pull request #1912 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2023-12-03 10:51:26 +01:00
github-actions[bot]
8b4b0f2f01
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/8c9fa2545007b49a5db5f650ae91f227672c3877' (2023-11-01)
→ 'github:hercules-ci/flake-parts/34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5' (2023-12-01)
• Updated input 'flake-parts/nixpkgs-lib':
'github:NixOS/nixpkgs/0cbe9f69c234a7700596e943bfae7ef27a31b735?dir=lib' (2023-10-29)
→ 'github:NixOS/nixpkgs/e92039b55bcd58469325ded85d4f58dd5a4eaf58?dir=lib' (2023-11-29)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1' (2023-11-24)
→ 'github:nixos/nixpkgs/f5c27c6136db4d76c30e533c20517df6864c46ee' (2023-11-30)
2023-12-03 00:19:28 +00:00
DioEgizio
eb011e6729
chore: update qt to qt 6.6.1
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2023-12-02 17:42:24 +01:00
Sefa Eyeoglu
4c59a1ba1b
Merge pull request #1882 from bit69tream/notify-user-if-tmp-is-noexec
2023-11-28 21:57:23 +01:00
Sefa Eyeoglu
5291268565
Merge pull request #1900 from PrismLauncher/renovate/cachix-install-nix-action-24.x
2023-11-28 21:53:57 +01:00
renovate[bot]
a74c3d57b4
chore(deps): update cachix/install-nix-action action to v24
2023-11-28 20:27:48 +00:00
TheKodeToad
284e536e81
Data pack management
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-11-28 14:08:08 +00:00
Trial97
463ff4c6ae
Removed assert permanantly
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-27 11:30:07 +02:00
Trial97
6f6b6312a5
Moved the button up
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-27 09:39:31 +02:00
seth
6fa8e07d62
Merge pull request #1897 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2023-11-27 03:44:43 +00:00
Trial97
2d91bd09d4
Fixed crash on abort function not initialized
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-26 23:49:56 +02:00
github-actions[bot]
67b51b7a18
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/7414e9ee0b3e9903c24d3379f577a417f0aae5f1' (2023-11-16)
→ 'github:nixos/nixpkgs/0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1' (2023-11-24)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/e558068cba67b23b4fbc5537173dbb43748a17e8' (2023-11-15)
→ 'github:cachix/pre-commit-hooks.nix/e5ee5c5f3844550c01d2131096c7271cec5e9b78' (2023-11-25)
2023-11-26 00:19:22 +00:00
Trial97
f4e098f7f5
Formated file
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-25 09:36:55 +02:00
Trial97
1a0fd5f993
Added mod reinstall dialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-25 00:18:10 +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
ff5a968de0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file2
2023-11-23 23:57:20 +02:00
Trial97
1650237c8f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into some_removals
2023-11-23 23:37:13 +02:00
Trial97
e0d776e551
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod
2023-11-23 23:29:10 +02:00
Trial97
403a7f5d46
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into toggle_deps2
2023-11-23 23:21:11 +02:00
Trial97
af628be648
Merge branch 'error_codes' of github.com:Trial97/PrismLauncher into error_codes
2023-11-23 23:20:27 +02:00
Trial97
3c75d761a2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into error_codes
2023-11-23 23:11:11 +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
bb9df1684b
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into new_cats
2023-11-23 16:58:42 +02:00
Trial97
0d44c0df1d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refresh_cats
2023-11-23 16:50:53 +02:00
Trial97
c5cdebb42f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into ftb_import
2023-11-23 16:43:33 +02:00
Trial97
2318a83881
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader
2023-11-23 16:33:57 +02:00
Trial97
be67067fa2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into demo
2023-11-23 16:23:56 +02:00
Alexandru Ionut Tripon
7f6027498e
Merge pull request #1871 from Trial97/cat_day
...
changed prism aniversary
2023-11-23 14:14:04 +00:00
Trial97
9c13504b06
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_ok
2023-11-23 16:13:09 +02:00
deadmeu
ac223a29ef
refactor: shorten desktop entry comment field
...
Signed-off-by: deadmeu <dmu@duck.com >
2023-11-24 00:03:33 +10:00
Trial97
afcdb7595c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2
2023-11-23 16:01:54 +02:00
Trial97
f71e622f71
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into copy_time
2023-11-23 15:51:54 +02:00
Trial97
4f49a56e4d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into supported_files
2023-11-23 15:40:31 +02:00
Trial97
85e875fe08
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cat_day
2023-11-23 15:32:48 +02:00
Trial97
944ed48a61
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into time4
2023-11-23 14:58:05 +02:00
Trial97
e503d44c54
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into current_time
2023-11-23 14:47:47 +02:00
Trial97
908072710a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-23 14:34:56 +02:00
bit6tream
d414599974
( #1693 ) Use a better approach to detect a noexec mount option
...
Signed-off-by: bit6tream <megapixel483@gmail.com >
2023-11-23 15:23:03 +03:00
Trial97
e43a557a0b
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into instance_copy_progress
2023-11-23 14:08:49 +02:00
Trial97
7d4778ffd6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into portabledatadir
2023-11-23 13:54:36 +02:00
Trial97
80383d237a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
2023-11-23 13:38:11 +02:00
Trial97
1095d0698a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into waitprofiler
2023-11-23 13:25:12 +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
f16f0ed93e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into netjob_retry
2023-11-23 12:47:52 +02:00
Trial97
9345416361
Fixed localization stuff
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-23 12:36:40 +02:00
Trial97
2268e46b91
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into account
2023-11-23 12:22:41 +02:00
Trial97
ceb88a170e
Extracted reauthenticateCurrentAccount as a separate function
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-23 12:22:31 +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
Sefa Eyeoglu
7c9c3d2c5f
Merge pull request #1815 from Trial97/fix_mangohub
2023-11-23 11:00:57 +01:00
Trial97
d8c5ed55c2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file2
2023-11-23 12:00:18 +02:00
Trial97
6169af70db
Added back the FIXME comment
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-23 11:59:35 +02:00
Sefa Eyeoglu
2b17a61d38
Merge pull request #1589 from Trial97/instance_reload
...
Fully reload the instance list once the folder is changed
2023-11-23 10:48:01 +01:00
Sefa Eyeoglu
d60d089cbc
Merge pull request #1751 from LocalSpook/account_type
2023-11-23 10:27:06 +01:00
Alexandru Ionut Tripon
5d6334ef95
Merge pull request #1762 from LocalSpook/const-in-declarations
...
Remove top-level `const` qualifiers in function declarations
2023-11-23 08:53:01 +00:00
Trial97
6b3b54f061
format
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-23 10:48:11 +02:00
Trial97
e11b7e3770
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
2023-11-23 10:46:27 +02:00
Trial97
670a0c1442
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size
2023-11-23 10:46:03 +02:00
Trial97
d5d8b7be8d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2
2023-11-23 10:45:35 +02:00
Trial97
673f82e884
Merge branch 'war_ning' of github.com:Trial97/PrismLauncher into war_ning
2023-11-23 10:45:06 +02:00
Trial97
f18f7147b5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into war_ning
2023-11-23 10:44:49 +02:00
Trial97
721a08462c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into copy_time
2023-11-23 10:44:26 +02:00
Trial97
f0cff15d56
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into supported_files
2023-11-23 10:43:43 +02:00
Trial97
a1ac3ef7ae
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cat_day
2023-11-23 10:43:15 +02:00
Trial97
a7be21733f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
2023-11-23 10:41:55 +02:00
Trial97
66decbb180
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into current_time
2023-11-23 10:41:06 +02:00
Trial97
4ef626dab3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into time4
2023-11-23 10:40:30 +02:00
Sefa Eyeoglu
48e9753fb5
Merge pull request #1880 from Trial97/link
2023-11-23 09:07:34 +01:00
Sefa Eyeoglu
b42434bcb6
Merge remote-tracking branch 'upstream/develop' into const-in-declarations
2023-11-23 09:06:23 +01:00
Sefa Eyeoglu
364fb9808e
Merge pull request #1347 from HyperSoop/reduce-min-memory
2023-11-23 08:58:58 +01:00
Sefa Eyeoglu
389d75594a
Merge pull request #1887 from PrismLauncher/getchoo-patch-2
2023-11-23 08:58:00 +01:00
seth
d1c33392e7
chore: disable x86_64-darwin in garnix
...
this is currently broken on garnix's end, but hopefully we will be able to enable this again in the future
Signed-off-by: seth <getchoo@tuta.io >
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-11-23 08:51:30 +01:00
Trial97
e3af4f9a78
Fixed playtime recording
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-22 20:34:12 +02: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
140a55810d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
2023-11-22 14:20:30 +02:00
bit6tream
681e76c551
( #1693 ) Notify user if /tmp directory has noexec mount option
...
Minecraft versions starting from 1.19 would not start at all if /tmp is mounted as `noexec`.
Signed-off-by: bit6tream <megapixel483@gmail.com >
2023-11-22 01:48:31 +03:00
Trial97
196d24330a
Fixed open link on settings page
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-21 17:47:59 +02:00
Trial97
54c308e5b5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-19 21:15:12 +02:00
Sefa Eyeoglu
e499aa4783
Merge pull request #1873 from guihkx/sync-flatpak-manifest
2023-11-19 19:57:47 +01:00
guihkx
e3b7aed76b
chore: sync local flatpak manifest with flathub's
...
Signed-off-by: guihkx <626206+guihkx@users.noreply.github.com >
2023-11-19 11:08:52 -03:00
Tayou
24f2102596
Merge pull request #1869 from Trial97/icons_folder
...
Added more open folder actions
2023-11-19 15:06:30 +01: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
80c85aef99
fixed const stuff
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-19 15:37:18 +02:00
Alexandru Ionut Tripon
76216335b1
Update launcher/ui/pages/modplatform/ImportPage.cpp
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-11-19 15:26:47 +02:00
Sefa Eyeoglu
71ee0e750c
Merge pull request #1868 from PrismLauncher/update_flake_lock_action
2023-11-19 10:38:56 +01:00
Trial97
a8aa214c0e
changed prism aniversary
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-19 09:01:59 +02:00
Trial97
e99926ea94
Added more open folder actions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-19 02:40:25 +02:00
github-actions[bot]
69a49e85d0
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/ec750fd01963ab6b20ee1f0cb488754e8036d89d' (2023-11-07)
→ 'github:nixos/nixpkgs/7414e9ee0b3e9903c24d3379f577a417f0aae5f1' (2023-11-16)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/ea758da1a6dcde6dc36db348ed690d09b9864128' (2023-11-06)
→ 'github:cachix/pre-commit-hooks.nix/e558068cba67b23b4fbc5537173dbb43748a17e8' (2023-11-15)
2023-11-19 00:19:30 +00:00
Trial97
f7e478c755
Added all supported files filter
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-19 02:02:02 +02:00
TheKodeToad
40cfa145ee
Merge pull request #1860 from Trial97/env_vars2
...
Add custom env vars to pre/post launch commands
2023-11-18 11:15:49 +00:00
Trial97
1a06a1424b
Added custom env vars to pre/post launch commands
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-18 10:53:38 +02:00
Trial97
9f39e45b28
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into current_time
2023-11-18 10:45:24 +02:00
Trial97
4e3132e8b2
reseted the setting
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-17 22:40:36 +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
53c6493b9a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2
2023-11-17 21:56:23 +02:00
TheKodeToad
7ef2bda269
Improve description
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-11-17 19:49:48 +00:00
Alexandru Ionut Tripon
1150249cec
Merge pull request #1746 from Trial97/toggle_deps
...
separated dependecy check from mod update
2023-11-17 19:42:22 +00:00
Tayou
b5f8054d8c
Merge pull request #1849 from Trial97/column_size
...
Made resource columns resizable
2023-11-17 20:19:02 +01:00
Trial97
a531f32b69
fixed settings saving
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-16 13:26:29 +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
Trial97
bedb4da869
Added filename to the modlist export
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-14 19:37:23 +02:00
Trial97
6804e2ba59
moved export to list to the mods page
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-14 18:40:45 +02:00
Trial97
99fbcbee4c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2
2023-11-14 18:12:48 +02:00
Trial97
c05c001ab2
Remove the dep if it fails for any reason
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-13 23:49:49 +02:00
Alexandru Ionut Tripon
a3445cbbdd
Merge pull request #1704 from Leafeling/develop
...
Add game category to generated Linux shortcuts
2023-11-13 07:32:33 +00:00
Trial97
0e57eeca69
Added missing variable from lambda capture
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-13 09:28:59 +02:00
Alexandru Ionut Tripon
32a8d9b9c6
Update launcher/ui/pages/instance/ModFolderPage.cpp
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-11-13 09:23:56 +02:00
TheKodeToad
f4940e26c6
Merge remote-tracking branch 'upstream/develop' into resource-meta
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-11-12 19:02:14 +00:00
Trial97
17916dbd24
Fixed inconsistent Ok in instance import
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-12 20:27:55 +02:00
Tayou
a991d48c76
Merge pull request #1798 from Trial97/java
...
[Windows] Autodetect Java from the Microsoft Store version of the official launcher
2023-11-12 15:39:17 +01:00
Alexandru Ionut Tripon
94d67b827e
Merge pull request #1832 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2023-11-12 06:28:26 +00:00
github-actions[bot]
cb648c180c
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'libnbtplusplus':
'github:PrismLauncher/libnbtplusplus/a5e8fd52b8bf4ab5d5bcc042b2a247867589985f' (2023-07-22)
→ 'github:PrismLauncher/libnbtplusplus/23b955121b8217c1c348a9ed2483167a6f3ff4ad' (2023-11-06)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/9d5d25bbfe8c0297ebe85324addcb5020ed1a454' (2023-11-04)
→ 'github:nixos/nixpkgs/ec750fd01963ab6b20ee1f0cb488754e8036d89d' (2023-11-07)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/dec10399e5b56aa95fcd530e0338be72ad6462a0' (2023-11-01)
→ 'github:cachix/pre-commit-hooks.nix/ea758da1a6dcde6dc36db348ed690d09b9864128' (2023-11-06)
2023-11-12 00:18:56 +00:00
Tayou
e7b2dbdd00
Merge pull request #1828 from Trial97/swap
...
Fixed modrinth sort swap
2023-11-11 18:34:53 +01:00
Trial97
50a4d61ded
Fixed demo mode
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-10 23:26:41 +02:00
Trial97
926942a973
Fixed modrinth sort swap
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-10 20:00:35 +02:00
Trial97
463608b289
fixed shader packs detection
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-10 19:37:11 +02:00
Trial97
5e2eb7bbbb
Added button to select the FTBApp instances directory
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-09 23:30:30 +02:00
Trial97
b4bfc03e8b
Added button to refresh themes and catpacks
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-09 21:48:46 +02:00
Trial97
7532a41043
Improvements to catpack
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-09 21:38:38 +02:00
Tayou
913d81e371
Merge pull request #1821 from TheKodeToad/group-click-fix
...
Only open/close groups on left button
2023-11-09 19:18:12 +01:00
TheKodeToad
0f68a2dd61
Only open/close groups on left button
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-11-09 16:40:23 +00:00
TheKodeToad
a30292009a
Merge pull request #1819 from Desoroxxx/patch-1
...
Improve name and tooltip of mod dependency management option
2023-11-08 20:47:56 +00:00
Desoroxxx
6093399f5c
Update LauncherPage.ui
...
Signed-off-by: Desoroxxx <desoroxxx@gmail.com >
2023-11-08 17:32:30 +01:00
Trial97
ae62e48c7c
Moved some buttons around
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-08 12:25:56 +02:00
Trial97
a7bfe385ea
Renamed Remove Metadata button
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-08 12:10:39 +02:00
Trial97
e4fecd1f97
Made sure mangoHub libs are present
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-08 11:55:38 +02:00
Sefa Eyeoglu
403c4bad86
Merge pull request #1799 from Trial97/improve_login
2023-11-08 08:51:13 +01:00
seth
1d56bb8513
Merge pull request #1805 from PrismLauncher/renovate/korthout-backport-action-2.x
...
chore(deps): update korthout/backport-action action to v2.1.1
2023-11-08 07:25:45 +00:00
Alexandru Ionut Tripon
7313630615
Update launcher/java/JavaUtils.cpp
...
Co-authored-by: seth <getchoo@tuta.io >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-11-08 09:01:31 +02:00
Alexandru Ionut Tripon
9d653f172a
Update launcher/ui/dialogs/MSALoginDialog.cpp
...
Co-authored-by: seth <getchoo@tuta.io >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-11-08 08:56:48 +02:00
renovate[bot]
d4b479a186
chore(deps): update korthout/backport-action action to v2.1.1
2023-11-07 23:55:40 +00:00
Trial97
4dc9e65875
Formated the suggestion
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-07 20:41:45 +02:00
Alexandru Ionut Tripon
54187a505f
Update launcher/ui/dialogs/MSALoginDialog.cpp
...
Co-authored-by: Tayou <git@tayou.org >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-11-07 20:39:12 +02:00
Hazel Hofmann
1dea83580e
DCO Remediation Commit for Hazel Hofmann <hazel@theopensource.company>
...
I, Hazel Hofmann <hazel@theopensource.company >, hereby add my Signed-off-by to this commit: 9ada8d906d
Signed-off-by: Hazel Hofmann <hazel@theopensource.company >
2023-11-07 15:05:56 +01:00
Hazel Hofmann
9ada8d906d
Use same categories as main desktop entry
2023-11-07 14:54:04 +01:00
Trial97
8897f16d1d
simplify microsoft login
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-07 10:52:52 +02:00
Trial97
c78d35d699
added additional minecraft java path for windows
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-07 10:20:53 +02:00
Trial97
5d5adbd7da
add update menu conditionaly
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-07 09:48:07 +02:00
Trial97
6506e93e4a
Removed some buttons
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-07 09:44:27 +02:00
Trial97
011e87b421
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into toggle_deps
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-06 23:38:14 +02:00
Trial97
7a0b2a316a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-06 23:19:58 +02:00
TheKodeToad
baa988ec81
Merge pull request #1739 from Trial97/mod_icons
...
fixed squished mod icons
2023-11-06 20:49:05 +00:00
Alexandru Ionut Tripon
8eac0d34bd
Merge pull request #1796 from Trial97/dep_global_toggle
...
Added Global Dependenicies toggle
2023-11-06 20:48:51 +00:00
Alexandru Ionut Tripon
0b1dcb3ea7
Merge pull request #1760 from LocalSpook/sorting
...
Localize sorting options for resource and shader packs
2023-11-06 20:45:52 +00:00
Alexandru Ionut Tripon
3d529b0c3e
Merge pull request #1772 from Trial97/pixmap_crash
...
Fix crash with mod icon caching
2023-11-06 20:44:27 +00:00
seth
a2ab4804dd
Merge pull request #1788 from Trial97/readme
...
Updated the readme
2023-11-06 16:41:56 +00:00
Trial97
ca226d2ab5
Fixed comparation warning
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-06 11:24:19 +02:00
Trial97
670e91cb60
Increased the step to around 10MB
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-06 11:08:18 +02:00
Trial97
cc291219f9
apply suggested changes
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-06 10:51:34 +02:00
Sefa Eyeoglu
0eda2447dc
Merge pull request #1797 from Trial97/fix_mangohub
...
[Linux] Fix loading MangoHud
2023-11-06 08:14:55 +01:00
Trial97
867e6223ce
Fixed mangoHub loading
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-05 23:48:26 +02:00
Alexandru Ionut Tripon
3e7f9083ca
Update launcher/ui/pages/instance/ModFolderPage.cpp
...
Co-authored-by: seth <getchoo@tuta.io >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-11-05 23:41:54 +02:00
Alexandru Ionut Tripon
902e861fc6
Apply suggestions from code review
...
Co-authored-by: seth <getchoo@tuta.io >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-11-05 23:41:26 +02:00
seth
36d2109a15
Merge pull request #1792 from PrismLauncher/renovate/korthout-backport-action-2.x
...
chore(deps): update korthout/backport-action action to v2.1.0
2023-11-05 21:29:01 +00:00
TheKodeToad
bd9d5e0990
Reword
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-11-05 20:31:48 +00:00
Trial97
9a8667e99c
Added Global Dependenicies toggle
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-05 22:22:49 +02:00
Trial97
710a48fcaf
changed type form double long to long long
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-05 21:41:10 +02:00
TheKodeToad
52807ab279
Merge pull request #1793 from Edgars-Cirulis/develop
...
visual: Fix spacing.
2023-11-05 17:50:01 +00:00
Edgars Cīrulis
d2a85cb580
visual: Fix spacing.
...
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com >
2023-11-05 17:43:12 +00:00
Alexandru Ionut Tripon
d13db1109f
Merge pull request #1789 from acdpsn/develop
...
Fixed link to Fulmine's website
2023-11-05 16:15:36 +00:00
renovate[bot]
64bbcb2834
chore(deps): update korthout/backport-action action to v2.1.0
2023-11-05 15:57:06 +00:00
Trial97
1d67fc6646
added special case for windows
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-05 17:35:49 +02:00
Alexandru Ionut Tripon
070d83d887
Merge pull request #1791 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2023-11-05 07:03:37 +00:00
Alex
cf4144cb50
Fixed link to Fulmine's website
...
Signed-off-by: Alex <akim8@emich.edu >
2023-11-05 00:46:05 -04:00
github-actions[bot]
40ebae394a
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4' (2023-10-03)
→ 'github:hercules-ci/flake-parts/8c9fa2545007b49a5db5f650ae91f227672c3877' (2023-11-01)
• Updated input 'flake-parts/nixpkgs-lib':
'github:NixOS/nixpkgs/f5892ddac112a1e9b3612c39af1b72987ee5783a?dir=lib' (2023-09-29)
→ 'github:NixOS/nixpkgs/0cbe9f69c234a7700596e943bfae7ef27a31b735?dir=lib' (2023-10-29)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/808c0d8c53c7ae50f82aca8e7df263225cf235bf' (2023-10-26)
→ 'github:nixos/nixpkgs/9d5d25bbfe8c0297ebe85324addcb5020ed1a454' (2023-11-04)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/bd38df3d508dfcdff52cd243d297f218ed2257bf' (2023-10-25)
→ 'github:cachix/pre-commit-hooks.nix/dec10399e5b56aa95fcd530e0338be72ad6462a0' (2023-11-01)
2023-11-05 00:18:56 +00:00
Trial97
5afe6600ee
use fs::move instead of qt rename
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-04 16:49:35 +02:00
Trial97
0f95bf1e42
Updated readme
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-04 12:08:49 +02:00
Trial97
f828ea8929
updated the texture pack tooltips
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-04 11:49:05 +02:00
Trial97
79e299123c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
2023-11-04 00:15:09 +02:00
Trial97
a4978946d5
disabled lax deps
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-04 00:07:51 +02:00
Trial97
2b6d8b8a2d
updated tooltip messages
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-03 23:02:17 +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
TheKodeToad
b446bdf4a9
Merge pull request #1783 from Trial97/visual_bug
...
Fixed visual bug with Modlist export
2023-11-03 15:20:57 +00:00
Sefa Eyeoglu
ef40ba8439
Merge pull request #1782 from Trial97/warn_remove_account
2023-11-03 12:56:13 +01:00
Trial97
1b2654bfa6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
2023-11-03 12:53:23 +02:00
Alexandru Ionut Tripon
1bd69ecbb2
Update launcher/ui/pages/global/AccountListPage.cpp
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-11-03 11:42:40 +02:00
Trial97
b18082376d
Fixed visual bug with Modlist export
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-03 11:04:13 +02:00
Trial97
127a31ba3a
Added warning for remove account
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-03 10:31:40 +02:00
Trial97
4081c51573
made dependency check more lax
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-02 23:52:12 +02:00
Trial97
220a1de99a
made sure that we do not relay for undefined behavior
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-02 22:41:56 +02:00
Trial97
3cbc63bb9f
added size column
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-02 12:18:24 +02:00
Trial97
2349f29be0
jsut a overflow protection
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-11-02 01:26:04 +02:00
Alexandru Ionut Tripon
f8bb1a872a
Merge pull request #1766 from TheKodeToad/groups-fix
...
Fix group issues
2023-11-01 15:26:41 +00:00
Tayou
86e2f6c58c
Merge pull request #1685 from Trial97/java
...
Autodetect Java bundled with official launcher
2023-10-31 18:03:41 +01:00
Trial97
2863a691ef
moved refresh out of the loop
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-31 08:45:08 +02:00
Alexandru Ionut Tripon
60fd7f0ae6
Update launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp
...
Co-authored-by: Tayou <git@tayou.org >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-10-31 08:43:26 +02:00
Trial97
7166d68736
fixed account refresh after sleep
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-31 00:45:18 +02:00
Trial97
e42a2404a9
added more microsoft error codes
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-30 22:55:23 +02:00
Trial97
1490193402
added button to disable dependencies on the mod review
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-30 22:14:26 +02:00
TheKodeToad
2526275c5e
Better check
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-10-30 09:51:37 +00:00
TheKodeToad
5a54d80c6e
Fix group issues
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-10-30 09:26:38 +00:00
Sefa Eyeoglu
ea7dd9cfcc
Merge pull request #1761 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2023-10-29 09:31:28 +01:00
Alexandru Ionut Tripon
eb3f1ee27a
Merge pull request #1758 from IThundxr/patch-1
...
[Windows] Remove Windows 7/8 support from app manifest
2023-10-29 07:12:40 +00: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
github-actions[bot]
55ac17c45b
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/44881e03af1c730cbb1d72a4d41274a2c957813a' (2023-10-21)
→ 'github:nixos/nixpkgs/808c0d8c53c7ae50f82aca8e7df263225cf235bf' (2023-10-26)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/8cc349bfd082da8782b989cad2158c9ad5bd70fd' (2023-10-19)
→ 'github:cachix/pre-commit-hooks.nix/bd38df3d508dfcdff52cd243d297f218ed2257bf' (2023-10-25)
2023-10-29 00:18:11 +00:00
LocalSpook
54305397e4
Localize sorting options for resource and shader packs
...
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com >
2023-10-28 12:50:40 -07:00
Sefa Eyeoglu
736246e6c8
Merge pull request #1759 from PrismLauncher/renovate/korthout-backport-action-2.x
2023-10-28 18:50:45 +02:00
renovate[bot]
9dcb7e9759
chore(deps): update korthout/backport-action action to v2
2023-10-28 16:03:11 +00:00
Tayou
69c2720872
Merge pull request #1691 from Trial97/no_color
...
Add no_color env variable
2023-10-28 18:02:53 +02:00
IThundxr
364cb4ff6a
chore: remove windows 7/8 support
...
With 8.0 windows legacy support was dropped, this just removes it from the manifest
Signed-off-by: IThundxr <contact@ithundxr.dev >
2023-10-28 07:39:32 -04:00
Tayou
df2a92d5f4
Merge pull request #1742 from TayouVR/fix-resourcepack-crash
...
fix switch/case fallthrough in resource parse tasks
2023-10-28 12:44:40 +02:00
Trial97
33cf7066b4
formated the code
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-27 21:51:35 +03:00
Trial97
2256850cb6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-27 00:12:50 +03:00
LocalSpook
9d972ccc63
Localize account type in account list
...
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com >
2023-10-26 13:32:33 -07:00
Sefa Eyeoglu
3719ea21b0
Merge pull request #1355 from TheKodeToad/env-vars
...
Custom environment variables
2023-10-26 22:10:26 +02:00
TheKodeToad
bd11b93a0c
Use hidden tab bar like other pages
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-10-26 21:01:24 +01:00
Trial97
12d567a9b8
made env vars behave like the rest of the settings
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-26 22:51:38 +03:00
Trial97
60a7628dbb
delete duplicate mods
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-26 20:43:26 +03:00
Trial97
3d84635b24
Remove file on mod duplication
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-26 20:09:12 +03:00
Trial97
321bbf1fa8
fixed asan stuff
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-26 19:06:38 +03:00
Trial97
dba54332fb
fixed some asan stuf
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-26 18:31:52 +03:00
Trial97
04acd27dab
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent
2023-10-26 13:45:47 +03:00
Trial97
8b8ea2d270
ensured that the variant is allways uppercase
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-26 13:37:25 +03:00
Trial97
44cdf3f697
Fixed skin variant
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-26 13:33:00 +03:00
Trial97
263dc5af67
Fixed remane and delete of selected skin
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-25 19:56:26 +03:00
Trial97
a5938a7de9
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-25 19:26:05 +03:00
txtsd
38d77b58cd
Merge pull request #1748 from LocalSpook/using
2023-10-25 16:08:42 +00:00
Trial97
d4d345ee7d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into toggle_deps
2023-10-24 23:40:36 +03:00
Tayou
a161f5cfe2
Merge pull request #1747 from Trial97/fix_initial_java
...
fix: java memory not set on initial setup
2023-10-24 19:04:56 +02:00
LocalSpook
5be80df1ee
Replace typedef with using
...
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com >
2023-10-24 01:36:27 -07:00
Trial97
6a19f2dae8
fixed icon import
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-24 11:19:19 +03:00
Trial97
694840937b
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
2023-10-24 10:32:09 +03:00
Trial97
87f2f88d4c
fix: java memory not set on initial setup
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-23 23:38:03 +03:00
Trial97
f7c9972db0
separated dependecy check from mod update
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-23 19:46:30 +03:00
Sefa Eyeoglu
b376888f43
Merge pull request #1515 from TheKodeToad/sysprops
2023-10-22 21:57:11 +02:00
Tayou
0fe3241df6
remove now unneeded Q_ASSERTs
...
Signed-off-by: Tayou <git@tayou.org >
2023-10-22 21:25:06 +02:00
Tayou
7d5206818b
fix switch/case fallthrough
...
Signed-off-by: Tayou <git@tayou.org >
2023-10-22 21:25:00 +02:00
Sefa Eyeoglu
db19362a97
feat: add launcher brand and version props
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-10-22 21:19:44 +02:00
Trial97
2aeb829176
removed the concurent task destructor behaivior
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-22 19:58:10 +03:00
Trial97
0ca3873f1c
small fix
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-22 17:48:19 +03:00
Trial97
a748f49362
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent
2023-10-22 11:34:55 +03:00
Trial97
932cd9e262
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-22 11:32:05 +03:00
Sefa Eyeoglu
cefb96e812
Merge pull request #1743 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2023-10-22 09:40:49 +02:00
github-actions[bot]
e7e80e704f
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/01441e14af5e29c9d27ace398e6dd0b293e25a54' (2023-10-11)
→ 'github:nixos/nixpkgs/44881e03af1c730cbb1d72a4d41274a2c957813a' (2023-10-21)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/42e1b6095ef80a51f79595d9951eb38e91c4e6ca' (2023-10-09)
→ 'github:cachix/pre-commit-hooks.nix/8cc349bfd082da8782b989cad2158c9ad5bd70fd' (2023-10-19)
2023-10-22 00:18:23 +00:00
Trial97
10ae808da9
fixed codeql
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-22 00:06:08 +03:00
Trial97
d151e97e3a
Fixed some headers
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-21 22:40:37 +03:00
Trial97
41c9ca4f8a
Added categories filter
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-21 22:15:07 +03:00
Trial97
35d62cc5f2
Updated dependencies
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-21 19:05:31 +03:00
Trial97
9aac8e389f
made release type visible
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-21 18:48:55 +03:00
Trial97
9e85297f7a
Connected filters
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-21 18:28:33 +03:00
Alexandru Ionut Tripon
2c4af7e793
Merge pull request #1290 from Trial97/refactor/NetActions
...
Refactor ImgurUpload
2023-10-21 12:32:16 +01:00
Trial97
4850434c67
added releaseType?
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-21 12:16:02 +03:00
Alexandru Ionut Tripon
f0fd1bd5e5
Merge pull request #1737 from Trial97/fix_ftb_app_import_icon
...
Fixed FTBApp import icon
2023-10-21 07:48:21 +01:00
Trial97
5d926582c7
added Image column size hint
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-20 19:08:56 +03:00
Trial97
7b62d14683
fixed squished mod icons
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-20 17:15:12 +03:00
Trial97
a9d7af9096
removed some unused stuff
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-20 16:44:37 +03:00
Trial97
80723eeca1
Fixed FTBApp import icon
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-20 16:41:32 +03:00
TheKodeToad
e9fd02baca
Fix code style
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-10-20 13:12:16 +01:00
TheKodeToad
db4a7ce239
Fix code style
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-10-20 13:11:17 +01:00
Trial97
35a8ab2393
Removed processEvents
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-20 10:32:45 +03:00
Trial97
6883c19579
Fixed the version combobox
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-20 00:44:36 +03:00
Trial97
55946c8923
first attempt at a combobox
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-19 23:53:26 +03:00
Alexandru Ionut Tripon
7ad48d8677
Merge pull request #1692 from Trial97/msa_account
...
Fix wrong account selection
2023-10-19 20:09:28 +01:00
Tayou
9a0cfbc648
Merge pull request #1733 from Dnyanu76/patch-1
...
Remove typo
2023-10-19 21:07:51 +02:00
Indrale Dnyaneshwar
1f2483c39e
Remove typo
...
Signed-off-by: Indrale Dnyaneshwar <118615488+Dnyanu76@users.noreply.github.com >
2023-10-20 00:31:47 +05:30
Trial97
1ac9757a86
Added back the processEvents
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-19 21:51:51 +03:00
Tayou
b9c1dc7325
Merge pull request #1374 from Trial97/welcome_background
...
Added welcome screen
2023-10-19 20:42:47 +02:00
Trial97
03a27d5b5a
Updated Managed Packs
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-19 19:47:48 +03:00
TheKodeToad
cf33927f21
Merge remote-tracking branch 'upstream/develop' into sysprops
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-10-19 11:28:07 +01:00
Trial97
8d4f508cc6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent
2023-10-18 18:08:48 +03:00
Trial97
30f73a0696
Merge branch 'fail_concurrent_task' of github.com:Trial97/PrismLauncher into concurrent
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-18 18:08:31 +03:00
TheKodeToad
c638a63a03
Merge pull request #1726 from Trial97/contrib
...
Added Trial97 as maintainer in about dialog
2023-10-18 09:34:12 +01:00
Sefa Eyeoglu
2081fcd3f5
Merge pull request #1722 from Scrumplex/fix/readonly-themes
2023-10-18 09:25:48 +02:00
Sefa Eyeoglu
90ebbd8e91
Merge pull request #1724 from getchoo/no-default-updater
2023-10-18 09:17:58 +02:00
Trial97
165d218300
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into contrib
2023-10-18 09:07:36 +03:00
Trial97
fea4c4eba8
Updated filters
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-18 09:00:45 +03:00
seth
069bc887f1
fix: don't always build updater on platforms besides mac
...
Signed-off-by: seth <getchoo@tuta.io >
2023-10-17 19:12:00 -04:00
Trial97
b54376062e
Added mcVersion column
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-17 19:25:01 +03:00
Trial97
9001d9eb75
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
2023-10-17 18:32:18 +03:00
Alexandru Ionut Tripon
5aa2b88861
Merge pull request #1721 from Trial97/develop
...
fixed code signing for appImage
2023-10-17 10:20:44 +01:00
Sefa Eyeoglu
d348f20dd9
fix: allow loading themes with missing resources folder
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-10-17 10:00:17 +02:00
Trial97
b1bd0ceade
fixed code signing for appImage
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-17 09:29:47 +03:00
Trial97
cc66350286
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-16 23:42:19 +03: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
b6f48f6fe0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into netjob_retry
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-16 23:13:53 +03:00
Trial97
869f654a10
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-16 22:46:11 +03:00
Alexandru Ionut Tripon
8f2f99801e
Merge pull request #1717 from DioEgizio/update-qt660
...
chore: bump Qt to Qt 6.6.0
2023-10-16 18:59:29 +01:00
Tayou
aae65e3e4e
Merge branch 'develop' into update-qt660
...
Signed-off-by: Tayou <git@tayou.org >
2023-10-16 19:57:05 +02:00
Tayou
436db23ffc
Merge pull request #1268 from Ryex/feat/launcher-updater
...
Feat: Windows (And portable linux / appimage) Auto Updater
2023-10-16 19:53:50 +02:00
DioEgizio
6c9856b9dc
chore: bump Qt to Qt 6.6.0
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2023-10-16 15:42:16 +02:00
Alexandru Ionut Tripon
0927035a26
Merge pull request #1549 from Trial97/atlauncher_browser
...
added suport for atlauncher browser download
2023-10-16 06:39:12 +01:00
Tayou
5985d8b118
Merge pull request #1383 from TheKodeToad/rename-groups
...
Rename groups
2023-10-15 23:38:27 +02:00
TheKodeToad
cc990c4f94
Merge branch 'develop' into env-vars
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-10-15 21:57:20 +01:00
TheKodeToad
c4882e7162
Merge pull request #443 from TheKodeToad/skinfix
...
Add legacy skin fix
2023-10-15 21:46:29 +01:00
Trial97
0ff98c5876
allways enable dependencies
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-15 21:22:59 +03:00
Trial97
fe14e48d72
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
2023-10-15 21:06:40 +03:00
Trial97
9d15255e0a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into atlauncher_browser
2023-10-15 20:52:38 +03:00
Trial97
ca9b593483
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
2023-10-15 20:44:45 +03:00
Trial97
ef0813754b
added explicit qt version for linux portable
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-15 20:23:46 +03:00
Trial97
6bbff310bc
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater
2023-10-15 17:42:39 +03:00
Trial97
52c94eb568
reset the setting if is under 0
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-15 16:47:23 +03:00
TheKodeToad
6fb7a98901
Fix small mistake 😭
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-10-15 14:45:05 +01:00
Tayou
9705e6325a
Merge pull request #1673 from Trial97/win_attr
...
fix folder attributes on windows copy
2023-10-15 15:15:36 +02:00
TheKodeToad
7112d04df5
Mark setting as optional
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-10-15 14:11:08 +01:00
Trial97
b075711be0
ensured totalTimePlayed is allways greater than 0
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-15 16:03:14 +03:00
Alexandru Ionut Tripon
2ab48a43dd
Merge pull request #1706 from Trial97/develop
...
removed the better release for modrinth modpacks
2023-10-15 12:24:20 +01:00
Alexandru Ionut Tripon
682134435d
Merge pull request #1684 from Trial97/remove_legacy
...
removed windows legacy builds
2023-10-15 12:22:35 +01:00
Alexandru Ionut Tripon
05d7cc31bf
Merge pull request #1709 from Trial97/arch_build
...
Fix compatibility with Qt 6.6
2023-10-15 12:19:47 +01:00
Trial97
749975e8ef
made side and loaders visible to user
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-15 12:46:23 +03:00
Trial97
ab725eeb18
corected side and added loaders
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-15 11:52:28 +03:00
Sefa Eyeoglu
c498ad1787
Merge pull request #1711 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2023-10-15 08:55:36 +02:00
github-actions[bot]
4939a33456
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/2de1be5b51c3d6fa833f1c1f222dc867dd054b31' (2023-10-07)
→ 'github:nixos/nixpkgs/01441e14af5e29c9d27ace398e6dd0b293e25a54' (2023-10-11)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/66c352d33e0907239e4a69416334f64af2c685cc' (2023-10-05)
→ 'github:cachix/pre-commit-hooks.nix/42e1b6095ef80a51f79595d9951eb38e91c4e6ca' (2023-10-09)
2023-10-15 00:18:39 +00:00
Trial97
023b3e3c39
Fixed arch build
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-14 09:41:04 +03:00
Tayou
7015b8f7b2
Merge pull request #1563 from Trial97/modrinth_pack
...
Pack import fixes and improvements
2023-10-13 16:38:37 +02:00
Trial97
32eaaa25d9
removed the better release for modrinth modpacks
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-13 00:04:36 +03:00
Hazel
e66c3b9419
Add game category to generated Linux shortcuts
...
Signed-off-by: Hazel <hazel@theopensource.company >
2023-10-11 23:19:14 +02:00
Trial97
5d56ac7cf2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
2023-10-10 21:15:31 +03:00
Trial97
5f7513d61c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-10 19:49:40 +03:00
Trial97
0b6373e4df
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-10 19:46:27 +03:00
Alexandru Ionut Tripon
ca4b58d5d7
Merge pull request #1405 from Trial97/update_file
...
Allow updating managed packs from local file
2023-10-10 16:17:08 +01:00
Alexandru Ionut Tripon
4eb8db16f1
Merge pull request #1543 from Trial97/packwiz
...
refactor packwiz file write
2023-10-10 16:16:57 +01:00
Alexandru Ionut Tripon
a7842ecc33
Merge pull request #1591 from Trial97/ftb_import_fix
...
fix: make cached instead of file for ftb pack import
2023-10-10 16:16:40 +01:00
Alexandru Ionut Tripon
6150908025
Merge pull request #1658 from Trial97/neoforge_version
...
Added version check for neoforge filter
2023-10-10 16:16:21 +01:00
Trial97
5cb6d93136
fixed updater build
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-09 22:25:45 +03:00
Trial97
7e6a08548d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater
2023-10-09 19:58:43 +03:00
Sefa Eyeoglu
11a0241b5c
Merge pull request #1699 from GitMuslim/develop
2023-10-09 17:25:11 +02:00
Muslim
8eb8f167ab
oops
...
Signed-off-by: Muslim <42213155+GitMuslim@users.noreply.github.com >
2023-10-09 18:02:56 +03:00
Muslim
5f5214e5dd
add fullstop
...
Signed-off-by: Muslim <42213155+GitMuslim@users.noreply.github.com >
2023-10-09 17:00:57 +03:00
Trial97
8dd640819d
removed processEvents from ConcurrentTask
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-09 01:50:14 +03:00
Sefa Eyeoglu
04a7275280
Merge pull request #1695 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2023-10-08 09:31:17 +02:00
github-actions[bot]
05caa874bc
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'flake-compat':
'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17)
→ 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04)
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/7f53fdb7bdc5bb237da7fefef12d099e4fd611ca' (2023-09-01)
→ 'github:hercules-ci/flake-parts/c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4' (2023-10-03)
• Updated input 'flake-parts/nixpkgs-lib':
'github:NixOS/nixpkgs/3e52e76b70d5508f3cec70b882a29199f4d1ee85?dir=lib' (2023-08-31)
→ 'github:NixOS/nixpkgs/f5892ddac112a1e9b3612c39af1b72987ee5783a?dir=lib' (2023-09-29)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/bd9b686c0168041aea600222be0805a0de6e6ab8' (2023-09-29)
→ 'github:nixos/nixpkgs/2de1be5b51c3d6fa833f1c1f222dc867dd054b31' (2023-10-07)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/cb770e93516a1609652fa8e945a0f310e98f10c0' (2023-09-24)
→ 'github:cachix/pre-commit-hooks.nix/66c352d33e0907239e4a69416334f64af2c685cc' (2023-10-05)
2023-10-08 00:18:30 +00:00
Trial97
47dbb09115
Improvements to concurrent task
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-07 00:21:40 +03:00
Trial97
dc74ea7382
fixed wrong account selection
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-06 19:27:26 +03:00
Trial97
8d0a53273f
Add no_color env variable
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-06 18:42:54 +03:00
Alexandru Ionut Tripon
bca5e8f395
Update launcher/minecraft/PackProfile.cpp
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-10-06 16:16:03 +03:00
TheKodeToad
d49f81d132
Drop leftover mod loader settings
...
I messed up the merge.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-10-06 11:27:04 +01:00
Trial97
82461b1113
rename for windows
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-06 08:51:45 +03:00
Trial97
4f1ee85424
check for minecraft java runtime
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-06 00:21:37 +03:00
Trial97
b67c2c71d1
removed windows legacy builds
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-05 22:44:49 +03:00
Sefa Eyeoglu
a7bdfb5f6b
Merge pull request #1682 from romangraef/addmorejavas
...
Add more Java installation dirs
2023-10-05 00:44:16 +02:00
nea
c6c17036e3
Add more Java installation dirs
...
Signed-off-by: nea <nea@nea.moe >
2023-10-04 21:20:59 +02:00
Trial97
e913f61305
added a more strict condition for neoforge forge support
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-04 19:29:37 +03:00
Trial97
c78d4e7bb6
added version test for snapshot
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-04 19:16:21 +03:00
Tayou
024c474658
Merge pull request #1678 from Trial97/release_order
...
fixed quilt dependencies
2023-10-04 10:28:45 +02:00
Sefa Eyeoglu
03ad430699
Merge pull request #1537 from Trial97/warnings
2023-10-04 09:40:38 +02:00
Trial97
ac38585a2a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into release_order
2023-10-04 09:41:49 +03:00
Trial97
3cba5adb5a
updated dependency cycle
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-04 09:41:40 +03:00
Sefa Eyeoglu
d186c34385
Merge pull request #1676 from Trial97/release_order
...
revert back the release order
2023-10-04 07:43:21 +02:00
Trial97
77979b4c95
revert back the release order
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-03 17:23:26 +03:00
Trial97
8069de29b2
fix folder attributes on windows copy
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-02 21:53:08 +03:00
Tayou
540fc7d2a8
Merge pull request #1670 from Trial97/seg_fault
...
Don't update mods if no mod loader is installed
2023-10-02 17:05:07 +02:00
Sefa Eyeoglu
d612ab94a7
Merge pull request #1672 from Trial97/skin_refresh
...
refresh default account when list changes
2023-10-02 16:06:12 +02:00
Sefa Eyeoglu
bfa9613373
Merge pull request #1657 from Trial97/shader_txt
2023-10-02 11:56:50 +02:00
Trial97
93be8b0735
refresh default account when list changes
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-02 09:13:02 +03:00
Trial97
2cea7454ef
fix: do not update mods if no mod loader is selected
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-10-01 23:04:19 +03:00
cullvox
87f34f07d7
Merge branch 'develop' into components-resource-pack-fix
...
Signed-off-by: cullvox <68567525+cadenmiller@users.noreply.github.com >
2023-10-01 11:58:44 -04:00
Sefa Eyeoglu
eab1180f68
Merge pull request #1090 from Ryex/feat/acknowledge_release_type
2023-10-01 14:32:58 +02:00
Sefa Eyeoglu
e3a147f56d
Merge pull request #1656 from Trial97/remove_mojang2
2023-10-01 14:32:42 +02:00
Sefa Eyeoglu
898a719d3e
Merge pull request #1668 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2023-10-01 09:28:57 +02:00
github-actions[bot]
be8a9f6541
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/e12483116b3b51a185a33a272bf351e357ba9a99' (2023-09-21)
→ 'github:nixos/nixpkgs/bd9b686c0168041aea600222be0805a0de6e6ab8' (2023-09-29)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/4f883a76282bc28eb952570afc3d8a1bf6f481d7' (2023-09-10)
→ 'github:cachix/pre-commit-hooks.nix/cb770e93516a1609652fa8e945a0f310e98f10c0' (2023-09-24)
2023-10-01 00:19:50 +00:00
Sefa Eyeoglu
589ab24f7e
Merge pull request #1666 from getchoo/driverlink
...
[Linux] Use addOpenGLRunpath.driverLink in Nix wrapper
2023-09-30 23:50:36 +02:00
Alexandru Ionut Tripon
317c7b5544
Update launcher/minecraft/auth/AccountList.cpp
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-10-01 00:32:17 +03:00
Alexandru Ionut Tripon
00bbbdc6e9
Update launcher/LaunchController.cpp
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-10-01 00:31:51 +03:00
seth
84269f9596
refactor(nix): use addOpenGLRunpath.driverLink in wrapper
...
Signed-off-by: seth <getchoo@tuta.io >
2023-09-30 12:50:26 -04:00
Trial97
2e4fcd6aa3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-28 23:26:15 +03:00
Trial97
09a10a916b
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into netjob_retry
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-28 23:23:42 +03:00
Trial97
34294383eb
added version type to dep update
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-28 23:18:23 +03:00
Trial97
4802f6950e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-28 23:06:18 +03:00
Sefa Eyeoglu
531b58093e
Merge pull request #1263 from Trial97/develop
2023-09-28 22:03:14 +02:00
Sefa Eyeoglu
2ff9ef0620
Merge pull request #1363 from Trial97/download_threads
2023-09-28 22:02:57 +02:00
Trial97
5b7c5607a9
removed flame consturctor
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-28 22:53:40 +03:00
Trial97
9acbf98f94
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-28 22:50:12 +03:00
Trial97
bef701eba8
chaged folder again
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-28 21:27:11 +03:00
Trial97
742384909f
updated portable update
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-28 21:24:31 +03:00
Trial97
606c12ffeb
more fixing
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-28 18:47:21 +03:00
Trial97
498c9db1ce
fixed appImageUpdate
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-28 15:14:59 +03:00
Sefa Eyeoglu
59e565ef96
Merge pull request #1643 from bolli24/develop
2023-09-27 17:34:32 +02:00
seth
f370f0d749
chore: cleanup a few more mentions of mojang accounts
...
Signed-off-by: seth <getchoo@tuta.io >
2023-09-27 05:34:48 -04:00
Trial97
b8d9c3d779
format
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-26 20:19:35 +03:00
Trial97
ebde563648
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater
2023-09-26 20:16:46 +03:00
Trial97
4ee6a6711d
Added version check for neoforge filter
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-25 23:04:21 +03:00
Trial97
86b47b3421
Do not display invalid shaders
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-25 22:33:36 +03:00
Trial97
7c636d4608
Removed mojang
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-25 17:44:04 +03:00
TheKodeToad
0406e168e7
Merge pull request #1655 from 0xallie/minecraft-wiki-migration
...
Update links to Minecraft Wiki
2023-09-25 15:26:37 +01:00
alexia
1684cff7ac
Update links to Minecraft Wiki
...
Minecraft Wiki has officially moved from Fandom to their own wiki.
I updated some links I found in comments.
Signed-off-by: alexia <me@alexia.lol >
2023-09-25 15:49:12 +02:00
Sefa Eyeoglu
ad9fb7349f
Merge pull request #1647 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2023-09-24 09:02:43 +02:00
bolli24
14af7044be
Update launcher/ui/dialogs/ModUpdateDialog.cpp
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: bolli24 <9805065+bolli24@users.noreply.github.com >
2023-09-24 03:01:47 +02:00
github-actions[bot]
fa65ac3ff7
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nix-filter':
'github:numtide/nix-filter/ac030bd9ba98e318e1f4c4328d60766ade8ebe8b' (2023-09-04)
→ 'github:numtide/nix-filter/41fd48e00c22b4ced525af521ead8792402de0ea' (2023-09-16)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/46688f8eb5cd6f1298d873d4d2b9cf245e09e88e' (2023-09-15)
→ 'github:nixos/nixpkgs/e12483116b3b51a185a33a272bf351e357ba9a99' (2023-09-21)
2023-09-24 00:18:03 +00:00
bolli24
f3c089792a
Skip folders when updating mods.
...
Previously the mod updater would fail, reporting "The mod updater was aborted!", when trying to update a folder.
Signed-off-by: bolli24 <4827765-bolli24@users.noreply.gitlab.com >
2023-09-22 21:36:19 +02:00
Alexandru Ionut Tripon
81a3ba18bc
Update launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-09-20 18:45:23 +03:00
Sefa Eyeoglu
98bc102f5b
Merge pull request #1618 from getchoo/cool-nix-stuff
...
filter source in flake & add controller support
2023-09-20 07:47:22 +02:00
seth
97da8892b9
chore(nix): add meta.mainProgram attribute
...
Signed-off-by: seth <getchoo@tuta.io >
2023-09-19 16:41:40 -04:00
seth
97ced1f459
fix(nix): include libusb1 as a runtime dependency
...
Signed-off-by: seth <getchoo@tuta.io >
2023-09-19 16:41:37 -04:00
Trial97
a49851cb40
updated blocked mods with empty hash
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-19 15:48:12 +03:00
Sefa Eyeoglu
d72c3aba80
Merge pull request #1632 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2023-09-17 09:30:30 +02:00
github-actions[bot]
9afe80b0e0
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/b200e0df08f80c32974a6108ce431d8a8a5e6547' (2023-09-07)
→ 'github:nixos/nixpkgs/46688f8eb5cd6f1298d873d4d2b9cf245e09e88e' (2023-09-15)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa' (2023-08-17)
→ 'github:cachix/pre-commit-hooks.nix/4f883a76282bc28eb952570afc3d8a1bf6f481d7' (2023-09-10)
2023-09-17 00:18:04 +00:00
Sefa Eyeoglu
00af385619
Merge pull request #1572 from Trial97/catpacks2
2023-09-16 18:22:13 +02:00
Sefa Eyeoglu
bf6dc10f35
Merge pull request #1605 from TheKodeToad/flame-shaders
2023-09-16 18:20:45 +02:00
Trial97
0e41ceffc4
removed missed header
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-16 19:18:58 +03:00
Trial97
01e98a6ce8
simplify the raw json parsing
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
Fixed Tests
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-16 19:12:09 +03:00
cullvox
4053229544
DCO Remediation Commit for cullvox <cullvox@outlook.com>
...
I, cullvox <cullvox@outlook.com >, hereby add my Signed-off-by to this commit: c81689d393
Signed-off-by: cullvox <cullvox@outlook.com >
2023-09-15 20:55:34 -04:00
cullvox
07645984b5
Merge branch 'components-resource-pack-fix' of https://github.com/cadenmiller/PrismLauncher into components-resource-pack-fix
2023-09-15 20:41:27 -04:00
cullvox
c81689d393
fixes html elide issue with InfoFrame
2023-09-15 20:41:21 -04:00
cullvox
e96d0b6caf
DCO Remediation Commit for cullvox <cullvox@outlook.com>
...
I, cullvox <cullvox@outlook.com >, hereby add my Signed-off-by to this commit: ee7016fa54
Signed-off-by: cullvox <cullvox@outlook.com >
2023-09-13 14:31:04 -04:00
cullvox
ee7016fa54
use clang-format
...
Signed-off-by: cullvox <cullvox@outlook.com
2023-09-13 14:28:56 -04:00
cullvox
e1dda6c005
DCO Remediation Commit for cullvox <cullvox@outlook.com>
...
I, cullvox <cullvox@outlook.com >, hereby add my Signed-off-by to this commit: ddf0c28b1b
Signed-off-by: cullvox <cullvox@outlook.com >
2023-09-12 21:50:33 -04:00
cullvox
ddf0c28b1b
clang-format fixes
2023-09-12 21:45:29 -04:00
cullvox
a4e6530513
added tests, fixed issues with overriding/format
...
In the documentation it states that child values can override the parent
values. Originally this code did not support that but now it does. Also
added in testing inspired by the previous tests.
Signed-off-by: cullvox <cullvox@outlook.com >
2023-09-12 21:34:42 -04:00
cullvox
df88ccd419
clean up and add review suggestions, links open
...
Signed-off-by: cullvox <cullvox@outlook.com >
2023-09-11 15:49:01 -04:00
cullvox
b16085f66c
attempt to fix clang-format and ubuntu build.
...
Signed-off-by: cullvox <cullvox@outlook.com >
2023-09-11 02:05:05 -04:00
cullvox
fbe4043651
fix formatting and add more proper errors.
...
Signed-off-by: cullvox <cullvox@outlook.com >
2023-09-11 01:34:53 -04:00
cullvox
58bd6d929f
added formatting with colors.
...
This is somewhat dirty implementation and I will clean it up soon.
Using the HTML rich text features of Qt, made it much easier to
understand what was needed.
Signed-off-by: cullvox <cullvox@outlook.com >
2023-09-10 23:37:26 -04:00
seth
4cb424470b
Merge pull request #1619 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2023-09-10 15:57:03 -04:00
Trial97
9445a555e4
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into packwiz
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-10 16:24:59 +03:00
Trial97
47d1f23568
added side for modrinth mods
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-10 16:22:57 +03:00
cullvox
7a7c3015f4
fix not properly reading json text.
...
The text now displays properly in the GUI of Prism.
Signed-off-by: cullvox <cullvox@outlook.com >
2023-09-09 20:25:49 -04:00
github-actions[bot]
82a0a5bca1
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/bfb7dfec93f3b5d7274db109f2990bc889861caf' (2023-09-02)
→ 'github:nixos/nixpkgs/b200e0df08f80c32974a6108ce431d8a8a5e6547' (2023-09-07)
2023-09-10 00:17:57 +00:00
cullvox
1261908ef7
remove space for clang-format
...
Signed-off-by: cullvox <cullvox@outlook.com >
2023-09-09 19:55:55 -04:00
cullvox
ef1dc2afac
DCO Remediation Commit for cullvox <cullvox@outlook.com>
...
I, cullvox <cullvox@outlook.com >, hereby add my Signed-off-by to this commit: 05f4214cc5
Signed-off-by: cullvox <cullvox@outlook.com >
2023-09-09 19:50:59 -04:00
cullvox
05f4214cc5
fix clang-format failing
2023-09-09 19:50:13 -04:00
cullvox
04aa0155bf
DCO Remediation Commit for cullvox <cullvox@outlook.com>
...
I, cullvox <cullvox@outlook.com >, hereby add my Signed-off-by to this commit: d2e662ddbb
Signed-off-by: cullvox <cullvox@outlook.com >
2023-09-09 19:45:30 -04:00
cullvox
093d09efe3
fix style, and use qWarning instead of throw.
...
Signed-off-by: cullvox <cullvox@outlook.com >
2023-09-09 19:03:33 -04:00
seth
10192c540b
feat(nix): add source filtering
...
this - along with garnix - should mostly eliminate unneeded (re)builds
Signed-off-by: seth <getchoo@tuta.io >
2023-09-09 15:25:41 -04:00
seth
6aa821df9c
refactor(nix): match inputs value in flake
...
Signed-off-by: seth <getchoo@tuta.io >
2023-09-09 15:25:39 -04:00
seth
89e434bd5b
refactor(nix): don't concat final attr in fixed point
...
Signed-off-by: seth <getchoo@tuta.io >
2023-09-09 15:25:33 -04:00
cullvox
d2e662ddbb
added support for components in resource pack descriptions.
...
Signed-off-by: Caden Miller <me@cadenmiller.dev >
2023-09-09 12:35:34 -04:00
Sefa Eyeoglu
78f8a31cd6
Merge pull request #1613 from PrismLauncher/renovate/actions-cache-3.x
2023-09-08 23:28:03 +02:00
renovate[bot]
e7d6be531f
chore(deps): update actions/cache action to v3.3.2
2023-09-08 17:22:12 +00:00
Trial97
6ec1cf6e49
made skin upload more generic
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-08 19:50:46 +03:00
Trial97
8c8e4329d7
fix codeql
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-05 23:45:32 +03:00
Trial97
8bad255a91
added more import options
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-05 20:13:16 +03:00
Trial97
ab648e58ce
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
2023-09-05 00:18:45 +03:00
Trial97
c86b8b0f70
added skin manage dialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-05 00:18:36 +03:00
Sefa Eyeoglu
ba3a1b6280
Merge pull request #1606 from PrismLauncher/renovate/actions-checkout-4.x
2023-09-04 17:11:45 +02:00
Sefa Eyeoglu
d483b613b1
Merge pull request #1578 from TheKodeToad/antialiasing
2023-09-04 17:05:29 +02:00
Sefa Eyeoglu
cf599865f6
Merge pull request #1581 from getchoo/old-gcc
2023-09-04 17:04:10 +02:00
Sefa Eyeoglu
546d49e183
Merge pull request #1530 from Trial97/metadata_delete
2023-09-04 17:02:52 +02:00
renovate[bot]
7dd2530027
chore(deps): update actions/checkout action to v4
2023-09-04 15:02:01 +00:00
Sefa Eyeoglu
e9ecdd05b9
Merge pull request #1574 from Scrumplex/refactor-flake
2023-09-04 17:02:01 +02:00
Sefa Eyeoglu
ad6f15f293
Merge pull request #1604 from PrismLauncher/renovate/cachix-install-nix-action-23.x
2023-09-04 17:01:43 +02:00
TheKodeToad
94c1cd6bcf
CurseForge shader downloading
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-09-04 14:15:37 +01:00
renovate[bot]
e155844671
chore(deps): update cachix/install-nix-action action to v23
2023-09-04 10:22:11 +00:00
Sefa Eyeoglu
2918d61b16
refactor(nix): use pre-commit flake module
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-09-04 08:53:10 +02:00
seth
bbf4e3b04d
refactor(nix): use fixed points over rec
...
Signed-off-by: seth <getchoo@tuta.io >
2023-09-03 19:07:39 -04:00
Sefa Eyeoglu
caf925cbad
Merge pull request #1601 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2023-09-03 09:42:31 +02:00
github-actions[bot]
88f3e19f81
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/59cf3f1447cfc75087e7273b04b31e689a8599fb' (2023-08-01)
→ 'github:hercules-ci/flake-parts/7f53fdb7bdc5bb237da7fefef12d099e4fd611ca' (2023-09-01)
• Updated input 'flake-parts/nixpkgs-lib':
'github:NixOS/nixpkgs/9e1960bc196baf6881340d53dccb203a951745a2?dir=lib' (2023-08-01)
→ 'github:NixOS/nixpkgs/3e52e76b70d5508f3cec70b882a29199f4d1ee85?dir=lib' (2023-08-31)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/cddebdb60de376c1bdb7a4e6ee3d98355453fe56' (2023-08-27)
→ 'github:nixos/nixpkgs/bfb7dfec93f3b5d7274db109f2990bc889861caf' (2023-09-02)
2023-09-03 00:17:45 +00:00
TheKodeToad
19b5a5e00b
Remove final conflict - kept by mistake
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-09-02 22:38:14 +01:00
TheKodeToad
347228a246
Legacy settings override default -> false
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-09-02 22:29:26 +01:00
TheKodeToad
1213a5ab46
Merge remote-tracking branch 'upstream/develop' into skinfix
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-09-02 22:27:57 +01:00
TheKodeToad
179abfa03e
Resource provider column
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-09-01 22:05:44 +01:00
Trial97
9ad029e028
added skins directory
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-01 23:10:33 +03:00
Trial97
abbac5c26c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-01 22:28:59 +03:00
Trial97
17f696bffc
small tweaks to atl icons
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-01 22:25:15 +03:00
Trial97
e095780cc3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into modrinth_pack
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-01 21:36:28 +03:00
Trial97
609eaa67ab
refactored skin apis
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-01 21:23:51 +03:00
TheKodeToad
ad16d61208
Resource metadata writing
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-09-01 17:42:05 +01:00
TheKodeToad
c01e95b79c
Merge pull request #1592 from kumquat-ir/desktop-open-fix
...
Fix opening files from curseforge:// and file:// links etc on linux
2023-09-01 16:13:48 +01:00
kumquat-ir
984e870bca
actually it can handle multiple files just fine
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2023-09-01 10:32:35 -04:00
kumquat-ir
eb66e37b83
fix opening files from curseforge: links on linux
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2023-09-01 10:29:56 -04:00
Trial97
30ff417074
fix: make cached instead of file for ftb pack import
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-01 16:25:49 +03:00
TheKodeToad
6aecbfc38f
Fix crashes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-09-01 12:50:20 +01:00
TheKodeToad
ee48766996
More generalistaion for ResourceFolderModels
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-09-01 00:27:05 +01:00
Trial97
c2b03d0f71
Fully reload the instance list once the folder is changed
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-31 20:35:56 +03:00
TheKodeToad
93876e27f8
Generalise resource metadata
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-31 17:54:22 +01:00
Trial97
7e65aea2ef
format json
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-31 19:04:41 +03:00
Trial97
6cfe2dbc50
moved catpack data to testdata
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-31 17:34:05 +03:00
TheKodeToad
25ce11d85d
Merge pull request #1539 from Trial97/refactor_modpack_ux
...
Improvements to modpack UX
2023-08-31 14:58:54 +01:00
Sefa Eyeoglu
707da5a25a
fix(nix): include udev dependency
...
See https://github.com/NixOS/nixpkgs/pull/252425
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-30 21:59:42 +02:00
seth
584e800279
fix: remove -Wextra-semi
...
this flag is unavailable on gcc versions < 8. we could detect the
version of the compiler here, but i don't think we lose much in this
flags removal and this is a simpler option
Signed-off-by: seth <getchoo@tuta.io >
2023-08-30 11:14:49 -04:00
TheKodeToad
befa3baa6a
Merge branch 'develop' into feat/launcher-updater
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-30 11:47:33 +01:00
TheKodeToad
f23a8e4b4b
Enable antialiasing for mod and pack icons
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-29 23:34:19 +01:00
TheKodeToad
8c30cb3706
Fix CI
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-29 13:27:06 +01:00
TheKodeToad
c1855c6ce3
Merge branch 'develop' into rename-groups
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-29 12:41:40 +01:00
Sefa Eyeoglu
b83fdbd1b7
Merge pull request #1575 from TheKodeToad/more-pack-export-fixes
2023-08-28 22:18:58 +02:00
TheKodeToad
0e67686295
Hide index folder in pack export dialog
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-28 17:25:07 +01:00
TheKodeToad
e98bca4749
Fix cancelling pack save
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-28 17:09:40 +01:00
Sefa Eyeoglu
bdc2fca711
refactor(nix): don't instantiate nixpkgs
...
See https://zimbatm.com/notes/1000-instances-of-nixpkgs
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-28 15:18:10 +02:00
Trial97
211865a1e1
handle gracefully the upload abort
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-28 13:31:19 +03:00
Trial97
311e36b5d6
added new line
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-28 11:52:26 +03:00
Sefa Eyeoglu
fbf6833124
Merge pull request #1519 from TheKodeToad/better-export-pack
2023-08-28 10:29:32 +02:00
Sefa Eyeoglu
e4e4c4a430
Merge pull request #1573 from PrismLauncher/renovate/lock-file-maintenance
2023-08-28 10:14:45 +02:00
Sefa Eyeoglu
97d932db62
Revert "chore(deps): enable nix lockfile maintenance for renovate"
...
This reverts commit 5d14724e66 .
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-28 10:14:21 +02:00
Trial97
5d70f4dbca
removed if
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-28 08:50:10 +03:00
renovate[bot]
66cbbfec0c
chore(deps): lock file maintenance
2023-08-28 00:23:14 +00:00
Trial97
07d8598638
added catpacks tests
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-27 23:40:32 +03:00
Trial97
79652799bd
Made text smaller
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-27 21:30:46 +03:00
Trial97
630145a1d0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background
2023-08-27 21:03:21 +03:00
Trial97
0680d2dceb
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-27 20:41:56 +03:00
TheKodeToad
9110fbf282
Merge pull request #1560 from Trial97/curse_multiple_loaders2
...
Add suport for flame multiple loaders
2023-08-27 18:21:14 +01:00
TheKodeToad
e3b04d10cf
Merge pull request #1536 from Trial97/time3
...
Allow showing playtime in hours
2023-08-27 18:14:04 +01:00
Trial97
8c607ae734
removed extra if
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-27 20:02:12 +03:00
Trial97
c5aac24a93
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse_multiple_loaders2
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-27 15:53:35 +03:00
Trial97
4036cecfc0
Added progress widget to some modpack providers
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-27 15:04:42 +03:00
Sefa Eyeoglu
df14f88307
Merge pull request #1532 from Trial97/curseforge-url-handle
2023-08-27 12:26:57 +02:00
seth
29736b3b1f
Merge pull request #1570 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2023-08-27 01:47:58 -04:00
github-actions[bot]
9735e46a7e
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/ca3c9ac9f4cdd4bea19f592b32bb59b74ab7d783' (2023-08-19)
→ 'github:nixos/nixpkgs/c66ccfa00c643751da2fd9290e096ceaa30493fc' (2023-08-26)
2023-08-27 00:17:22 +00:00
TheKodeToad
479335dfe0
Rewrite optional mod dialog
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-27 00:50:33 +01:00
TheKodeToad
d1566f2610
Merge branch 'develop' into env-vars
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-26 23:12:02 +01:00
Trial97
a2d44744fe
do not update the metadata if mod is invalid
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-26 23:36:46 +03:00
Trial97
288d0d1fd4
Added back api loader filtering if just one is selected
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-26 22:26:01 +03:00
Trial97
abfd1a4205
minor dependency crash fix
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-25 18:35:25 +03:00
Sefa Eyeoglu
094cee8ec6
Merge pull request #1561 from Scrumplex/nix-miscs
2023-08-25 10:08:53 +02:00
Trial97
c54fecf5d9
added condition for empty loader type
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-25 09:05:04 +03:00
Trial97
172680abf8
removed aditional header
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-24 13:42:36 +03:00
Trial97
5f3e9672cd
made the loaders check more generic
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-24 13:31:57 +03:00
Trial97
f897b14e3e
changed technic icon name retrival
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-24 13:05:27 +03:00
Trial97
bb4b89470d
fixed icon importing
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-24 12:46:23 +03:00
Trial97
2990c5d0c9
Added optional mods dialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-24 12:44:11 +03:00
Trial97
ea384d59fb
use qt separtor for file path
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-24 12:41:37 +03:00
Sefa Eyeoglu
3e448904a3
Merge pull request #1562 from PrismLauncher/renovate/determinatesystems-update-flake-lock-20.x
...
chore(deps): update determinatesystems/update-flake-lock action to v20
2023-08-24 08:11:30 +02:00
renovate[bot]
783af2c06a
chore(deps): update determinatesystems/update-flake-lock action to v20
2023-08-24 04:32:25 +00:00
Trial97
6c0492c0d1
return 0 for any
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-23 21:09:32 +03:00
Trial97
1515607060
updated getMappedModLoader
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-23 20:16:51 +03:00
Sefa Eyeoglu
41bd008f5d
chore(nix): remove pre-commit tools from shell
...
use `pre-commit` CLI instead!
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-23 13:49:10 +02:00
Sefa Eyeoglu
d7b6450613
fix(nix): reload direnv if parts change
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-23 13:47:04 +02:00
Sefa Eyeoglu
85c23b26de
chore: reformat
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-23 13:46:23 +02:00
Sefa Eyeoglu
095de5ed4b
chore(nix): update clang-format to clang-tools 16
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-23 13:46:04 +02:00
Trial97
6178e5a975
reverted change for optional
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-23 13:55:38 +03:00
Trial97
aa065f2b51
Updated dependency resolution
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-23 13:28:23 +03:00
Sefa Eyeoglu
59ec0135d7
Merge pull request #1559 from Scrumplex/nix-canonicalize-jars
2023-08-23 12:23:26 +02:00
Sefa Eyeoglu
2283498ccb
Merge pull request #1552 from Trial97/memory_quick_setup
2023-08-23 11:56:53 +02:00
Trial97
e6ba2f4970
Added loaders check on versions load
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-23 12:52:51 +03:00
Sefa Eyeoglu
b93cd88292
fix(nix): add canonicalize-jars-hook
...
See https://github.com/NixOS/nixpkgs/pull/250757
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-23 11:52:32 +02:00
Trial97
f8f9ffa118
added loaders for flame version
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-23 11:33:45 +03:00
Trial97
4704c522e0
moved modloaderTypes to ModPlatform
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-23 10:26:57 +03:00
TheKodeToad
f7951f6082
Merge pull request #1548 from Trial97/version_label
...
Reset status label when deleting instance
2023-08-22 15:14:02 +01:00
Alexandru Ionut Tripon
eed7e996da
Update launcher/ui/widgets/JavaSettingsWidget.cpp
...
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-08-22 16:17:05 +03:00
Alexandru Ionut Tripon
06dbd381f8
Update launcher/ui/pages/instance/InstanceSettingsPage.cpp
...
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-08-22 16:16:57 +03:00
Alexandru Ionut Tripon
3574d89e0f
Update launcher/ui/pages/global/JavaPage.cpp
...
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-08-22 16:16:50 +03:00
TheKodeToad
0e96111116
Merge pull request #1556 from Trial97/metacache
...
Gracefully handle invalid cache metadata
2023-08-22 14:09:44 +01:00
Trial97
09aca7a0b5
Added warning to settings page
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-22 10:52:35 +03:00
Sefa Eyeoglu
b1783d8fb1
Merge pull request #1557 from Trial97/curse_crash
2023-08-21 23:04:45 +02:00
Trial97
c3d03f0c33
added check for valid query items in curse url install
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-21 22:20:33 +03:00
Trial97
7acfe36a62
fixed httpmetacache load
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-21 21:30:44 +03:00
Trial97
bf810053b7
updated instance copy
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-21 17:54:16 +03:00
Trial97
45dad27a6d
fixed check
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-21 17:46:50 +03:00
TheKodeToad
fff378b643
Merge pull request #1553 from TheKodeToad/list-fixes
...
A few boring list-related fixes
2023-08-21 15:33:16 +01:00
TheKodeToad
d7dadabfbf
List fixes
...
Double-click to toggle profile components.
Restore double-click to toggle resources.
Fix clicking on checkbox to select account.
Double-click to select account.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-21 14:44:46 +01:00
Trial97
1eb75b6852
fixed build
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-21 15:34:45 +03:00
Trial97
492bf373c6
updated memory allocation on quick setup
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-21 15:00:11 +03:00
Trial97
02264f67f3
Fixed codeql
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-21 14:15:51 +03:00
Sefa Eyeoglu
fcb436f1f4
Merge pull request #1551 from dannydorazio/develop
2023-08-21 08:29:25 +02:00
Danny Dorazio
e2e0a7af45
DCO Remediation Commit for Danny Dorazio <danny@dorazio.me>
...
I, Danny Dorazio <danny@dorazio.me >, hereby add my Signed-off-by to this commit: 8092c321a9
I, Danny Dorazio <danny@dorazio.me >, hereby add my Signed-off-by to this commit: 3638fc0a7d
I, Danny Dorazio <danny@dorazio.me >, hereby add my Signed-off-by to this commit: c50c3eaa94
Signed-off-by: Danny Dorazio <danny@dorazio.me >
2023-08-21 01:24:23 -04:00
Danny Dorazio
c50c3eaa94
DCO Remediation Commit for Danny Dorazio <hello@dorazio.me>
...
I, Danny Dorazio <hello@dorazio.me >, hereby add my Signed-off-by to this commit: 8092c321a9
I, Danny Dorazio <hello@dorazio.me >, hereby add my Signed-off-by to this commit: 3638fc0a7d
Signed-off-by: Danny Dorazio <hello@dorazio.me >
2023-08-21 01:21:48 -04:00
Danny Dorazio
3638fc0a7d
Update “Welcome” message on account list page
2023-08-20 23:00:50 -04:00
Danny Dorazio
8092c321a9
Replace instances of “Minecraft account”
2023-08-20 23:00:25 -04:00
Trial97
8e5be6f420
added suport for atlauncher browser download
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-21 00:09:46 +03:00
Trial97
19316e22b4
fixed status label after instance remove
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-20 22:46:44 +03:00
Sefa Eyeoglu
5c95448f1f
Merge pull request #1485 from getchoo/nix-darwin
2023-08-20 21:20:09 +02:00
Trial97
254444470f
renamed enum type
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-20 16:40:58 +03:00
TheKodeToad
0aaea9bf5d
Merge pull request #1547 from Scrumplex/revert-quilt-beacon
...
Remove Quilt Beacon toggle
2023-08-20 12:43:49 +01:00
Sefa Eyeoglu
5b4dcae7d9
Revert "feat: add toggle for quilt beacon"
...
This reverts commit 89aaedc06c .
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-20 13:23:11 +02:00
Sefa Eyeoglu
963627fe98
Revert "chore: better explain quilt loader beacon"
...
This reverts commit a2a09ffe01 .
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-20 13:23:08 +02:00
Sefa Eyeoglu
232bb568da
Merge pull request #1544 from PrismLauncher/update_flake_lock_action
2023-08-20 12:01:37 +02:00
github-actions[bot]
d3c7850f53
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/f0451844bbdf545f696f029d1448de4906c7f753' (2023-08-12)
→ 'github:nixos/nixpkgs/ca3c9ac9f4cdd4bea19f592b32bb59b74ab7d783' (2023-08-19)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/c5ac3aa3324bd8aebe8622a3fc92eeb3975d317a' (2023-08-11)
→ 'github:cachix/pre-commit-hooks.nix/7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa' (2023-08-17)
2023-08-20 00:16:56 +00:00
TheKodeToad
ebbc8838a8
Merge pull request #1541 from Trial97/neoforge_search
...
feat:neoforge can download forge mods
2023-08-19 23:10:56 +01:00
Trial97
d25e89a4c1
refactor packwiz file write
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-20 00:48:46 +03:00
TheKodeToad
f99b04bd16
Merge pull request #1320 from TheKodeToad/better-launch
...
Combine launch buttons in instance window, persist profiler
2023-08-19 11:08:02 +01:00
Sefa Eyeoglu
acf586ef82
chore: add fixme about UI code in Minecraftinstance
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-19 10:21:46 +02:00
Trial97
0138cd65cb
feat:neoforge can download forge mods
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-19 09:00:59 +03:00
Trial97
ab6301d5a1
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
2023-08-19 00:38:40 +03:00
Sefa Eyeoglu
3098aecf97
Merge pull request #1498 from Scrumplex/neoforge
2023-08-18 22:56:55 +02:00
Trial97
05094b7382
more fixes
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-18 22:24:30 +03:00
Trial97
58efd3e9e2
fixed code scaning
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-18 21:43:57 +03:00
Trial97
4c52b18bdd
replaced removeFirst with mid
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-18 20:19:51 +03:00
Trial97
44ff247f5f
feat:refactored modpack ux
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-18 20:03:02 +03:00
Trial97
fecc1e087a
Add Trial97 to contribuitors list
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-18 13:35:50 +03:00
Trial97
d3acac16e6
added -Wno-gnu-zero-variadic-macro-arguments and fixed more warnings
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-18 13:10:13 +03:00
Alexandru Ionut Tripon
28ffa8bf44
Update launcher/ui/pages/global/MinecraftPage.ui
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-08-18 12:57:08 +03:00
TheKodeToad
eb4efa5a9c
Merge pull request #1535 from Scrumplex/fix-skin-browse-btn
...
Fix browse button size in Skin Upload dialog
2023-08-18 10:47:42 +01:00
Trial97
6d1c67663d
feat:added option to show playtime in hours
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-18 12:24:28 +03:00
Sefa Eyeoglu
f4ebeedc21
fix: fix browse button size in skin upload dialog
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-18 09:01:57 +02:00
Trial97
907c2fd19c
added missing header
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-18 09:16:17 +03:00
Sefa Eyeoglu
be2888d6fb
chore: reformat
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-17 22:23:50 +02:00
Trial97
7ab391904a
Flame support for neoforge
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-17 22:23:34 +02:00
Sefa Eyeoglu
aac734d174
fix: add theoretical support for NeoForge in FTB modpacks
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-17 22:21:12 +02:00
TheKodeToad
ffd8ed550f
Reformat
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-17 18:53:32 +01:00
Trial97
c5bac475e8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
2023-08-17 17:29:57 +03:00
Sefa Eyeoglu
e88418ab7f
Merge pull request #1392 from Scrumplex/feat-native-override
2023-08-17 16:09:16 +02: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
bc0934a19c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curseforge-url-handle
2023-08-17 15:25:32 +03:00
Trial97
044ce4df32
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file
2023-08-17 15:24:14 +03:00
Trial97
758999fa64
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background
2023-08-17 15:23:22 +03:00
Trial97
71fd02e50e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into netjob_retry
2023-08-17 15:22:45 +03:00
Trial97
4a1d85f999
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
2023-08-17 14:23:37 +03:00
TheKodeToad
6da2e7d3f6
I was forced
...
/j
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-17 10:12:38 +01:00
Sefa Eyeoglu
85f36ebed7
Merge pull request #981 from Ryex/curseforge-url-handle
2023-08-17 09:24:35 +02:00
Trial97
f8ffb14619
Merge branch 'curseforge-url-handle' of github.com:Trial97/PrismLauncher into curseforge-url-handle
2023-08-17 00:25:38 +03:00
Trial97
5e2d1ffdfb
removed line
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-17 00:23:53 +03:00
TheKodeToad
3e2733d840
Merge branch 'develop' into better-launch
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-16 22:23:38 +01:00
Trial97
bad44ea264
feat:added flame install mod metadata
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-17 00:14:49 +03:00
Trial97
f0da16a758
removed line
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-17 00:13:12 +03:00
Trial97
b0e197de38
removed warning for one mod selected
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-16 21:26:43 +03:00
Alexandru Ionut Tripon
6c2c724bd9
Update launcher/ui/pages/instance/ExternalResourcesPage.ui
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-08-16 21:03:09 +03:00
Sefa Eyeoglu
c88088c91a
Merge pull request #1524 from PrismLauncher/renovate/korthout-backport-action-1.x
2023-08-16 19:28:41 +02:00
Trial97
f919d363b7
made safe for vegetarians
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-16 20:02:32 +03:00
Trial97
589d8b6923
feat:Added remove metadata button
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-16 19:53:39 +03:00
Trial97
8fbc665acb
Added UserData as another posible path for portable builds
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-16 18:28:46 +03:00
TheKodeToad
f3baa420b2
Fix broken tab order
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-16 13:45:22 +01:00
TheKodeToad
8778313170
Merge remote-tracking branch 'upstream/develop' into feature/java-downloader
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-16 13:39:14 +01:00
Sefa Eyeoglu
a5e7aedb4f
Merge pull request #1523 from Trial97/atlauncher
...
Fix crash when installing some ATLauncher packs
2023-08-16 07:18:34 +02:00
Trial97
c41c39b5d8
cleanup the mod name checking
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-15 23:55:09 +03:00
Trial97
fa164aa081
rename to GenericProfiler
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-15 22:18:28 +03:00
Trial97
f7f7bc6865
Removed update disabled warning
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-15 20:52:17 +03:00
Trial97
c28d9161cf
added unused
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-15 18:54:22 +03:00
Trial97
748a644e2c
added wait profiler
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-15 18:50:32 +03:00
renovate[bot]
07f25d6cca
chore(deps): update korthout/backport-action action to v1.4.0
2023-08-15 14:19:42 +00:00
Trial97
c22eec8f27
fixed crash on atlauncher pack install
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-15 17:03:51 +03:00
Trial97
1faf741004
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-15 13:29:42 +03:00
TheKodeToad
8cff7c4de6
Merge branch 'develop' into rename-groups
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-15 11:03:19 +01: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
42a6c670c7
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-15 12:52:59 +03:00
Trial97
cf27d2f9ab
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-15 12:49:21 +03:00
Trial97
6c362afc21
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-15 12:41:46 +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
62c14cea2a
fix: allow NeoForge in resource APIs
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-15 11:06:14 +02:00
Sefa Eyeoglu
01c3750835
feat: support NeoForge mrpack modpacks
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-15 11:06:14 +02:00
Sefa Eyeoglu
52e5ee7111
feat: add NeoForge to UIs
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-15 11:06:14 +02:00
Sefa Eyeoglu
3a0aa353cc
feat: add NeoForge to ModLoaderType
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-15 11:06:13 +02:00
Sefa Eyeoglu
8f5bb982cd
Merge pull request #1513 from lumiscosity/fix/skin_transparency_bug
2023-08-15 10:54:07 +02:00
Sefa Eyeoglu
a360ddbe0b
Merge pull request #1508 from comp500/fix/allow-empty-lines
2023-08-15 10:53:43 +02:00
Sefa Eyeoglu
06aba530d7
fix: add missing header
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-15 10:52:40 +02:00
Sefa Eyeoglu
c2d6a137ab
fix: only add native library overrides if files exist
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-15 10:52:08 +02:00
Sefa Eyeoglu
b927e58126
fix: improve debug message
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-15 10:52:08 +02:00
Sefa Eyeoglu
f1c3da6583
fix: fix typo
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-15 10:52:08 +02:00
Sefa Eyeoglu
4c446ccd50
fix: remove meta OpenAL workaround
...
LWJGL 2 doesn't have a separate zip for OpenAL. So there is no reason
for this code.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-15 10:51:48 +02:00
Sefa Eyeoglu
83aa0062c7
feat: add custom native library path settings
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-15 10:51:21 +02:00
Sefa Eyeoglu
ff67fd10c3
feat: implement override for GLFW/OpenAL with split natives
...
Fixes PrismLauncher/PrismLauncher#513
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-15 10:50:38 +02:00
Sefa Eyeoglu
7ba1e7d356
Merge pull request #1407 from TheKodeToad/icon-indexing
2023-08-15 10:43:29 +02:00
Sefa Eyeoglu
f533173b95
Merge pull request #1516 from Trial97/abort_connect
2023-08-15 10:40:12 +02:00
Sefa Eyeoglu
14d5fd7edb
Merge pull request #1520 from PrismLauncher/update_flake_lock_action
2023-08-15 10:39:08 +02:00
Sefa Eyeoglu
740ca54c87
Merge pull request #1462 from getchoo/labels
2023-08-15 10:38:28 +02:00
Sefa Eyeoglu
6ce7e426d2
chore: reformat
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-15 10:38:04 +02:00
Sefa Eyeoglu
0c753619a4
Merge pull request #1467 from Scrumplex/update-nix-docs
2023-08-15 10:36:38 +02:00
Sefa Eyeoglu
4b06255cc2
Merge pull request #1486 from PrismLauncher/staging
2023-08-15 10:36:09 +02: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
779f70057b
Merge commit 'ce2ca1381519a2e261d7f76dffa874d559d979c2' into staging
2023-08-14 18:16:13 +02:00
TheKodeToad
a44cb6430e
Merge pull request #1107 from Ryex/chore/add-compiler-warnings
...
Introduce more strict compiler warnings and fix them
2023-08-13 13:10:58 +01:00
github-actions[bot]
1aadaa208d
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/0d2fb29f5071a12d7983319c2c2576be6a130582' (2023-08-05)
→ 'github:nixos/nixpkgs/f0451844bbdf545f696f029d1448de4906c7f753' (2023-08-12)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/3139c4d1f7732cab89f06492bdd4677b877e3785' (2023-08-05)
→ 'github:cachix/pre-commit-hooks.nix/c5ac3aa3324bd8aebe8622a3fc92eeb3975d317a' (2023-08-11)
2023-08-13 00:16:46 +00:00
TheKodeToad
6d070e8607
"Format"
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-12 21:50:02 +01:00
TheKodeToad
983c943eef
Merge branch 'develop' into quick-play
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-12 21:48:41 +01:00
TheKodeToad
5056a51c18
Improvements and refinements to pack export
...
- Persist fields
- Toggle optional files
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-12 21:20:51 +01:00
TheKodeToad
3c209ba502
theme -> catpacks
...
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-12 19:04:34 +01:00
Trial97
71890707c0
format and apply the sugestion
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-12 13:08:39 +03:00
Alexandru Ionut Tripon
b3b2e9df35
Merge branch 'develop' into feat/acknowledge_release_type
...
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-08-12 12:42:30 +03:00
Sefa Eyeoglu
3aba7f8fec
Merge pull request #1518 from Scrumplex/asan-develop
2023-08-12 11:38:01 +02:00
Alexandru Ionut Tripon
d6e4fe7c1f
Update CMakeLists.txt
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-08-12 11:29:08 +02:00
Trial97
c9d628bf18
revert asan on debug on by default
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-12 11:29:08 +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
019e5ca3e8
fix: use ApiDownload for CF URL handling
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-12 11:11:58 +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
44153a28e3
Merge pull request #1517 from Trial97/revert_asan
2023-08-12 10:57:29 +02:00
Alexandru Ionut Tripon
bcf0635efd
Update CMakeLists.txt
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-08-12 10:55:53 +02:00
Trial97
92dbe1684e
revert asan on debug on by default
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-12 10:55:53 +02:00
seth
7879091cea
Merge pull request #1512 from Trial97/curseforge_import
...
Fix importing Quilt/Fabric packs from CurseForge
2023-08-11 10:16:17 -04:00
Sefa Eyeoglu
73adac2501
fix: use QColorConstants in Qt 5.14+
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-11 15:57:12 +02:00
Trial97
d801151d5c
connect the abort signal in concurent task
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-11 15:41:41 +03: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
396f812496
Merge pull request #1230 from TheKodeToad/better-component-installation
...
Revamp loader installation UI
2023-08-11 08:24:14 +02:00
TheKodeToad
f6d8c9659c
Rework
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-11 00:39:05 +01:00
TheKodeToad
e2d77f21ba
More system properties because yes!! 🎉
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-11 00:02:48 +01: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
8140374e26
chore: add licensing info to loader logos
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-10 20:18:28 +02:00
Sefa Eyeoglu
d67277a668
chore: replace LiteLoader logo with high quality version
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-10 20:18:16 +02:00
maple!
97ef8e8d0e
Fix transparency in skin icon
...
QPainter has a bug where drawing transparency to a freshly initialized, empty QPixmap causes garbage data to be drawn. This broke the rendering of the skin icon. The fix is simply to fill the QPixmap with empty transparent pixels beforehand.
Signed-off-by: maple! <averyrudelphe@gmail.com >
2023-08-10 15:32:47 +02:00
Sefa Eyeoglu
2090f958c8
Merge pull request #1324 from leia-uwu/ui-tweaks
2023-08-10 12:24:41 +02:00
Sefa Eyeoglu
8731f4ba27
chore: add comment about _kde_side_panel_view
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-10 12:24:33 +02:00
Trial97
b3da35be74
Fixed curseforge import
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-10 12:19:38 +03:00
comp500
1c3449e5a2
Remove unnecessary #if
...
Signed-off-by: comp500 <comp500@users.noreply.github.com >
2023-08-09 23:04:44 +01:00
comp500
a351d1834a
Allow empty lines in log output
...
Preserving empty lines in the game log ensures that crash reports and debugging information has necessary whitespace - the previous behaviour made crash reports hard to read.
Signed-off-by: comp500 <comp500@users.noreply.github.com >
2023-08-09 20:48:02 +01:00
Sefa Eyeoglu
31ffe79a29
Merge pull request #1505 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x
...
chore(deps): update hendrikmuhs/ccache-action action to v1.2.10
2023-08-09 07:32:11 +02:00
renovate[bot]
d9cd6f9c50
chore(deps): update hendrikmuhs/ccache-action action to v1.2.10
2023-08-08 18:20:26 +00:00
TheKodeToad
e079cbb055
Fix actions
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-07 13:51:26 +01:00
Sefa Eyeoglu
7004388105
Merge pull request #1227 from Ryex/packaging/appimage-updates
2023-08-07 13:18:06 +02:00
Tayou
9afa7cc91f
Merge branch 'develop' into icon-indexing
...
Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com >
2023-08-07 10:32:38 +02:00
Rachel Powers
9a9a4fcfd4
Apply suggestions from code review
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-08-06 13:16:30 -07:00
Sefa Eyeoglu
74fe2fb2a6
Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle
2023-08-06 21:54:00 +02:00
seth
eeb5fdbc9f
feat(nix): add darwin support
...
Signed-off-by: seth <getchoo@tuta.io >
2023-08-06 15:52:32 -04:00
Sefa Eyeoglu
a83e5be8f2
fix: makeShared for QByteArray
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-06 21:51:03 +02:00
seth
75c7df46a7
Merge pull request #1493 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2023-08-06 15:41:48 -04:00
seth
efaf4024ab
Merge pull request #1464 from Ryex/fix/windows-console-attach
...
[Windows] Fix attaching logs to console
2023-08-06 15:37:44 -04:00
Sefa Eyeoglu
99fd1e622c
chore: replace fabricmc icons with SVG
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-06 17:46:33 +02:00
github-actions[bot]
37e5f6af48
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/8e8d955c22df93dbe24f19ea04f47a74adbdc5ec' (2023-07-04)
→ 'github:hercules-ci/flake-parts/59cf3f1447cfc75087e7273b04b31e689a8599fb' (2023-08-01)
• Updated input 'flake-parts/nixpkgs-lib':
'github:NixOS/nixpkgs/4bc72cae107788bf3f24f30db2e2f685c9298dc9?dir=lib' (2023-06-29)
→ 'github:NixOS/nixpkgs/9e1960bc196baf6881340d53dccb203a951745a2?dir=lib' (2023-08-01)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/d2b52322f35597c62abf56de91b0236746b2a03d' (2023-07-29)
→ 'github:nixos/nixpkgs/0d2fb29f5071a12d7983319c2c2576be6a130582' (2023-08-05)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/1e2443dd3f669eb65433b2fc26a3065e05a7dc9c' (2023-07-29)
→ 'github:cachix/pre-commit-hooks.nix/3139c4d1f7732cab89f06492bdd4677b877e3785' (2023-08-05)
2023-08-06 00:17:51 +00:00
Sefa Eyeoglu
5b8c997180
Merge pull request #1456 from Trial97/icons
2023-08-05 22:50:52 +02:00
Sefa Eyeoglu
7c547f6452
Merge pull request #1370 from Trial97/pack_changelog
2023-08-05 22:50:38 +02:00
Trial97
f7e8ec1855
format files
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-05 21:17:38 +03:00
Trial97
72de2d5254
Added missing header
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-05 21:08:16 +03:00
TheKodeToad
f25d0a4e0e
Merge branch 'develop' into env-vars
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-05 18:01:53 +01:00
Trial97
1d3f2674d1
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-05 19:21:37 +03:00
Trial97
f9ebcb5d2e
Merge branch 'refactor/net-split-headers-to-proxy-class' of https://github.com/Ryex/PrismLauncher into refactor/NetActions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-05 19:16:57 +03: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
b2fdd83594
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-05 19:09:10 +03:00
Trial97
24b47e4ec6
Merge branch 'fail_concurrent_task' of github.com:Trial97/PrismLauncher into fail_concurrent_task
2023-08-05 19:06:26 +03:00
Trial97
5981e7815a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task
2023-08-05 19:06:01 +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
d936b25868
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-05 19:04:15 +03:00
Trial97
e7c2274893
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file
2023-08-05 19:02:11 +03:00
Trial97
377fc0352a
Merge branch 'staging' of https://github.com/PrismLauncher/PrismLauncher into icons
2023-08-05 19:00:12 +03: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
304e294ea7
Merge pull request #1102 from Ryex/refactor/net-split-headers-to-proxy-class
2023-08-04 20:31:43 +02:00
Sefa Eyeoglu
ae793f6cf1
Merge pull request #1459 from Scrumplex/format
2023-08-04 19:42:36 +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
seth
50c7d39e08
Merge pull request #1483 from DioEgizio/update-qt652
...
[macOS,Windows] Update to Qt 6.5.2
2023-08-04 12:05:45 -04:00
TheKodeToad
c5bffed21e
Merge branch 'PrismLauncher:develop' into skinfix
2023-08-04 16:29:30 +01:00
TheKodeToad
d48dd7eb6a
Use override-based setting for online fixes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-04 16:00:02 +01:00
DioEgizio
b013133cc1
chore: update to qt 6.5.2
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2023-08-03 09:24:47 +02:00
TheKodeToad
1bafa36c17
icon -> iconName
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-02 20:33:01 +01:00
TheKodeToad
afaf6f894c
Merge branch 'PrismLauncher:develop' into better-component-installation
2023-08-02 20:27:37 +01:00
TheKodeToad
8b3c465a50
Use protected inheritance for BasePageProvider
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-02 20:24:15 +01:00
TheKodeToad
40c614b3a5
Pressed -> Clicked (doh)
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-02 20:23:30 +01:00
Sefa Eyeoglu
ac36a2289f
Merge pull request #1452 from getchoo/sparkle-disable
2023-08-02 19:28:01 +02:00
Sefa Eyeoglu
fa2b784f7e
Merge branch 'develop' into sparkle-disable
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-02 19:27:48 +02:00
Sefa Eyeoglu
01e17806f6
Merge pull request #1391 from Trial97/prism_export2
2023-08-02 19:27:14 +02:00
Sefa Eyeoglu
f561e7febf
Merge pull request #1476 from Scrumplex/fix-saving-metaurl
2023-08-02 19:24:24 +02:00
Sefa Eyeoglu
39d4f0df66
fix: don't reset meta url on launch
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-02 18:56:54 +02:00
Sefa Eyeoglu
1d468ac35a
chore: reformat
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-02 18:35:35 +02:00
Sefa Eyeoglu
ce2ca13815
fix: add missing headers
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-02 18:35:08 +02:00
TheKodeToad
f256b836f4
Make more options generic
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-02 18:35:08 +02:00
TheKodeToad
71fb38c91f
Fix alignment properties
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-02 18:35:08 +02:00
Sefa Eyeoglu
076c189948
fix: format all languages using clang-format
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-02 18:35:08 +02:00
Sefa Eyeoglu
9f66f6495a
fix: fix undisciplined multiple inheritance
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-02 18:35:07 +02:00
Sefa Eyeoglu
c07a857359
fix: remove irregular enum initialization
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-02 18:35:07 +02:00
Sefa Eyeoglu
76df836378
fix: simplify switch statement
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-02 18:35:07 +02:00
Sefa Eyeoglu
a545f67a21
fix: take JavaCheckResult by const reference
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-02 18:35:07 +02:00
Sefa Eyeoglu
9d5818916a
fix(nix): enable clang-format
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-02 18:35:07 +02:00
Sefa Eyeoglu
ea56ff255d
Merge pull request #1339 from TheKodeToad/remove-direct-launch
2023-08-02 18:31:27 +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
Sefa Eyeoglu
39d7bc6c24
Merge pull request #1294 from ashuntu/develop
2023-08-02 18:24:54 +02:00
ashuntu
6a7f63166d
DCO Remediation Commit for ashuntu <101582426+ashuntu@users.noreply.github.com>
...
I, ashuntu <101582426+ashuntu@users.noreply.github.com >, hereby add my Signed-off-by to this commit: 10678096e5
I, ashuntu <101582426+ashuntu@users.noreply.github.com >, hereby add my Signed-off-by to this commit: 51d7a6289e
I, ashuntu <101582426+ashuntu@users.noreply.github.com >, hereby add my Signed-off-by to this commit: 1467072f3d
Signed-off-by: ashuntu <101582426+ashuntu@users.noreply.github.com >
2023-08-02 10:04:53 -05:00
Rachel Powers
bae59a8c07
refactor(windows console): reduce code duplication
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-08-02 06:19:43 -07:00
TheKodeToad
bb039d4bc7
Merge pull request #1445 from Trial97/curse
...
feat: removed flame quilt warning
2023-08-02 12:55:49 +01:00
Sefa Eyeoglu
92b2f463e3
Merge pull request #1474 from apix0n/develop
2023-08-02 12:08:34 +02:00
Apix
16e6a01881
fix: fix copyright year
...
Signed-off-by: Apix <apix0n@outlook.com >
2023-08-02 11:35:54 +02:00
Rachel Powers
81bc9e488f
DCO Remediation Commit for Rachel Powers <508861+Ryex@users.noreply.github.com>
...
I, Rachel Powers <508861+Ryex@users.noreply.github.com >, hereby add my Signed-off-by to this commit: b4ae6e9774
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-08-01 20:27:39 -07:00
Rachel Powers
e64e4d7ef7
Fix: always false comparison
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-08-01 18:57:35 -07:00
Rachel Powers
f19e8dd086
Apply suggestions from code review
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-08-01 18:53:51 -07:00
Rachel Powers
b4ae6e9774
fix(compiler warnings): suppress omtimisation flag conflict warnings. leave optimisation to Byild type defaults
...
- enable ASan for RelWithDebInfo builds
2023-07-31 23:25:49 -07:00
Rachel Powers
5a9f780cf8
fix(FlameInstanceCreationTask): include Net::Apidownload
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-31 22:36:13 -07: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
Sefa Eyeoglu
d8f2a1354f
chore: update Nix docs
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-07-31 19:16:32 +02:00
TheKodeToad
b572f75dba
Merge branch 'PrismLauncher:develop' into icon-indexing
2023-07-31 14:40:27 +01:00
Rachel Powers
14e16db01e
refactor(filelink): drop moved funciton
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-30 16:02:37 -07:00
Rachel Powers
7091bc81c2
chore(rename): fix unfinshed renames from deshadow changes
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-30 15:56:38 -07:00
Rachel Powers
1e947ca893
fix(flame creation task): import ApiDownload
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-30 15:42:15 -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
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
760b80934f
fix(filelink exe): add console sources
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-30 15:22:18 -07:00
Rachel Powers
6d564628b7
fix(FileLink): drop FreeConsole
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-30 15:11:00 -07:00
Rachel Powers
f03924478b
Merge branch 'fix/windows-console-attach' into feat/launcher-updater
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
# Conflicts:
# launcher/Application.cpp
# launcher/CMakeLists.txt
# launcher/filelink/FileLink.cpp
2023-07-30 14:30:16 -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
Rachel Powers
a7ef663735
fix(windows console): use new logic in FileLink exe
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-30 14:03:20 -07:00
Rachel Powers
186211244d
refactor(windows console): move to external file
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-30 13:38:47 -07:00
Rachel Powers
5740ee0444
fix(windows console): properly bind windows console
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-30 13:38:47 -07:00
seth
945939ba68
chore(actions): add new labels to update-flake
...
Signed-off-by: seth <getchoo@tuta.io >
2023-07-30 04:46:44 -04:00
seth
9137721e8e
Merge pull request #1461 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2023-07-30 04:45:10 -04:00
Sefa Eyeoglu
566425166b
Merge pull request #1449 from Trial97/tehnic
...
Reintroduce parsing of INI files
2023-07-30 09:47:40 +02:00
github-actions[bot]
d1513732be
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/f465da166263bc0d4b39dfd4ca28b777c92d4b73' (2023-07-22)
→ 'github:nixos/nixpkgs/d2b52322f35597c62abf56de91b0236746b2a03d' (2023-07-29)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/eb433bff05b285258be76513add6f6c57b441775' (2023-07-18)
→ 'github:cachix/pre-commit-hooks.nix/1e2443dd3f669eb65433b2fc26a3065e05a7dc9c' (2023-07-29)
2023-07-30 00:20:33 +00:00
ashuntu
1467072f3d
Removed snapcraft.yaml in favor of dedicated repo: https://github.com/ashuntu/prismlauncher-snap
2023-07-28 16:25:32 -05:00
Ash
d133b40b25
Merge branch 'PrismLauncher:develop' into develop
2023-07-28 21:22:35 +00:00
TheKodeToad
5538c1d0af
Fix compilation (actually this time!), incorporating new changes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-28 15:11:24 +01:00
TheKodeToad
d4ea9c2717
Merge branch 'develop' into feature/java-downloader
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-28 14:50:59 +01:00
TheKodeToad
ce6a36c8b5
Deduplicate fix
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-28 14:31:58 +01:00
Trial97
c3eb17db74
removed unneded if condition
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-28 13:22:04 +03:00
Trial97
4789708cc2
added missing )
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-28 13:16:57 +03:00
Alexandru Ionut Tripon
83fce74bb1
Update launcher/ui/dialogs/NewInstanceDialog.cpp
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-07-28 13:11:56 +03:00
Trial97
fcac98b367
removed comment
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-28 10:05:22 +03:00
Trial97
97ff7afbe7
keep the icon suffix
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-28 08:37:45 +03:00
Trial97
7e58b965b7
refactor icon list
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-28 01:20:05 +03:00
Trial97
1ca7e5efe9
added license header
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-28 01:20:05 +03:00
Trial97
d460986de0
format
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-28 01:20:05 +03:00
Sefa Eyeoglu
bdec11c501
Merge pull request #1437 from LostLuma/instance-export-ignore-caches-2
2023-07-27 09:40:31 +02:00
Sefa Eyeoglu
b1aa9e5846
refactor: introduce internal Launcher_ENABLE_UPDATER variable
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-07-27 09:37:56 +02:00
seth
51bfda937d
chore: don't include sparkle when not enabled
...
Signed-off-by: seth <getchoo@tuta.io >
2023-07-27 02:19:21 -04:00
LostLuma
4a9ea832ff
Ignore cache files entirely, also apply to modpack export
...
Signed-off-by: LostLuma <lilly@lostluma.net >
2023-07-27 01:42:14 +02:00
seth
a8498b0dab
chore: make INSTALL_BUNDLE a cached variable
...
Signed-off-by: seth <getchoo@tuta.io >
2023-07-26 19:03:14 -04:00
seth
48e5040196
feat: disable sparkle when update url is empty
...
Signed-off-by: seth <getchoo@tuta.io >
2023-07-26 19:01:39 -04:00
seth
928e18b66d
Merge pull request #1446 from getchoo/nix-fixes
...
disable darwin in flake + cleanup garnix.yaml + fix markdownlint warnings
2023-07-26 17:10:07 -04: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
Trial97
62aa7a52c4
fiexed conflicts
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-27 00:07:38 +03:00
Trial97
3c472fd7e0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2
2023-07-27 00:05:59 +03:00
Trial97
b15f689ccf
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
2023-07-27 00:03:42 +03:00
Sefa Eyeoglu
d960effb99
Merge pull request #1447 from getchoo/typomoment
...
fix: typo in task.h
2023-07-26 22:56:31 +02: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
Alexandru Ionut Tripon
31b62203a7
Update launcher/ui/MainWindow.cpp
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-07-26 23:44:35 +03:00
seth
af59c41713
fix: typo in task.h
...
Signed-off-by: seth <getchoo@tuta.io >
2023-07-26 16:20:30 -04:00
seth
f7ffbcca6c
chore(docs): correct markdownlint warnings
...
Signed-off-by: seth <getchoo@tuta.io >
2023-07-26 14:49:09 -04:00
seth
342a0d0091
fix(nix): disable x86_64-darwin
...
Signed-off-by: seth <getchoo@tuta.io >
2023-07-26 14:49:09 -04:00
seth
1974bb7e59
chore(ci): cleanup garnix.yaml
...
Signed-off-by: seth <getchoo@tuta.io >
2023-07-26 14:49:05 -04:00
Trial97
e6b4fc9182
removed quilt warning
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-26 21:36:40 +03:00
Trial97
c778dcbc9c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
2023-07-26 21:33:15 +03:00
Sefa Eyeoglu
a0944dab7a
Merge pull request #1438 from Scrumplex/update-docs
2023-07-26 20:30:04 +02:00
TheKodeToad
719d87de3b
Update MainWindow.ui
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-26 17:21:12 +01:00
TheKodeToad
816acc9c76
Open catpak folder action
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-26 17:19:39 +01:00
LostLuma
a9fefb2eeb
Address review comments
...
Signed-off-by: LostLuma <lilly@lostluma.net >
2023-07-26 15:22:22 +02:00
Sefa Eyeoglu
4ad448993c
fix: fix typo in README
...
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com >
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-07-26 14:48:53 +02:00
Sefa Eyeoglu
bcadffa0e3
Merge pull request #1434 from getchoo/garnix
2023-07-26 14:47:14 +02:00
TheKodeToad
ce2d2c9f32
Merge pull request #1427 from tjw123hh/develop
...
Add some missing strings to translations
2023-07-26 13:41:54 +01:00
Sefa Eyeoglu
6f652e1d2f
chore: update information for downstreams
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-07-26 14:38:34 +02:00
LostLuma
361583edfc
Ignore cache files when exporting instances
...
Signed-off-by: LostLuma <lilly@lostluma.net >
2023-07-26 04:23:01 +02:00
seth
fbf29274e8
chore(ci): remove nix job
...
we're using garnix now
Signed-off-by: seth <getchoo@tuta.io >
2023-07-25 19:23:17 -04:00
seth
3c35d647b8
feat(ci): init garnix.yaml
...
Signed-off-by: seth <getchoo@tuta.io >
2023-07-25 19:18:30 -04:00
TheKodeToad
b4159d30fc
Revert permission change
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-25 15:17:20 +01:00
tjw123hh
f843d0732b
Merge branch 'develop' of https://github.com/tjw123hh/PrismLauncher into develop
2023-07-25 17:36:38 +08:00
tjw123hh
280f041acb
Delete some incorrect notr="true" tags
...
Signed-off-by: tjw123hh <tjw123hh@outlook.com >
2023-07-25 17:35:31 +08:00
Sefa Eyeoglu
4f00012268
Merge pull request #1426 from TheKodeToad/token-censor-fix
2023-07-24 20:41:23 +02:00
tjw123hh
4ab630b832
Update org.prismlauncher.PrismLauncher.desktop.in
...
Signed-off-by: tjw123hh <56749271+tjw123hh@users.noreply.github.com >
2023-07-24 20:50:11 +08:00
tjw123hh
a32ca43288
DCO Remediation Commit for tjw123hh <tjw123hh@outlook.com>
...
I, tjw123hh <tjw123hh@outlook.com >, hereby add my Signed-off-by to this commit: 6a01c277e8
Signed-off-by: tjw123hh <tjw123hh@outlook.com >
2023-07-24 20:48:27 +08:00
TheKodeToad
f505d43fc0
Fix token "0" being replaced
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-24 13:43:26 +01:00
tjw123hh
6a01c277e8
Delete some incorrect tags
2023-07-24 20:41:22 +08:00
Sefa Eyeoglu
684c2ec47a
Merge pull request #1420 from PrismLauncher/update_flake_lock_action
2023-07-23 11:45:31 +02:00
seth
273d75fd51
Merge pull request #1419 from pandaninjas/update-libnbtplusplus
...
Update libnbtplusplus submodule
2023-07-22 20:41:27 -04:00
github-actions[bot]
6f6b0b9661
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'libnbtplusplus':
'github:PrismLauncher/libnbtplusplus/2203af7eeb48c45398139b583615134efd8d407f' (2022-04-15)
→ 'github:PrismLauncher/libnbtplusplus/a5e8fd52b8bf4ab5d5bcc042b2a247867589985f' (2023-07-22)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/46ed466081b9cad1125b11f11a2af5cc40b942c7' (2023-07-15)
→ 'github:nixos/nixpkgs/f465da166263bc0d4b39dfd4ca28b777c92d4b73' (2023-07-22)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/5e28316db471d1ac234beb70031b635437421dd6' (2023-07-14)
→ 'github:cachix/pre-commit-hooks.nix/eb433bff05b285258be76513add6f6c57b441775' (2023-07-18)
2023-07-23 00:21:25 +00:00
PandaNinjas
2253100ac6
Update libnbtplusplus submodule
...
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la >
2023-07-22 14:26:49 -04:00
Trial97
b31644e228
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-22 18:16:03 +03:00
TheKodeToad
57430fd189
Merge branch 'develop' into better-launch
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-22 11:26:02 +01:00
TheKodeToad
6ffcfcd7e9
Merge pull request #1402 from Trial97/flame_import
...
feat:made flame instace creation use metadata for recommended version
2023-07-22 11:14:12 +01:00
TheKodeToad
516ddb22ae
More catpack changes :3
...
This is just embarrasing
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-22 11:05:58 +01:00
Trial97
0b74b3833a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import
2023-07-21 19:30:06 +03:00
Trial97
ef21879df4
replaced require with ensure for jvmArgs
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-21 19:30:00 +03:00
Trial97
ad92c30472
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-21 19:12:16 +03:00
TheKodeToad
bfafbdc51e
Merge branch 'develop' into env-vars
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-21 14:30:24 +01:00
TheKodeToad
1a7c5693cc
Remove redundant methods
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-21 13:01:01 +01:00
TheKodeToad
f8b935ab37
Merge remote-tracking branch 'upstream/develop' into icon-indexing
2023-07-21 12:48:05 +01:00
TheKodeToad
8705e88e91
Fix build on Windows
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-21 11:19:55 +01:00
TheKodeToad
0be4db30eb
Merge branch 'PrismLauncher:develop' into better-component-installation
2023-07-21 11:02:57 +01:00
Sefa Eyeoglu
821dd8400b
Merge pull request #1253 from Trial97/catpacks
2023-07-21 11:11:12 +02:00
TheKodeToad
c37e1fb9f1
Merge branch 'develop' into skinfix
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-20 18:11:27 +01:00
TheKodeToad
5088d33fd2
Finish things :P
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-20 14:17:01 +01:00
TheKodeToad
39f7bea53e
Revert accidental change in MainWindow
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-20 14:13:29 +01:00
TheKodeToad
842f08dcfc
(UX) Add open folder button next to combo boxes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-20 11:54:15 +01:00
Trial97
f8d9cd9a03
use range for
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-19 23:08:16 +03:00
TheKodeToad
960093700a
Better theme reset
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-19 20:57:08 +01:00
TheKodeToad
54d393632d
Automatically create theme folders, and add an action to open them
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-19 16:29:52 +01:00
TheKodeToad
c633c6d083
Colors->Widgets
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-19 14:19:28 +01:00
TheKodeToad
96ebdfc9a8
Sorting and invalid reset
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-19 14:12:39 +01:00
TheKodeToad
f55120654a
Merge branch 'PrismLauncher:develop' into icon-indexing
2023-07-19 12:51:26 +01:00
TheKodeToad
44ca7c7d22
Licenses
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-19 12:29:51 +01:00
TheKodeToad
58c2059e10
Remove recursion
...
It will add icon packs which aren't available - as QIcon's search paths are not recursed!
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-19 10:38:56 +01:00
Trial97
b7bccb9058
removed subdirectory flag
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-19 12:27:02 +03:00
Trial97
f046bd7d50
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
2023-07-19 12:26:12 +03:00
TheKodeToad
593f452986
Merge pull request #1399 from Scrumplex/offline-uuid
...
fix: generate predictable UUIDs for offline accounts
2023-07-19 10:16:27 +01:00
Trial97
43cc04433d
feat: refactored Instance ImportTask
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-19 11:58:27 +03:00
TheKodeToad
97662f5c8e
Multiple icon themes!
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-18 22:51:34 +01:00
seth
f8d88cc83d
Merge pull request #1372 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2023-07-18 21:19:58 +00:00
Trial97
f393aa684e
wait to load metadata
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-18 23:59:43 +03:00
Trial97
4c319c8f4f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into flame_import
2023-07-18 23:49:52 +03:00
Trial97
477b72ad33
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2
2023-07-18 23:48:02 +03:00
Sefa Eyeoglu
3728cbb62a
Merge pull request #1397 from Gaming32/develop
2023-07-18 22:47:55 +02: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
Trial97
02082cda09
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file
2023-07-18 23:40:11 +03:00
Trial97
5eec0f5901
feat:managed packs can update from file
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-18 23:40:03 +03:00
Sefa Eyeoglu
3fbc25155b
Merge pull request #1362 from Trial97/fix_warning
2023-07-18 22:28:27 +02:00
Sefa Eyeoglu
ecac05b2fc
Merge pull request #1378 from Trial97/prism_export
...
Added progress bar to Prism instance export
2023-07-18 22:26:56 +02:00
seth
5b54475d3e
Merge pull request #1385 from orowith2os/flatpak-updates
...
Update Flatpak manifest
2023-07-18 20:12:39 +00:00
Trial97
391497645f
feat:made flame instace creation use metadata for recommended version
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-18 22:33:39 +03:00
Sefa Eyeoglu
f8fcb98c68
fix: generate predictable UUIDs for offline accounts
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-07-18 10:07:35 +02:00
Dallas Strouse
2eff1de560
Update Flatpak manifest
...
Signed-off-by: Dallas Strouse <dastrouses@gmail.com >
2023-07-17 22:38:12 -05:00
Josiah Glosson
1fbb41f5e2
Make Launch Offline not launch online in 1.6+
...
Signed-off-by: Josiah Glosson <soujournme@gmail.com >
2023-07-17 17:07:06 -05:00
TheKodeToad
01afa8957f
Merge pull request #1387 from Scrumplex/fix-quilt-beacon
...
Check if any modloader is installed
2023-07-17 17:40:42 +01:00
Trial97
5162203c7d
Merge branch 'prism_export' of github.com:Trial97/PrismLauncher into prism_export2
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-17 17:58:42 +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
fe73d696cb
replace emplace with insert
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-17 17:24:29 +03:00
Trial97
2ea4a78541
Upgraded ExportToZipTask
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-17 17:24:23 +03:00
Trial97
f5891940e0
translate strings
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-17 17:22:35 +03:00
Trial97
cd9310afed
replace emplace with insert
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-17 16:57:52 +03:00
Trial97
64041a84a2
handle file removal in ExportToZipTask
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-17 16:55:26 +03:00
Trial97
78ee63af38
simplify modrinth export
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-17 16:40:01 +03:00
Trial97
455c495338
simplify flame export
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
s
2023-07-17 16:27:08 +03:00
Trial97
0bf70d677e
Upgraded ExportToZipTask
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-17 16:24:43 +03:00
Sefa Eyeoglu
2be630904f
fix: don't take modloaders by reference
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-07-17 14:33:01 +02:00
TheKodeToad
49cebc2da4
More consistent behaviour
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-17 12:49:12 +01:00
TheKodeToad
049abc9b1a
Merge remote-tracking branch 'upstream/develop' into rename-groups
2023-07-17 12:13:58 +01:00
Tayou
e8c44e700d
Merge pull request #1286 from TayouVR/better-instance-group-separator
2023-07-17 11:55:31 +02:00
Sefa Eyeoglu
54a091ca59
fix: check if any modloader is installed
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-07-17 10:09:01 +02:00
Trial97
ec32618e11
reveted back to add years
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-17 10:20:22 +03: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
6b970954d6
Merge pull request #1381 from getchoo/backporting-docs
...
chore(docs): add backporting info to CONTRIBUTING.md
2023-07-16 18:36:51 -04:00
TheKodeToad
fb5aefffb2
Reduce bugginess
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-16 23:36:01 +01:00
TheKodeToad
20e2c70464
Rename groups and janky reference counting map
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-16 23:23:33 +01:00
seth
ed2f680202
chore(docs): add backporting info to CONTRIBUTING.md
...
Signed-off-by: seth <getchoo@tuta.io >
2023-07-16 17:28:52 -04: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
Alexandru Ionut Tripon
ec41252535
Update launcher/MMCZip.h
...
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:54 +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
7441974d9d
Removed icon
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-16 21:23:22 +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
Sefa Eyeoglu
b54d1651ab
Merge pull request #1373 from Scrumplex/backport-bot
2023-07-16 19:42:09 +02:00
Trial97
9d0175b81a
Added welcome screen
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-16 17:46:00 +03:00
Trial97
002430db46
added path to flatpack
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-16 15:43:47 +03:00
Trial97
de30a72c4e
made the date a object
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-16 15:16:16 +03:00
TheKodeToad
5f37e339fb
Merge branch 'develop' into feature/java-downloader
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-16 12:32:31 +01:00
Trial97
0a956bbc73
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
2023-07-16 14:18:26 +03:00
Trial97
1e9a596908
simplified code in cat packs
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-16 14:18:17 +03:00
Sefa Eyeoglu
b9568279dc
Merge pull request #1010 from TayouVR/add_default_editorconfig
2023-07-16 12:30:22 +02:00
Sefa Eyeoglu
fcdd9ea986
Merge pull request #1246 from Trial97/export
2023-07-16 12:24:42 +02:00
Sefa Eyeoglu
c145bfa524
Merge pull request #1369 from Trial97/autoselect
2023-07-16 12:21:17 +02:00
Sefa Eyeoglu
18ebc858fd
feat(actions): add backport action
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-07-16 11:47:54 +02:00
github-actions[bot]
6597a5c860
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/267149c58a14d15f7f81b4d737308421de9d7152' (2023-07-01)
→ 'github:hercules-ci/flake-parts/8e8d955c22df93dbe24f19ea04f47a74adbdc5ec' (2023-07-04)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/cd99c2b3c9f160cd004318e0697f90bbd5960825' (2023-07-01)
→ 'github:nixos/nixpkgs/46ed466081b9cad1125b11f11a2af5cc40b942c7' (2023-07-15)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/42587d3414d1747999a5f71e92a83cf6547b62da' (2023-07-03)
→ 'github:cachix/pre-commit-hooks.nix/5e28316db471d1ac234beb70031b635437421dd6' (2023-07-14)
2023-07-16 00:23:55 +00:00
Trial97
a3ffa64550
Upgraded pack changelog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-16 01:59:08 +03:00
Alexandru Ionut Tripon
f42514a1a3
Update launcher/tasks/ConcurrentTask.cpp
...
Co-authored-by: seth <getchoo@tuta.io >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-07-16 00:38:39 +03:00
Tayou
a6305ac891
Merge pull request #1368 from Trial97/crash_curse_import
2023-07-15 23:13:00 +02: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
Trial97
c346d875a2
make FileResolvingTask accept empty modlist
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-15 23:26:52 +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
21ffed3bf5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-15 20:35:11 +03:00
Trial97
fd7aab466b
Merge branch 'refactor/net-split-headers-to-proxy-class' of https://github.com/Ryex/PrismLauncher into refactor/NetActions
2023-07-15 20:33:48 +03:00
Trial97
6cf7c0a647
Connected last fail signals
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-15 20:17:16 +03:00
Alexandru Ionut Tripon
da87e825a1
Update launcher/ui/dialogs/ExportToModListDialog.ui
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-07-15 15:59:19 +03:00
Trial97
a7e0c9db96
connected failed event for some tasks
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-15 12:01:07 +03:00
Trial97
0880d4d37b
made sure abort signal is catched in cocurent task
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-15 09:16:37 +03:00
Trial97
b54e093313
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task
2023-07-15 09:04:22 +03:00
Trial97
7befd63cce
fixed settings
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-15 00:28:58 +03:00
Alexandru Ionut Tripon
2c2c39b42c
Update launcher/modplatform/import_ftb/PackInstallTask.cpp
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-07-15 00:17:48 +03:00
Alexandru Ionut Tripon
0692cbe701
Update launcher/modplatform/import_ftb/PackInstallTask.cpp
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-07-15 00:17:32 +03:00
Trial97
68b5fdf748
Ask user to retry if netjob fails
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-15 00:03:11 +03:00
Trial97
ab10524cd7
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into export
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-14 23:45:40 +03:00
Trial97
1ccfba13eb
renames
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-14 23:41:51 +03:00
Trial97
b9ed8283b7
Added buttons
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-14 23:41:45 +03:00
Trial97
1495bfb73e
Made custom template enabled all time
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-14 23:41:37 +03:00
Trial97
9b02c31f8d
escaped text for html export
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-14 23:35:18 +03:00
Trial97
50dae9d4f3
Moved to separate functions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-14 23:34:28 +03:00
Trial97
9a3931dac6
Added json and csv format
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-14 23:34:21 +03:00
Trial97
515197fba2
fix: html sintax for modlist export
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-14 23:34:03 +03:00
Trial97
149b6d59cf
fixed tests
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-14 23:22:11 +03:00
Rachel Powers
37fb52aada
Merge pull request #1351 from Trial97/ftb_import
...
fixed substatus on ftb_import
2023-07-14 12:41:21 -07:00
Trial97
db9f5f44e0
Split in two the options
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-14 22:26:22 +03:00
seth
094af0f78f
Merge pull request #1336 from Ryex/packaging/fix-duplicate-share-directories
...
packaging: fix duplicate share directories (use only lowercase)
2023-07-14 14:19:44 -04:00
Trial97
d3dc00dcab
made concurent task fail
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-14 21:07:53 +03:00
Trial97
7f4665e3cc
format
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-14 21:07:34 +03:00
Trial97
cebb4dd17a
made the number of concurrent tasks configurable
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-14 20:39:53 +03:00
Rachel Powers
3487e1cb64
Update launcher/Application.cpp
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-14 03:56:18 -07:00
Trial97
440afcedb0
fixed warning
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-14 13:32:18 +03:00
Trial97
b0a21c9389
insert header
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-14 13:31:28 +03:00
Trial97
fc4a1ef193
format
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-14 13:31:13 +03:00
Trial97
c8533c0b0d
fixed substatus on ftb_import
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-14 12:29:03 +03:00
Trial97
b0a018d823
format
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-14 12:28:23 +03:00
Sefa Eyeoglu
3becd4386b
Merge pull request #1306 from Ryex/ci/address-sanitiser_on_debug_builds
2023-07-14 10:11:34 +02: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
5d10045cc8
Merge pull request #1352 from Trial97/crash_after_abort
...
Do not reset shared pointer if it's already empty
2023-07-13 21:11:47 -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
Rachel Powers
95b300f1ea
packaging: use PascalCase folder name instead
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-13 19:56:36 -07:00
Trial97
bd6e8533ad
send by reference
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-13 19:58:08 +03: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
Tayou
94d4d12ee0
Merge pull request #1345 from Trial97/time2
...
feat:Added option to use system locale
2023-07-13 01:56:12 +02:00
TheKodeToad
997a3709d4
Custom environment variables UI and implementation
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-12 19:21:38 +01:00
Trial97
76cc8ce043
renamed setting
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-12 21:05:13 +03:00
Rachel Powers
9499066375
Merge pull request #1350 from Trial97/fix_managed_pack_crash
...
fixed crash if no version is loaded on managed page
2023-07-12 09:55:31 -07:00
Trial97
25f7cf23d3
the other place
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-12 19:55:11 +03:00
Trial97
9ee68b9268
small pointer check
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-12 18:12:31 +03:00
leo78913
1208300ddf
i forgor to change skin upload browse button
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-07-12 10:57:40 -03:00
Sefa Eyeoglu
06a7d447f6
Merge pull request #1333 from Ryex/fix/null_instance_edit_crash
2023-07-12 15:53:46 +02: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
6d5a2ceefe
fix(flameapi): getFile use shared_ptr
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-11 21:45:23 -07: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
HyperSoop
bca120e798
Reduce mininmum memory amounts
...
Signed-off-by: HyperSoop <pasha.mirus@gmail.com >
2023-07-11 21:25:26 +03:00
Trial97
634612ae81
added missing header
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-11 18:20:44 +03:00
Trial97
f0d2aab784
feat:Added option to use system locale
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-11 18:05:43 +03: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
seth
640aaa8c23
Merge pull request #1331 from TheKodeToad/hungry-trash
...
Fix updating trashing resources
2023-07-10 16:31:43 -04:00
Rachel Powers
1aa5fa03f9
Update launcher/ui/MainWindow.cpp
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-10 12:05:01 -07:00
Nathan
99ba02afb6
Shortcuts on macOS ( #1081 )
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-10 20:26:25 +02:00
TheKodeToad
9aedb5afff
Merge pull request #1334 from TheKodeToad/litemod-dl
...
LiteMod downloading
2023-07-10 16:42:38 +01:00
TheKodeToad
e21756ea8c
Remove direct launch
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-10 16:22:37 +01:00
Trial97
35ccfdb799
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-10 16:25:15 +03:00
TheKodeToad
91c9082d19
Merge pull request #1249 from Trial97/curse
...
Curseforge modpack export
2023-07-10 14:20:29 +01:00
TheKodeToad
4f4ccdaa59
Merge pull request #1338 from Trial97/unlockVersionPage
...
feat:unlocked versions page
2023-07-10 13:06:32 +01:00
Rachel Powers
01e058d8c1
Merge pull request #1337 from getchoo/fix-flake-workflow
...
fix(actions): give update-flake content write perms
2023-07-09 14:11:33 -07:00
TheKodeToad
f816e3cd3f
Merge pull request #1241 from Trial97/settings
...
Allow editing of running instances
2023-07-09 22:10:43 +01:00
Rachel Powers
49109b9213
Merge pull request #1332 from TheKodeToad/widebar-pain
...
Fix crash when editing instance and prevent similar crashes in future
2023-07-09 14:07:34 -07:00
Rachel Powers
d43399c2b4
Merge pull request #1321 from TheKodeToad/mr-optional
...
Optional mods in mrpack export
2023-07-09 14:03:47 -07:00
Trial97
308877aa8f
removed redundant code
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-09 23:18:38 +03:00
Trial97
159f14c076
feat:unlocked versions page
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-09 22:47:38 +03:00
seth
8e4de055b8
chore(actions): only run update-flake in our repo
...
Signed-off-by: seth <getchoo@tuta.io >
2023-07-09 15:43:54 -04:00
Trial97
d7f4e40f85
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
2023-07-09 19:38:17 +03:00
TheKodeToad
6e2fcc9e11
Replace string manipulation in favour of QFileInfo
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-09 12:08:15 +01:00
seth
0d31e31282
fix(actions): give update-flake content write perms
...
Signed-off-by: seth <getchoo@tuta.io >
2023-07-09 01:56:21 -04:00
Rachel Powers
4dc4c589ba
packaging: fix duplicate share directories (use only lowercase)
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-08 15:44:09 -07:00
TheKodeToad
d53d58a5d4
LiteMod downloading
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-08 22:16:43 +01: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
Rachel Powers
a54bbae622
fix(instance edit): don't allow editing if no selected instance or instance doesn't support editing
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-08 12:59:55 -07:00
TheKodeToad
08c140b9b4
Fix actionVisitItemPage insersion, and prevent widebar segfault
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-08 20:55:30 +01:00
TheKodeToad
0c6362f28d
Make trash hungry
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-08 18:51:28 +01:00
seth
67d473aab7
Merge pull request #1329 from Ryex/fix/progress_dialog_centering
...
fix(progress dialog): if there is a parent center on creation
2023-07-08 07:50:13 -04:00
Rachel Powers
20c781b23b
fix(progress dialog): if there is a parent center on creation
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-08 02:28:37 -07:00
Rachel Powers
7f138e3538
Merge branch 'develop' into ci/address-sanitiser_on_debug_builds
2023-07-08 01:27:30 -07:00
Rachel Powers
3211b265d7
Merge pull request #1302 from Ryex/fix/progress-dialog-segfault
...
fix: segfault in progress dialog
2023-07-07 21:25:14 -07: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
seth
d1528c1044
Merge pull request #1325 from Scrumplex/validate-meta-url
...
Validate Meta URL
2023-07-07 14:31:22 -04:00
ashuntu
51d7a6289e
Fix URL open crash ( #596 )
2023-07-07 13:24:31 -05:00
ashuntu
10678096e5
Persist app data between install versions
2023-07-07 13:20:15 -05:00
Sefa Eyeoglu
51e62761ee
fix: improve QUrl construction
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-07-07 19:25:12 +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
TheKodeToad
b8482a5d89
Update ModFolderPage.cpp
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-07 15:53:50 +01:00
Trial97
3139af8487
Made action text simpler
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-07 17:12:10 +03:00
Sefa Eyeoglu
6fcdac0d36
fix: reset invalid meta url on launch
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-07-07 15:57:25 +02:00
Sefa Eyeoglu
073cb91f88
fix(ui): validate meta override url
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-07-07 15:56:07 +02:00
leo78913
3154c2644a
enable tear off on widebar context menu
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-07-07 10:30:18 -03:00
Sefa Eyeoglu
e225a72180
Merge pull request #1128 from pandaninjas/fix-implicit-fallthrough
2023-07-07 15:19:00 +02:00
TheKodeToad
ec85266860
Memory leak fixes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-07 12:18:04 +01:00
TheKodeToad
4c25e3ce75
Add keyboard shortcut to Kill action
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-06 21:04:21 +01:00
TheKodeToad
8ae67b84db
Optional mods in mrpack export
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-06 20:04:26 +01:00
TheKodeToad
440dcdf022
Import QActionGroup properly :P
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-06 18:31:59 +01:00
TheKodeToad
22327bbe71
Combine launch buttons in Instance window, persist profiler
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-06 18:07:45 +01:00
flow
b8b8c8d4ac
fix(tests): Fix abort of Task test on Linux
...
Not sure exactly what caused the issue, though I suppose using QThread's
exec instead of our own thingie is nice. I can't remember why I didn't
use that before, so I hope there's no issue with that! :^)
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-07-06 09:49:07 -07:00
Trial97
93870c315f
better url handling
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-06 18:46:59 +03:00
PandaNinjas
13d67c6524
Keep formatting consistent
...
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la >
2023-07-06 08:51:42 -04:00
leo78913
e8dc1564b6
add _kde_side_panel_view property to page container
...
With this the sidebars look better with the breeze theme
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-07-06 01:39:59 -03:00
leo78913
f9578066d6
make "browse" buttons and java pages more consistent
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-07-06 01:39:59 -03:00
Rachel Powers
71e73bb6f8
fix(tests): linux big task memory leak.
...
- move big_task into function scope
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-05 21:18:49 -07:00
Rachel Powers
8638076aa1
fix(test): tasks test memmory leak. don't store local task copy.
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-05 20:19:22 -07:00
Rachel Powers
965ee5687a
fix(test): task test memory leak *again*
...
- put Big thread on the stack so stack will clean it up.
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-05 20:05:18 -07:00
seth
2cb22ad280
Merge pull request #1310 from getchoo/autoupdate-flake
...
feat(actions): add update-flake-lock
2023-07-05 23:25:12 +00:00
Rachel Powers
4dbcedd03f
fix: Task test memory leaks again
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-05 11:51:37 -07:00
Sefa Eyeoglu
5ba13297c6
Merge pull request #1284 from Ryex/fix/properly-track-failed-copies-and-clones
2023-07-05 19:26:07 +02:00
Rachel Powers
5fe9a7a6c3
fix: extra } in CXX args
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-05 03:02:20 -07:00
Rachel Powers
a028894855
Apply suggestions from code review
...
Co-authored-by: seth <getchoo@tuta.io >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-04 23:43:39 -07:00
Rachel Powers
183ed7b90b
chore: cleanup compiler type branches
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-04 19:43:22 -07:00
seth
24b9ed106f
feat(actions): add update-flake-lock
...
Signed-off-by: seth <getchoo@tuta.io >
2023-07-04 18:49:22 -04:00
seth
7c8a010378
Merge pull request #1304 from Scrumplex/chore-flake-update-1
...
flake.lock: Update
2023-07-04 22:43:00 +00:00
PandaNinjas
817ecf8225
Fix VersionProxyModel.cpp
...
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la >
2023-07-04 17:19:08 -04: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
PandaNinjas
34cf28712c
Replace break with return true;
...
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la >
2023-07-04 16:39:24 -04:00
PandaNinjas
1fbc17d275
Remove break and add fallthrough comment in WorldListPage.cpp
...
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la >
2023-07-04 16:38:04 -04:00
Trial97
908ac813e0
escaped modlist inner html
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-04 15:16:54 +03:00
Rachel Powers
3c96d5e0d5
fix: memory leaks in tests
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-03 20:28:03 -07:00
Rachel Powers
c5705705d5
fix: memory leaks in ResourceModel Test
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-03 18:35:42 -07:00
Rachel Powers
03a1d68b74
fix: memory leaks in filesystem test
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-03 18:18:48 -07:00
Rachel Powers
50eff80ca1
build: optimize address-sanitizer
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-03 18:07:59 -07:00
Rachel Powers
96c118779d
build: enable address sanitiser in debug builds
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-03 17:48:44 -07:00
TheKodeToad
64c591b234
Better parent version filtering; handle old fabric :P
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-03 20:48:37 +01:00
TheKodeToad
0e5c377680
Various tweaks
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-03 17:39:09 +01:00
Trial97
6d758795af
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-03 17:00:56 +03:00
Tayou
dedc9e4edc
Merge pull request #1127 from Trial97/scale_cat
2023-07-03 15:46:56 +02:00
Trial97
fa7cfc77d8
fixed template
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-03 16:08:20 +03:00
Sefa Eyeoglu
14692eed40
flake.lock: Update
...
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/006c75898cf814ef9497252b022e91c946ba8e17' (2023-05-08)
→ 'github:hercules-ci/flake-parts/267149c58a14d15f7f81b4d737308421de9d7152' (2023-07-01)
• Updated input 'flake-parts/nixpkgs-lib':
'github:NixOS/nixpkgs/da45bf6ec7bbcc5d1e14d3795c025199f28e0de0?dir=lib' (2023-04-30)
→ 'github:NixOS/nixpkgs/4bc72cae107788bf3f24f30db2e2f685c9298dc9?dir=lib' (2023-06-29)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/aeb75dba965e790de427b73315d5addf91a54955' (2023-05-25)
→ 'github:nixos/nixpkgs/cd99c2b3c9f160cd004318e0697f90bbd5960825' (2023-07-01)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/61e567d6497bc9556f391faebe5e410e6623217f' (2023-05-23)
→ 'github:cachix/pre-commit-hooks.nix/42587d3414d1747999a5f71e92a83cf6547b62da' (2023-07-03)
• Updated input 'pre-commit-hooks/flake-utils':
'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02)
→ 'github:numtide/flake-utils/a1720a10a6cfe8234c0e93907ffe81be440f4cef' (2023-05-31)
• Added input 'pre-commit-hooks/flake-utils/systems':
'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09)
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-07-03 14:27:02 +02:00
Trial97
f0aab541f8
fixed typo
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-03 15:09:35 +03:00
Trial97
026293f773
updated option text
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-03 14:17:39 +03:00
Trial97
5d5f1b86fd
fixed logic regarding range over multiple years
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-03 09:21:25 +03:00
Trial97
ba159ba971
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
2023-07-03 09:01:22 +03:00
Rachel Powers
e5b9bfb2e7
fix: update if new size is larger
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-02 22:30:25 -07:00
Rachel Powers
8cb8273e67
fix: update if new size is larger
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-02 22:29:45 -07:00
Rachel Powers
73d8343914
fix: header <qpoint.h> -> <QPoint>
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-02 22:27:24 -07:00
Rachel Powers
3960eb7d32
fix: properly calculate min size for progress dialog, apply it at creation
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-02 21:24:43 -07:00
Rachel Powers
4004e0faee
fix: segfault in progress dialog
...
- dialog tries to resize after unhiding the subtask scroll area
- after resize attempts to recenter on parent
- `calls parentWidget()->{x|y}()`
- what if there is no parent? nullptr->() = segfault
- recenter on last pos, don't access parent
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-02 20:22:25 -07:00
Rachel Powers
b47993b736
Merge pull request #3 from Trial97/netRefactor3
...
Fail NetRequest on connection close from QT
2023-07-02 19:32:47 -07:00
Rachel Powers
ca061080c1
Merge pull request #2 from Trial97/feat/acknowledge_release_type
...
Feat/acknowledge release type
2023-07-02 19:32:25 -07:00
Trial97
f1bd9700f7
Fail NetRequest on connection close from QT
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-02 22:49:58 +03:00
Trial97
5f63c781b4
resolved local vaiables names
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-02 18:50:29 +03:00
TheKodeToad
43e6f05ed5
Merge pull request #1232 from telans/screenshots-update
...
ScreenshotsPage fixes
2023-07-02 16:44:54 +01:00
Trial97
aad5ca5474
fixed typos
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-02 16:45:15 +03:00
Trial97
cf2393a509
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings
2023-07-02 15:56:39 +03:00
Tayou
81c0a1c4bd
antialiasing for all painting, make hitbox fullwidth
...
Signed-off-by: Tayou <tayou@gmx.net >
2023-07-02 14:01:56 +02:00
Trial97
6fc745e98c
Merge branch 'catpacks' of github.com:Trial97/PrismLauncher into catpacks
2023-07-02 13:34:41 +03:00
Trial97
7579fff532
Added more options for variants planing
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-02 13:34:04 +03:00
Trial97
7ac2a23bc8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
2023-07-02 13:14:19 +03:00
Trial97
6c4cf085e0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-02 12:50:45 +03:00
Sefa Eyeoglu
b51f1f1d41
Merge pull request #1298 from TurboWafflz/develop
2023-07-02 09:52:59 +02: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
Finian Wright
3fe518ff2b
Fix compiling on OpenBSD
...
Signed-off-by: Finian Wright <turbowafflz@gmail.com >
2023-07-02 00:36:21 -04:00
Rachel Powers
98d6904e4a
chore: fix propagate mispelling
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-01 17:03:12 -07:00
Rachel Powers
d7d2d9f612
chore: remove WARNINGS_AS_ERRORS
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-07-01 17:03:11 -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
e2a65a7077
feat: ensure MSVC using stack unwind semantics
...
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
TheKodeToad
6cc3587da2
Disable as intended
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-01 20:10:38 +01:00
TheKodeToad
9f9b5254a2
Double-click to install/change version
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-01 19:39:04 +01:00
TheKodeToad
284e374ae8
Nop
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-01 19:39:04 +01:00
TheKodeToad
4cdf669154
Modify "Change Version" to use "Install Loader" dialog
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-01 19:39:04 +01:00
TheKodeToad
4332b62a62
Fix search focusing
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-01 19:39:04 +01:00
TheKodeToad
7138425c85
Merge branch 'develop' into better-component-installation
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-01 13:05:55 +01:00
Rachel Powers
b67844e74c
fix(windows installer): old installers didn't uninstall first.
...
now they do so ensure shortcuts stay selected by default
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-30 23:04:55 -07:00
Rachel Powers
cea285f5f5
fix(updater): fix bad exe_name on linux
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-30 21:33:22 -07:00
Rachel Powers
1fd90e9dd0
fix(updater): ensure updater knows binaries are in ./bin/ on linux and can find them
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-30 21:24:30 -07:00
seth
c523765c19
Merge pull request #1292 from Trial97/export5
...
Removed logs from instance export
2023-07-01 04:14:35 +00:00
Rachel Powers
cd527c44a4
fix(updater): build atrifact fix on linux ci + add qt-ver to artifact name
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-30 18:17:06 -07:00
Rachel Powers
6476023cf7
fix(updater): check the app root dir for binary
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-30 10:57:53 -07:00
Rachel Powers
a01a48793c
fix(updater): force asInvoker for updater on windows
...
- use `__COMPAT_LAYER` env var in windows to bypass Installer Detection and run as a normal user anyway
- set up updater directly after main windows is created
- check update locks before main window
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-30 03:19:21 -07:00
Trial97
18e628e873
removed extra condition
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-30 12:10:00 +03:00
Rachel Powers
00f75e2d54
fix(updater): avoid windows installer detection with "asInvoker" in xml exe.manifest
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-30 00:54:29 -07:00
Trial97
81207c6502
Made sure the logs are ignored when collecting files
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-30 10:52:10 +03:00
Rachel Powers
8dd3a02747
Update launcher/Application.cpp
...
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-29 23:49:31 -07:00
Rachel Powers
3db83a189c
fix(updater): include updater in setup.exe
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-29 22:38:16 -07:00
ashuntu
b6e9a54951
Add snap github action
...
Signed-off-by: ashuntu <101582426+ashuntu@users.noreply.github.com >
2023-06-29 21:15:07 -05:00
ashuntu
6c374f5f08
Add snapcraft.yaml
...
Signed-off-by: ashuntu <101582426+ashuntu@users.noreply.github.com >
2023-06-29 21:09:31 -05:00
Rachel Powers
4320830a86
fix(updater): Explicit conversion to string for QByteArray
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-29 17:59:14 -07:00
Rachel Powers
603e3e7e2e
fix(updater): set minimum dialog / msgbox sizes
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-29 15:56:44 -07:00
Rachel Powers
109ae5bae0
fix(updater): convert int to string
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-29 15:42:36 -07:00
Rachel Powers
41cb8d7ec6
fix: adjust dialog size, add parent to msgboxes
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-29 15:31:12 -07:00
flow
494483fd2b
fix(updater): add parent to dialog to fix issues in tilling WMs
...
QProgressDialog without parents in Qt tend to cause graphical issues on
some systems, so we add the main window as a parent here!
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-06-29 15:31:11 -07:00
Rachel Powers
a6c8a37a5d
fixa(updater): better update timer logs
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-29 14:06:14 -07:00
Trial97
87efa700ab
Removed logs from instance export
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-30 00:01:36 +03:00
Rachel Powers
e38adf6006
fix(updater) fixes form first round of testing
...
- reset update time after check
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-29 14:01:11 -07:00
Trial97
25ffc4c4b0
Refactor ImgurUpload
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-29 17:58:09 +03:00
Tayou
8211befc29
removed magic 5, removed unnecessary QPainter function calls
...
Signed-off-by: Tayou <tayou@gmx.net >
2023-06-28 23:24:57 +02:00
Tayou
1dc7f80034
4 clang-tidy changes, update copyright info
...
while already at it I updated all my emails to use one from my domain
Signed-off-by: Tayou <tayou@gmx.net >
2023-06-28 23:08:04 +02:00
Rachel Powers
cb7ff81ade
fix: copy needs to overwrite
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-28 13:51:58 -07:00
Rachel Powers
400a2f7201
fix: final fixes
...
- use `done(code)` for offer dialog
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-28 12:46:28 -07:00
Rachel Powers
c123558314
fix: add build config header & trimlines form stdout
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-28 11:25:59 -07:00
Rachel Powers
f287d9deac
fix add NetRequest source
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-28 11:09:59 -07:00
Tayou
534d156b12
format VisualGroup.cpp file
...
Signed-off-by: Tayou <tayou@gmx.net >
2023-06-28 20:06:17 +02:00
Tayou
54d88e4dbf
use QString.isEmpty()
...
oops
Signed-off-by: Tayou <tayou@gmx.net >
2023-06-28 20:05:28 +02:00
Rachel Powers
95969e87a1
Merge branch 'refactor/net-split-headers-to-proxy-class' into feat/launcher-updater
2023-06-28 11:05:11 -07:00
Rachel Powers
e29126ca26
fix: add split markdown source
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-28 10:56:16 -07:00
Rachel Powers
1b5c78b066
Merge branch 'develop' into feat/launcher-updater
2023-06-28 10:54:39 -07:00
Trial97
1c3402d081
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
2023-06-28 20:23:35 +03:00
Tayou
6b3b119db0
give ungrouped instances a group header
...
Signed-off-by: Tayou <tayou@gmx.net >
2023-06-28 18:50:44 +02:00
Tayou
66461ac500
some positioning adjustments, deleted the line
...
Signed-off-by: Tayou <tayou@gmx.net >
2023-06-28 18:42:49 +02:00
Rachel Powers
46e840fdf1
fix: add thread sleep to wait for resources - add detail text from logs
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-28 09:18:07 -07:00
Tayou
7033e28572
update instance group header to more modern style
...
Signed-off-by: Tayou <tayou@gmx.net >
2023-06-28 18:00:40 +02:00
Trial97
0008b22d8b
Renamed function
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-28 18:41:47 +03:00
Trial97
8f9bd9617f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into scale_cat
2023-06-28 18:29:04 +03: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
3ad559ab22
Added version type to review message dialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-28 17:43:09 +03:00
Trial97
5f1074471d
Corected variable name
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-28 13:35:42 +03:00
Trial97
c04cee7ff7
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-28 13:21:00 +03:00
Rachel Powers
4123343130
no need for pre release tag
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-28 00:25:09 -07:00
Sefa Eyeoglu
faec21d572
Merge pull request #1266 from TheKodeToad/smol-tweaks
2023-06-28 08:47:53 +02:00
Rachel Powers
cb35fb8d0e
add optional pre-release tag
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-27 20:37:42 -07:00
seth
213f03351f
Merge pull request #1280 from Trial97/shortcut
...
Fixed illegal characters in shortcuts name
2023-06-27 20:01:48 +00:00
Rachel Powers
00be211169
Update launcher/FileSystem.cpp
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-27 13:01:28 -07:00
seth
90fc720190
Merge pull request #1281 from Trial97/screenshot
...
Added more information to the screenshot upload warning
2023-06-27 20:01:18 +00:00
Rachel Powers
23b3711f96
fix(filesystem): track failed copies and clones
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-27 12:41:36 -07:00
Rachel Powers
6aa30d334c
Merge pull request #1 from Trial97/refactor/net-split-headers-to-proxy-class
...
Simplify Upload and Download
2023-06-27 12:08:41 -07:00
Trial97
54cb077b40
Added more information to the screenshot upload warning
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-27 19:31:36 +03:00
Trial97
92847b9774
omit icon remove on macos
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-27 19:15:20 +03:00
Trial97
6e5716f097
Fixed illegal characters in shortcuts name
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-27 19:05:32 +03:00
Rachel Powers
6f7454243e
fix: prep for changes in #1276
...
- sign updater
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-26 23:25:07 -07:00
Trial97
45c39d078f
More clenup
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-27 09:23:24 +03:00
Trial97
385babb458
Simplify Upload and Download
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-27 08:51:17 +03:00
TheKodeToad
904b128afe
Merge pull request #1277 from Trial97/remove_mojang
...
Removed unused files
2023-06-26 23:09:27 +01:00
Trial97
dffffc784e
Removed unused files
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-26 22:33:10 +03:00
Sefa Eyeoglu
40fb387185
fix(actions): set all build platforms to official
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-06-26 11:58:47 +02:00
Sefa Eyeoglu
63acf0a7b4
fix: set default platform to "unknown"
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-06-26 11:55:48 +02:00
Sefa Eyeoglu
fce000206f
feat: print build platform in application log
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-06-26 11:55:23 +02:00
Sefa Eyeoglu
f5e4171df4
feat: print build platform in log
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-06-26 11:54:22 +02:00
Sefa Eyeoglu
0aaec9ae4f
chore: remove obsolete macOS warning
...
We don't support that macOS version. This check also never worked, as we
never set the platform to that value.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-06-26 11:53:48 +02:00
Sefa Eyeoglu
d25452a64e
Merge pull request #1274 from TheKodeToad/java-signature
2023-06-26 11:19:53 +02:00
Sefa Eyeoglu
41d0f74750
Merge pull request #1275 from Scrumplex/git-blame-ignore
2023-06-26 10:56:26 +02:00
Alexandru Ionut Tripon
22bb260ae3
Update launcher/ui/dialogs/ExportToModListDialog.cpp
...
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-06-26 11:45:26 +03:00
Alexandru Ionut Tripon
d82ae31fc1
Update launcher/ui/dialogs/ExportToModListDialog.cpp
...
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-06-26 11:45:05 +03:00
Alexandru Ionut Tripon
cf5c01a5b1
Update launcher/ui/dialogs/ExportToModListDialog.cpp
...
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-06-26 11:44:55 +03:00
Alexandru Ionut Tripon
f2015eee80
Update launcher/ui/MainWindow.ui
...
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-06-26 11:44:47 +03:00
Rachel Powers
c0f0462550
fix(updater): logs/ folder
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-26 01:41:51 -07:00
Rachel Powers
1f70589deb
feat(updater): tie in part 2, let there be UI!
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-26 01:22:33 -07:00
Sefa Eyeoglu
f8f1c3cf23
chore: add Git Blame ignore file
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-06-26 09:08:03 +02:00
Sefa Eyeoglu
ed4dce2fb6
fix: install logo to multimc theme in genicons.sh
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-06-26 08:59:48 +02:00
Sefa Eyeoglu
4d49486cc9
Merge pull request #1065 from leo78913/gamescope-close-button
2023-06-26 08:45:28 +02:00
Rachel Powers
b7dd32274c
Proper capture on windows
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-25 22:30:20 -07:00
Rachel Powers
d8e0b14dc4
feat(updater): tie in updater part 1
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-25 21:37:47 -07:00
TheKodeToad
8bebd7f042
Generate special signature ✨ composed of multiple elements instead of relying on timestamp for Java version cache invalidation
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-26 01:30:47 +01:00
Rachel Powers
90da57a806
Merge branch 'refactor/net-split-headers-to-proxy-class' into feat/launcher-updater
2023-06-25 16:13:51 -07:00
Rachel Powers
b142407b21
fix: ensure finished signal is emited
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-25 16:13:26 -07: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
seth
c49ee87857
fix(net): fix emit signals in download & upload task
...
Signed-off-by: seth <getchoo@tuta.io >
2023-06-25 18:56:54 -04:00
Rachel Powers
5b04a17730
Merge branch 'refactor/net-split-headers-to-proxy-class' into feat/launcher-updater
2023-06-25 14:43:45 -07:00
Rachel Powers
4ea0a567bc
DCO Remediation Commit for Rachel Powers <508861+Ryex@users.noreply.github.com>
...
I, Rachel Powers <508861+Ryex@users.noreply.github.com >, hereby add my Signed-off-by to this commit: 1ba08f4641
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-25 14:42:16 -07:00
Rachel Powers
8aeec1d52d
fix: use new shared pointer for repsonse buffer
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-25 14:36:20 -07:00
Rachel Powers
f39d2de0cc
Merge branch 'refactor/net-split-headers-to-proxy-class' into feat/launcher-updater
2023-06-25 14:31:16 -07:00
Rachel Powers
1ba08f4641
fixup! Merge remote-tracking branch 'upstream/develop' into refactor/net-split-headers-to-proxy-class
2023-06-25 14:25:07 -07:00
Rachel Powers
4b65315cdc
chore: add license to headers
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-25 14:21:55 -07:00
seth
903fae94be
Merge pull request #1272 from Trial97/fix_selected
...
fix: Page container extra info set on logs page
2023-06-25 21:16:18 +00:00
Rachel Powers
275351e19c
Merge branch 'packaging/appimage-updates' into feat/launcher-updater
2023-06-25 13:51:01 -07:00
Rachel Powers
35c233d4c5
DCO Remediation Commit for Rachel Powers <508861+Ryex@users.noreply.github.com>
...
I, Rachel Powers <508861+Ryex@users.noreply.github.com >, hereby add my Signed-off-by to this commit: f5729d9a7c
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-25 13:47:32 -07:00
Rachel Powers
e099a3f7e8
feat(updater): packaging - know the updater git repo
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-25 13:47:32 -07:00
Rachel Powers
4313466589
feat(updater): final step for portable install
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-25 13:47:32 -07:00
Rachel Powers
d2a3acd493
fix: filter archive assets from windows non-portable installs
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-25 13:47:31 -07:00
Rachel Powers
516dd6bd1a
support windows console
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-25 13:47:31 -07:00
Rachel Powers
44bc60021d
feat(updater): unpack portable archive
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-25 13:47:31 -07:00
Rachel Powers
50d5eb0621
feat(updater): download new & back up old
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-25 13:47:31 -07:00
Rachel Powers
3d3acb7a92
Merge branch 'packaging/appimage-updates' into feat/launcher-updater
2023-06-25 13:47:31 -07:00
Rachel Powers
bee88b1c7f
feat(updater) select valid asset
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-25 13:47:30 -07:00
Rachel Powers
98174b7a37
refactor: use Net tasks for github api download
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-25 13:47:30 -07:00
Rachel Powers
5d03919b59
Merge branch 'packaging/file-manifest-in-portable-install' into feat/windows-updater
2023-06-25 13:47:30 -07:00
Rachel Powers
2357d167b8
Merge branch 'packaging/windows-installer-uninstall-previous' into feat/windows-updater
2023-06-25 13:46:28 -07:00
Rachel Powers
013a26aafe
fix: add ApiUpload to CMakeLists.txt
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-25 13:23:43 -07:00
Rachel Powers
fe9927d10d
Merge branch 'refactor/net-split-headers-to-proxy-class' into feat/windows-updater
2023-06-25 12:44:25 -07:00
Rachel Powers
df4fd7df7f
Merge remote-tracking branch 'upstream/develop' into refactor/net-split-headers-to-proxy-class
2023-06-25 12:43:48 -07:00
Rachel Powers
c8ff812ab8
feat(net): ApiUpload ^& fix unfired finished signals
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-25 12:02:46 -07:00
Trial97
6d0e255ca1
fix: Page container extra info set on logs page
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-25 22:00:33 +03:00
Rachel Powers
3105f314cb
fix: class rename (lsp acitons undid the first rename :P)
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-25 11:09:26 -07:00
Rachel Powers
6db906d623
chore: format
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-25 11:09:26 -07:00
Rachel Powers
418677ef31
refactor: override / mask static make functions for ApiDownload
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-25 11:09:25 -07:00
Rachel Powers
9c10965997
refactor: split out setting api headers for downloads
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-25 11:09:25 -07:00
TheKodeToad
1bd778d0ae
Merge pull request #1270 from TheKodeToad/fix-unchecked-value
...
Fix unsafe usage of std::optional::value in FlameAPI
2023-06-25 18:24:29 +01:00
Trial97
87155e346c
Complicated a little task progress
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-25 19:44:18 +03:00
Trial97
52dd09bdf7
Merge branch 'curse' of github.com:Trial97/PrismLauncher into curse
2023-06-25 17:51:30 +03:00
Trial97
d344ffe370
Removed some setProgress calls
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-25 17:50:56 +03:00
TheKodeToad
4745ab64cd
Deduplicate launcher icon
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-25 15:02:25 +01:00
TheKodeToad
288ea3d19b
Remove metaurl function
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-25 14:52:33 +01:00
TheKodeToad
8ade44c9a3
Simplify
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-25 14:40:22 +01:00
Trial97
fa3a46498f
Removed dupliacte code
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-25 16:23:50 +03:00
Leo
953a2590e2
Add fixme comment for no SSD detection
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: Leo <leo3758@riseup.net >
2023-06-25 10:11:58 -03:00
TheKodeToad
02b628653b
Fix markdown header
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-25 13:43:03 +01:00
Trial97
3546f57a42
Use internal markdown implementation
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-25 15:17:09 +03:00
Trial97
8d3bc6b6b9
Added markdown QT version check
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-25 14:58:54 +03:00
TheKodeToad
c75ba0f855
Fix big mistake :iea:
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-25 12:46:07 +01:00
Trial97
d1603f1945
Made it more similar to mrpack export
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-25 14:43:11 +03:00
Trial97
84c63f4f01
Added plantxt export
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-25 14:11:41 +03:00
TheKodeToad
514080653f
Fix unsafe usage of std::optional::value in FlameAPI
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-25 11:56:28 +01:00
TheKodeToad
603ed22015
Replace accidental usages of QAbstractButton::pressed
...
This signal is not usually what you want, and creates an inconsistent experience.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-25 10:36:54 +01:00
Trial97
ef0752972a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into export
2023-06-25 12:26:54 +03:00
Trial97
fd5b155ee7
Added error message when exporting snapshots with curseforge
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-25 12:24:59 +03:00
Trial97
40fbae8ff6
Fixed links tooltip
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-25 11:36:37 +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
54d7477679
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into visit_mod_page
2023-06-25 10:12:29 +03:00
Trial97
6f7d901a1f
removed extra variable
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-25 09:17:28 +03:00
TheKodeToad
5eb71fc6a9
Revert "feat(Mods): hide 'Provider' column when no mods have providers"
...
With Ryex's change, this causes issues. Apparently you need to sign off reverts! That's just weird...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-24 23:36:32 +01:00
TheKodeToad
8a3aba1634
Fix Open Global Settings, why not
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-24 23:30:51 +01:00
TheKodeToad
bb8e6ef35e
Fix flat white launcher icon
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-24 23:27:01 +01:00
TheKodeToad
529e2054ea
A few tweaks, with inspiration from Zeke :3
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-24 23:26:27 +01:00
Trial97
158b07a39e
moved getRequiredBy
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-25 00:24:08 +03:00
Trial97
932531c8ba
fixed authors
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-24 23:48:18 +03:00
Trial97
69c21454ec
removed projectID
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-24 22:15:18 +03:00
Trial97
564e394ec8
feat:Update mods now fills missing dependencies
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-24 21:48:12 +03:00
Trial97
f0e4e07c05
Updated url function
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-24 20:43:45 +03:00
Trial97
df932c6587
Updated authors string in modlist
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-24 20:22:18 +03:00
Trial97
81c1a95166
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
2023-06-24 20:04:56 +03:00
TheKodeToad
bcf45c74a1
Merge pull request #986 from Trial97/develop
...
Mod dependencies
2023-06-24 14:04:27 +01: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
Trial97
f825d7753a
Updated copyright headers
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-24 15:11:15 +03:00
Trial97
19cb6ad588
Updated Modrinth esport messages
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-24 15:04:18 +03:00
Trial97
4a84084d9d
Added condition for modlist
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-24 15:02:00 +03:00
Trial97
25579fbedc
Renamed ExportMrPackDialog to ExportPackDialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-24 14:54:39 +03:00
Trial97
59e1e51903
Removed unused files
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-24 14:51:12 +03:00
Trial97
30ef5475c7
Made sure CurseForge string is corect
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-24 14:50:05 +03:00
Trial97
9804996db6
Added resource packs to export
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-24 14:37:02 +03:00
Trial97
b774817ada
Merge branch 'curse' of github.com:Trial97/PrismLauncher into curse
2023-06-24 13:24:54 +03:00
Trial97
8939096db6
Fixed windows build
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-24 13:24:40 +03:00
Sefa Eyeoglu
df6d46de9e
Merge pull request #1261 from telans/modrinthexport-url
2023-06-24 10:51:14 +02:00
Alexandru Ionut Tripon
a325d814e2
Update launcher/modplatform/flame/FlamePackExportTask.cpp
...
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-06-24 11:13:08 +03:00
Trial97
cd1e8dc8cc
Removed modlist checkbox
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-24 11:12:23 +03:00
Trial97
377707d3db
Merge branch 'curse' of github.com:Trial97/PrismLauncher into curse
2023-06-24 11:02:40 +03:00
Trial97
7ebc8c48a8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
2023-06-24 11:02:13 +03:00
Alexandru Ionut Tripon
42bc04a0d2
Update launcher/ui/MainWindow.cpp
...
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-06-24 11:01:23 +03:00
Rachel Powers
4322222acc
Merge pull request #1255 from Trial97/export4
...
Added Thumbs.db to excluded files in MrPackExport
2023-06-23 21:40:55 -07:00
seth
cce6a54701
Merge pull request #1258 from leo78913/resources-pack-page-crash-fix
...
fix: fix crash when hiding columns on resource packs page
2023-06-24 00:39:47 -04:00
Rachel Powers
68865353cf
Merge pull request #1259 from PrismLauncher/update-devs
...
Update developers
2023-06-23 21:38:16 -07:00
Rachel Powers
0e7f435921
echo to correct var for summary
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-23 20:56:07 -07:00
James Beddek
20ba6e5fb5
modrinth: use encoded url when exporting pack
...
Ensures that necessary url components such as spaces are encoded.
Prevents an error when submitting the resulting file to modrinth.
See https://discord.com/channels/734077874708938864/1120070731242410024
Fixes : #1226
Signed-off-by: James Beddek <telans@posteo.de >
2023-06-24 15:42:58 +12:00
Trial97
cf94adb363
Added some warnings
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-24 01:05:49 +03:00
TheKodeToad
d74a23d5b2
Update developers
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-23 21:00:55 +01: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
31aaa6d1da
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
2023-06-23 22:41:06 +03:00
Trial97
823cd3862d
Fixed hash checking
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-23 22:41:01 +03:00
TheKodeToad
741c23a72a
Merge pull request #1256 from Trial97/fix11
...
Fixed hashers
2023-06-23 19:53:44 +01:00
Trial97
28de461067
Fixed hashers
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-23 21:38:41 +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
Trial97
222a10891c
Fixed merge
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-23 19:41:55 +03:00
Trial97
cb2671a02c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
2023-06-23 19:35:47 +03:00
Trial97
0a56631831
Added curseforge search
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-23 19:35:41 +03:00
Rachel Powers
046d510134
Merge pull request #1200 from Trial97/net_job_crash
...
Made ByteSynkArray to use shared_ptr
2023-06-23 09:13:52 -07:00
Trial97
90df092174
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
2023-06-23 17:29:58 +03:00
Trial97
85bbab0e92
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash
2023-06-23 14:38:30 +03:00
Trial97
67db141203
Renamed getResults to resultsReady
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-23 14:38:23 +03:00
Alexandru Ionut Tripon
c5ea8367aa
Update launcher/ui/themes/CatPack.cpp
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-06-23 14:25:21 +03:00
Trial97
f8adb508ab
Made catpack id optional in catpack.json
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-23 11:44:40 +03:00
Trial97
6613deca0f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
2023-06-23 11:42:28 +03:00
Trial97
763b3c3236
Added Thumbs.db to excluded files in MrPackExport
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-23 10:38:26 +03:00
Trial97
718aca3d06
Fixed date constructor
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-23 09:24:18 +03:00
Trial97
bf95cfb30e
Added CatPacks
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-23 01:37:28 +03:00
seth
8df5ab8aa7
Merge pull request #1251 from getchoo/github-clarify
...
chore: add 'suggest a feature' message in help
2023-06-22 17:13:00 -04:00
seth
83efdccfe1
Merge pull request #1252 from getchoo/import-hehe
...
chore: avoid confusion in file/url import dialog
2023-06-22 17:12:35 -04: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
seth
a4521ac0bb
chore: avoid confusion in file/url import dialog
...
Signed-off-by: seth <getchoo@tuta.io >
2023-06-22 16:15:03 -04:00
Tayou
c5f16276d7
Merge pull request #1235 from ChrisLane/java-check-debug-msg-fix
2023-06-22 22:03:30 +02:00
seth
03361e51ef
chore: add 'suggest a feature' message in help
...
Signed-off-by: seth <getchoo@tuta.io >
2023-06-22 15:58:53 -04:00
Trial97
85495c794d
changed map tipe
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-22 21:12:02 +03:00
Trial97
049b02cee4
finished up the curesforge export
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-22 21:06:01 +03:00
TheKodeToad
05d2c1f0b0
Dynamic button text
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-22 18:18:33 +01:00
Trial97
3c9c39cb89
Updated slug for url
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-22 20:04:23 +03:00
Trial97
377f27b16f
Updated slug for url
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-22 20:04:06 +03:00
Trial97
58321f3491
Added curseforge export
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-22 20:03:44 +03:00
Trial97
4e07f9574a
Use slug for url
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-22 18:11:25 +03:00
Trial97
da6f846a49
Use slug for url
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-22 18:11:03 +03:00
Trial97
9ad356d66f
Added ExportModsToStringTask
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-22 17:44:12 +03:00
Trial97
836e8d2e28
Fixed code quality
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-22 17:39:57 +03:00
Trial97
b84dc8551a
Fixed trigger function
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-22 16:49:19 +03:00
Trial97
f7d502c68c
Added ExportModsToStringDialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-22 16:08:04 +03:00
Trial97
9d2516a199
Added ExportModsToStringTask
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-22 16:07:55 +03:00
TheKodeToad
e7ad373d89
Merge branch 'PrismLauncher:develop' into better-component-installation
2023-06-22 13:22:44 +01:00
TheKodeToad
dea33a3c1d
Make selectedPage const 🤦♀️
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-22 13:13:25 +01:00
TheKodeToad
1f16380efc
Fix
...
I could use rvalue references and fix my brain fart, but i think regular references are more readable and safer here.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-22 12:56:47 +01:00
Sefa Eyeoglu
05a8232a8f
Merge pull request #1243 from Trial97/export
...
Added regex expresion to exclude .DS_Store files
2023-06-22 08:09:31 +02:00
Trial97
0063d52952
Merge branch 'settings2' of github.com:Trial97/PrismLauncher into settings
2023-06-21 23:25:37 +03:00
Trial97
2e82c1d40c
Added regex expresion to exclude .DS_Store files
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-21 23:22:25 +03:00
Trial97
820892d7cc
Made settings editable when instance is running
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-21 22:42:08 +03: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
Trial97
480faca559
Removed unused variable
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-21 21:17:17 +03:00
TheKodeToad
0975dbc3dd
Merge pull request #1228 from Trial97/curent_pack_crash
...
Fixes #1212
2023-06-21 15:35:09 +01:00
DioEgizio
8aa02320e0
Merge pull request #1231 from telans/modrinth-default-icon
...
Modrinth: use default icon for non-managed packs
2023-06-21 12:25:26 +02: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
ba609f3600
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into visit_mod_page
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-21 09:14:58 +03:00
seth
ca659136e2
Merge pull request #1119 from Trial97/mods_txt
...
Added dynamic page extra info
2023-06-20 19:56:38 -04:00
seth
f1a6dc5332
Merge pull request #1184 from clickdevin/develop
...
Fix bugs when updating curseforge modpacks
2023-06-20 19:55:48 -04:00
seth
4eaa7dc8b1
Merge pull request #1234 from Szowisz/develop
...
Fix compiling on FreeBSD
2023-06-20 19:55:03 -04:00
TheKodeToad
94510edd72
Rework icons (Fabric is blurry now but looks better)
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-20 19:57:15 +01:00
Chris Lane
9ad29e8d85
Remove extra spaces in one more Java checker debug
...
Signed-off-by: Chris Lane <git@chrislane.com >
2023-06-20 15:51:31 +01:00
Chris Lane
07f3d27fb8
Clean up 'Running java checker' debug msg code
...
Signed-off-by: Chris Lane <git@chrislane.com >
2023-06-20 15:36:25 +01:00
Chris Lane
f2692e60f3
Add missing space in java checker debug message
...
Signed-off-by: Chris Lane <git@chrislane.com >
2023-06-20 12:44:44 +01:00
James Beddek
009623823d
Modrinth: use default icon for non-managed packs
...
Fixes : #317
Signed-off-by: James Beddek <telans@posteo.de >
2023-06-20 23:00:13 +12:00
Jakub Wroński
a32a3e25ad
Fix compiling on FreeBSD
...
Signed-off-by: Jakub Wroński <kubawronski161@gmail.com >
2023-06-20 12:59:47 +02: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
TheKodeToad
3c648ff9fd
Merge pull request #1233 from p2js/ui-consistency-fix
...
Remove inconsistent/unneeded question marks in UI
2023-06-20 11:05:26 +01:00
Alfio
f769b0b4c6
Remove inconsistent/unneeded question marks in UI
...
Signed-off-by: P2 <tomarchioalfio5@gmail.com >
2023-06-20 10:40:27 +02:00
James Beddek
75bd626f33
Screenshots: do not retry image thumbnailing on null result
...
This causes the thumbnailing thread pool to spend a lot of time attempting to
retry an image that failed. A null result is common where the image is too large
to be allocated (>128MiB alloc).
The repeated retries continue after page delete, causing hangs if a user
tries to exit the application.
Fixes : #1201
Signed-off-by: James Beddek <telans@posteo.de >
2023-06-20 16:59:59 +12:00
James Beddek
f2471f0f68
Screenshots: clear the thumbnailing pool on page delete
...
Removes pending QThreadPool jobs which linger after page delete.
May help with #1201 by allowing the pool to finish earlier.
Signed-off-by: James Beddek <telans@posteo.de >
2023-06-20 16:54:15 +12:00
James Beddek
d9b24f7705
Screenshots: remove path from watcher if it no longer exists
...
Signed-off-by: James Beddek <telans@posteo.de >
2023-06-20 16:52:57 +12:00
TheKodeToad
a389983d7d
Just use the old ordering
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-20 00:28:42 +01:00
TheKodeToad
82d3755e25
License all the things
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-19 23:36:20 +01:00
TheKodeToad
6ccc7e77f9
Basic, unfinished & broken impl
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-19 22:42:30 +01: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
d02858040e
Fixes #1212
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-19 13:09:37 +03:00
Trial97
3ee0fec729
Removed mods from lambda
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-19 12:22:22 +03:00
Trial97
ec063470d7
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mods_txt
2023-06-19 12:20:50 +03:00
Trial97
b2ed2bf810
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash
2023-06-19 12:01:35 +03:00
Rachel Powers
f8a02a5c9b
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into packaging/appimage-updates
2023-06-19 01:41:14 -07:00
Rachel Powers
6685810081
packaging: sign appimages with gpg
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-19 01:34:14 -07:00
Rachel Powers
53d40df292
packaging: add appimage update capability
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
packaging(linux): use vars when refrencing qt install dir
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
packaging(appimage): dont use rsync
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
packaging: use runner.workspace when copying files
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
packaging(appimage): put zsync in relase:x
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
use with:token insted of env for GITHUB_TOKEN (which is depricated)
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
fix: appimage zsync needs consistant filenames across verisons
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
upload proper zsync
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
fix: non versioned appimage filename
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-19 00:49:03 -07:00
Sefa Eyeoglu
af6bf11793
Merge pull request #1224 from DioEgizio/add-appstream
2023-06-19 09:35:56 +02:00
DioEgizio
d5b5f0503c
chore: change xml name to what linuxdeploy wants
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2023-06-19 09:17:15 +02:00
DioEgizio
555cb40efd
chore: install appstream in appimage
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2023-06-19 09:17:15 +02:00
seth
9d22fce53f
Merge pull request #1214 from PrismLauncher/renovate/cachix-install-nix-action-22.x
...
chore(deps): update cachix/install-nix-action action to v22
2023-06-18 22:06:47 -04:00
seth
aee0999daa
Merge pull request #1210 from getchoo/opengl-appimage
...
fix(appimage): bundle generic opengl lib
2023-06-18 22:06:03 -04:00
Trial97
1bdde1f947
Small fixes
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-19 00:36:37 +03:00
Trial97
319ce8c19f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
2023-06-19 00:06:44 +03:00
Trial97
4e66f55d84
Removed extra headers
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-18 23:32:17 +03:00
Trial97
6826f1d605
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash
2023-06-18 23:27:41 +03:00
Trial97
0161520b33
Fixed leaks
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-18 23:27:26 +03:00
Sefa Eyeoglu
12cd8a7bea
Merge pull request #1218 from flowln/bad_commit_string_in_bundled_package
...
Hide the Git commit entry on the About dialog when the build doesn't have git stuff support
2023-06-17 18:04:54 +02:00
flow
2d00a727f6
fix: hide git commit when the build doesn't have git stuff support
...
This fixes the Git commit string being "GITDIR-NOTFOUND" on the About
page when building a package from the bundled source archive.
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-06-17 11:09:05 -03:00
renovate[bot]
b123f4f948
chore(deps): update cachix/install-nix-action action to v22
2023-06-16 21:58:32 +00:00
seth
fd9a8d1551
Merge pull request #1110 from TheKodeToad/version-search
...
Add a search bar to version lists
2023-06-16 14:47:39 -04:00
seth
6bc1150ad0
Merge pull request #1187 from getchoo/rel-8.0
...
chore: bump to 8.0
2023-06-16 14:46:25 -04:00
seth
45cce1d19a
fix(appimage): bundle generic opengl lib
...
Signed-off-by: seth <getchoo@tuta.io >
2023-06-16 14:34:44 -04:00
DioEgizio
412349ac58
Merge pull request #1135 from Trial97/installed_mods
2023-06-16 09:56:51 +02:00
Sefa Eyeoglu
000f4386a2
Merge pull request #1192 from Trial97/pre-lauch
2023-06-16 09:46:24 +02:00
Sefa Eyeoglu
5d3329b1ef
Merge pull request #1198 from TheKodeToad/remove-a-space
2023-06-16 09:42:41 +02:00
Trial97
147366bc0a
Made ByteSynkArray to use shared_ptr
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-15 22:59:41 +03:00
TheKodeToad
13804f80de
Fix trailing space in instance name
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-15 16:37:03 +01:00
Trial97
1d354df1f8
Fix tests for window
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-15 16:51:58 +03:00
Trial97
1b42b9a08e
Fixed tests
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-15 14:25:58 +03:00
Trial97
535fb2c4d6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into pre-lauch
2023-06-15 14:13:30 +03:00
Trial97
98a07da39b
Renamed variable
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-15 14:12:29 +03:00
TheKodeToad
8bf5ba2836
Merge pull request #1195 from Scrumplex/fix-javavendor-instance
...
Add JavaVendor as an instance override
2023-06-15 12:11:32 +01:00
Sefa Eyeoglu
798e1abb58
Merge pull request #1159 from getchoo/fix-devshell
2023-06-15 12:49:58 +02:00
Sefa Eyeoglu
90a4f622d2
Merge pull request #1063 from RedsonBr140/feat/RootFolder
2023-06-15 12:49:21 +02:00
Sefa Eyeoglu
6812823b55
fix: simplify resolving of data path
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me >
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-06-15 12:48:22 +02:00
Sefa Eyeoglu
7ad9abf9bc
fix: add JavaVendor as an instance override
...
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-15 12:45:03 +02:00
Trial97
cb52be433d
Made the installed mods more apparent
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-15 13:20:08 +03:00
Trial97
1f2b0ad698
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into installed_mods
2023-06-15 12:39:20 +03:00
Trial97
6667ff9330
Updated text and fixed mod page text update
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-15 12:32:48 +03:00
Trial97
5bf091149d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mods_txt
2023-06-15 11:46:44 +03:00
Trial97
be0df38453
Added tooltip for name label
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-15 11:40:39 +03:00
Trial97
fcfb3d2df7
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into visit_mod_page
2023-06-15 10:37:10 +03:00
Trial97
1ff8136f98
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into scale_cat
2023-06-15 10:36:05 +03:00
Trial97
182e19eae3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
2023-06-15 10:35:26 +03:00
seth
9908e115aa
Merge pull request #1067 from RedsonBr140/feat/dont-hide-settings
...
feat: Don't hide the settings tab when an instance is running
2023-06-15 02:20:00 -04:00
Trial97
811c79423f
Fixed version comparation
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-15 00:43:05 +03:00
Trial97
cf4c1605eb
Fixed qt5 build
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-15 00:37:32 +03:00
Trial97
e0b901169a
Added new migration for special characters
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-15 00:27:20 +03:00
seth
3f1548ae0e
Merge pull request #1099 from Trial97/logdir
...
store logs in seperate directory
2023-06-14 15:38:47 -04:00
TheKodeToad
3526d00a23
Merge branch 'develop' into feat/dont-hide-settings
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-14 20:05:02 +01:00
seth
e8b0a7c6f0
chore: bump to 8.0
...
Signed-off-by: seth <getchoo@tuta.io >
2023-06-14 12:45:08 -04:00
clickdevin
d4f2059b78
Fix bugs when updating curseforge modpacks
...
Signed-off-by: clickdevin <git@clickdevin.me >
2023-06-14 10:42:37 -04:00
DioEgizio
a4502f44c2
Merge pull request #1145 from Trial97/net_job_crash
2023-06-14 12:46:00 +02:00
TheKodeToad
18c436c2bc
Merge pull request #1174 from Trial97/pre-lauch
2023-06-14 11:32:55 +01:00
Trial97
b77fb05908
Added back the INIFile read function
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-13 21:07:05 +03:00
seth
703f7698c1
Merge pull request #1140 from guihkx/ci-exclude-git-folder-from-sources-tarball
...
CI: Exclude `.git` directory from the source code tarball
2023-06-13 12:47:35 -04:00
DioEgizio
69bfb55397
Merge pull request #1166 from TheKodeToad/mrpack-export-oops
2023-06-13 18:00:44 +02:00
TheKodeToad
180ed0cc1a
Merge branch 'PrismLauncher:develop' into skinfix
2023-06-13 11:08:21 +01:00
Tayou
b174f82261
Merge pull request #1162 from leo78913/i-hate-naming-branches
2023-06-12 21:41:17 +02:00
Tayou
9406022e70
Merge pull request #1151 from TayouVR/rainbow-konami
2023-06-12 21:25:17 +02:00
TheKodeToad
f4a814b5e6
Remove unnecessary code
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-12 15:46:15 +01:00
TheKodeToad
94ddc8bbf7
Could this work?
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-12 14:14:50 +01:00
TheKodeToad
aaab95ba55
Basic Quick Play support
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-12 12:08:57 +01:00
leo78913
d6c7b4e813
add icons to export menu
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-06-11 21:50:29 -03:00
seth
ad0493390b
fix(nix): use prismlauncher-unwrapped in devShell
...
Signed-off-by: seth <getchoo@tuta.io >
2023-06-11 14:02:36 -04:00
Tayou
5aa1c340dc
rainbow konami & toggle
...
Signed-off-by: Tayou <tayou@gmx.net >
2023-06-11 01:58:37 +02:00
Trial97
47372c2fbd
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into installed_mods
2023-06-10 22:04:12 +03:00
Trial97
ae9e8dbafd
Removed const specification
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-10 22:04:08 +03:00
TheKodeToad
b7d82354cb
[ci skip] License headers!! (yay)
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-10 14:43:58 +01:00
Trial97
b3d743635c
Updated the messages
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-09 21:29:12 +03:00
Trial97
f2932c6d03
Fixed some crashes
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-09 21:23:41 +03:00
guihkx
93436b0940
ci: exclude .git directory from the source code tarball
...
Reduces the its final size from 17.1 MiB down to 7.9 MiB.
Signed-off-by: guihkx <626206+guihkx@users.noreply.github.com >
2023-06-09 00:56:17 -03:00
Trial97
f96b135ef7
Higlight installed mods
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-08 20:26:09 +03:00
DioEgizio
bfe7e3afed
Merge pull request #1133 from DioEgizio/bump-mac-11.0
2023-06-08 18:11:59 +02:00
DioEgizio
75b1eaed0c
chore: bump macOS requirement to 11.0
...
Noticed only now that Qt 6.5 bumps the macOS requirement to macOS 11.
This was basically already effective in prism since with the Qt 6.5 bump pr macOS 10.15 user's wouldn't be able to run this, but updating the requirement here makes it more clear for the end user trying to run prism on macOS 10.15
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2023-06-08 17:12:49 +02:00
Sefa Eyeoglu
7fb4c8358b
Merge pull request #1131 from DioEgizio/revert-to-qt650
2023-06-08 16:20:22 +02:00
PandaNinjas
95f6860005
Apply suggestions from code review
...
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la >
2023-06-08 10:12:27 -04:00
DioEgizio
5b3431b268
chore: revert macOS Qt version back to 6.5.0
...
Qt 6.5.1 seems to cause issues with Rectangle
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2023-06-08 14:55:09 +02:00
PandaNinjas
e6872aba75
Readd deleted line
...
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la >
2023-06-07 22:15:44 -04:00
PandaNinjas
11cbeb8f96
Fix shadowing and add copyright header
...
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la >
2023-06-07 22:13:57 -04:00
PandaNinjas
886b372ade
Fix accidentally renamed variable
...
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la >
2023-06-07 20:03:58 -04:00
PandaNinjas
534328f16d
Remove unnecessary switch statement
...
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la >
DCO Remediation Commit for PandaNinjas <admin@malwarefight.wip.la >
I, PandaNinjas <admin@malwarefight.wip.la >, hereby add my Signed-off-by to this commit: 318d11481d
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la >
2023-06-07 19:46:36 -04:00
PandaNinjas
318d11481d
Resolve other switch fallthrough issues
2023-06-07 19:37:54 -04:00
PandaNinjas
5d425ecc02
Fix the AccountList code
...
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la >
2023-06-07 18:14:05 -04:00
PandaNinjas
c225ecbb55
Add sensible defaults in AccountList.cpp
...
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la >
2023-06-07 18:01:39 -04:00
TheKodeToad
0b4807dc1f
Questionable fix two
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-07 22:55:37 +01:00
Trial97
d33de2e427
Made cat scalable
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-08 00:54:32 +03:00
TheKodeToad
1191c33c2b
Remove flawed implementation
...
This seems to add the latest icon (bug) as a fallback if not provided...
but it mainly seems to cause problems... 🤷
I swear I did `git add .`.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-07 22:45:21 +01:00
TheKodeToad
52054469cd
Fix *bug* lol
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-07 22:39:23 +01:00
PandaNinjas
a90eaafa70
Make it clear that the statements are meant to fall through in Murmur hash
...
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la >
2023-06-07 15:18:59 -04:00
Trial97
bbd9e4de9b
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mods_txt
2023-06-07 20:18:56 +03:00
Trial97
8abe6b6732
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into visit_mod_page
2023-06-07 20:18:36 +03:00
Tayou
9b9d439fce
Merge pull request #1111 from Trial97/requires
2023-06-07 18:57:46 +02:00
Sefa Eyeoglu
62d1bc87ae
Merge pull request #1117 from leo78913/update-pack-formats
2023-06-07 17:49:52 +02:00
Tayou
51ed39804f
Merge pull request #1125 from Ryex/fix/link-crash-1118
2023-06-07 16:14:53 +02:00
Rachel Powers
d12110b47b
fix #1118 : use filePath not path on QFileInfo
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-07 06:26:58 -07:00
Sefa Eyeoglu
accf0cd40e
Merge pull request #1115 from leo78913/fix-resource-downloader-crash
2023-06-07 08:47:19 +02:00
Trial97
e936bc4c60
Added custom text for multiple selection
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-07 01:38:10 +03:00
Trial97
f724059b88
Added visit mod's page
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-07 01:23:53 +03:00
Trial97
1e702ee40f
Added dynamic page extra info
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-07 00:16:23 +03: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
Tayou
3b9d822d72
Merge pull request #1073 from leo78913/accounts-menus-fixes
2023-06-06 20:34:41 +02:00
Tayou
f3a7de6b76
fix: save meta custom url as string, not QUrl ( #1114 )
2023-06-06 20:25:29 +02:00
leo78913
a807b231a7
fix: fix crash when selecting resource/texture/shader packs
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-06-06 15:17:13 -03:00
TheKodeToad
a2d0d5a71d
Allow arrow key movement, fix auto-focus
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-06 18:26:26 +01:00
leo78913
d59a06344a
fix main toolbar accounts toolbutton name
...
previously it was not using the selected account name when opening the launcher
and i also added an action group to the menu items so it uses radio buttons instead of checkboxes :p
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-06-06 14:21:41 -03:00
Tayou
e884341795
save meta custom url as string, not QUrl
...
Signed-off-by: Tayou <tayou@gmx.net >
2023-06-06 18:15:26 +02:00
Rachel Powers
3a068970f9
Packaging: file manifest in portable install ( #1101 )
2023-06-06 16:03:13 +02:00
TheKodeToad
c343036d3b
Simplify
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-06 12:24:53 +01:00
Trial97
1043d29dd5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into requires
2023-06-06 10:34:36 +03:00
Trial97
6505a62801
Renamed requires fields
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-06 10:34:05 +03:00
Sefa Eyeoglu
7e016c44c1
Merge pull request #1093 from getchoo/use-flake-parts
...
Refactor Nix Flake
2023-06-06 08:10:39 +02:00
TheKodeToad
7c5047b2ac
cAsE iNsEnSiTiVe
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-05 23:12:47 +01:00
TheKodeToad
961285d6ab
Add a search bar to version lists
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-05 22:47:42 +01:00
DioEgizio
e1b37f3cd3
Merge pull request #1108 from Ryex/fix/memory-leak-translation
2023-06-05 20:34:56 +02:00
DioEgizio
0c24827a52
Merge pull request #1103 from Ryex/fix/1.120-allowed_symlinks.txt
2023-06-05 20:32:30 +02:00
Sefa Eyeoglu
e6eee82fb9
Merge pull request #1100 from Ryex/packaging/windows-installer-uninstall-previous
2023-06-05 20:30:57 +02:00
Sefa Eyeoglu
c5cf78205a
Merge pull request #1109 from TheKodeToad/mrpack-export-validate
2023-06-05 19:44:45 +02:00
TheKodeToad
37b4f606c8
Validate input lengths on mrpack export
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-05 17:54:24 +01:00
Rachel Powers
5824047ffa
fix(memory leak): cyclic refrence in translations model dl task
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-05 01:12:16 -07:00
Rachel Powers
df18d8560d
chore: fix test & clean up one last warning
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-04 22:46:05 -07:00
Rachel Powers
3dccc38f42
Merge pull request #904 from TheKodeToad/mrpack-export
...
mrpack export
2023-06-04 19:01:50 -07:00
Rachel Powers
3531c5bb8c
packaging(appimage): put zsync in relase:x
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-04 16:58:46 -07: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
7e0e1ec51d
chore: add better default compiler warnings
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-04 14:10:17 -07:00
Rachel Powers
ab41816265
packaging: use runner.workspace when copying files
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-04 12:27:01 -07:00
Rachel Powers
2c95973446
packaging(appimage): dont use rsync
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-04 10:36:34 -07:00
Rachel Powers
89d8f9b829
packaging(linux): use vars when refrencing qt install dir
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-03 22:43:41 -07:00
Rachel Powers
0bda885bbf
packaging: add appimage update capability
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-03 21:56:46 -07:00
Rachel Powers
f613b03efd
Typo fix
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-03 08:28:49 -07:00
TheKodeToad
3c87e5d31e
Make mcInstance mutable
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-03 13:48:15 +01:00
TheKodeToad
e26827b849
Optimised icons
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-03 13:39:42 +01:00
Rachel Powers
8eb10e991f
fix: use isSymLink (i've made this mistake before but I've made it again)
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-02 16:14:38 -07:00
Rachel Powers
f6f32914de
fix: add origonal instance path to allowed_symlinks.txt when copying via symlinks
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-02 16:04:27 -07:00
Trial97
9ca74cd009
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-03 00:48:13 +03:00
Trial97
d50bd096a4
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into logdir
2023-06-03 00:44:53 +03:00
Alexandru Ionut Tripon
1840505a0f
Fix crash when selecting same mod from different providers ( #1029 )
2023-06-02 18:04:06 -03:00
seth
29e532c096
fix(nix): fix prismlauncher-qt5
...
Signed-off-by: seth <getchoo@tuta.io >
2023-06-02 11:53:09 -04:00
Sefa Eyeoglu
0f0cbd4c1f
refactor(nix): introduce unwrapped packages
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-06-02 12:41:18 +02:00
Sefa Eyeoglu
0ece0b5b27
Merge pull request #1086 from TayouVR/fix-qt6_5-brown-system-theme
2023-06-02 12:18:37 +02:00
Rachel Powers
74d4a98864
refactor: split out setting api headers for downloads
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-01 16:39:04 -07:00
Trial97
17691ab515
Made use of moveFile function
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-02 01:22:25 +03:00
Rachel Powers
f619a04fe7
refactor: rename app class
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-01 14:55:20 -07:00
Trial97
3a6657596b
Added migration for old logs
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-01 23:48:48 +03:00
Rachel Powers
5627b4a9c5
refactor: rename updater files
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-01 13:45:36 -07:00
Rachel Powers
6a4fb6a271
packaging: remove redundant "do you want to uninstall previous version"
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-06-01 12:40:08 -07:00
Rachel Powers
46a13c8767
packaging: fix typo ; in middle of line
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-31 20:16:58 -07:00
Rachel Powers
3bbe33132a
packaging: convert msys paths
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-31 19:39:14 -07:00
Rachel Powers
b48540dc32
packaging: trim leading working dir from manifest paths
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-31 16:27:53 -07:00
Rachel Powers
4e0a08345d
packaging: add manifest.txt to linux tarballs
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-31 16:07:29 -07:00
Rachel Powers
9b1e0eb57d
packaging: msys2 shell is bash
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-31 16:01:31 -07:00
Rachel Powers
4cbae0a751
packaging: trim manfest paths to be relative
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-31 15:36:25 -07:00
Rachel Powers
68c2833552
packaging: use powershell name
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-31 14:55:13 -07:00
Rachel Powers
dbe14c6be5
packaging: ensure all files are in manifest
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-31 14:54:06 -07:00
Rachel Powers
4593538fc8
fix: typo - space before comment
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-31 14:36:24 -07:00
Rachel Powers
7c85462ff3
packaging: include file manifest in portable install
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-31 14:31:38 -07:00
Rachel Powers
8db4a2a5b9
Merge branch 'packaging/windows-installer-uninstall-previous' into feat/windows-updater
2023-05-31 13:57:56 -07:00
Rachel Powers
2dce08caf1
fix: typo - space before comment
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-31 13:54:13 -07:00
Rachel Powers
f5729d9a7c
Revert "fix: typo - no space before comment"
...
This reverts commit 0b2044e9a4 .
2023-05-31 13:53:44 -07:00
Rachel Powers
0b2044e9a4
fix: typo - no space before comment
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-31 13:52:23 -07:00
Rachel Powers
03b66ba7a5
packaging: make windows nsis installer run the uninstaller for previous install before installing
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-31 13:25:14 -07:00
Trial97
6c082403c4
Fixed comments
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-05-31 20:23:23 +03:00
Trial97
29c3dc40ef
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into logdir
2023-05-31 20:12:12 +03:00
Rachel Powers
1c91d2f242
feat: paliminary updater
...
- can check for need to update
- can select a version to update to
- perform update: TODO
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-30 23:03:44 -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
Rachel Powers
eb079c8060
cleanup: msgbox msg editor
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-28 11:13:53 -07:00
Tayou
c0f9ccc5b5
Use slash_star comment style in .editorconfig
...
Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com >
2023-05-28 19:57:08 +02:00
Trial97
51c39ec681
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop
2023-05-28 19:16:14 +03:00
Trial97
10436ed70c
Fixed code quality
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-05-28 19:15:41 +03:00
Trial97
775236a1b3
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-05-28 18:27:54 +03:00
Trial97
b9503ff15f
Added Q_DECLARE_METATYPE(ModPlatform::IndexedPack::Ptr)
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-05-28 18:27:02 +03:00
Trial97
b4dff181f7
Fixed Ptr logic
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-05-28 18:22:55 +03:00
Trial97
737fc1a2a4
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-05-28 18:01:39 +03:00
Trial97
bdff8591aa
Removed extra loop
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-05-28 17:54:46 +03:00
Trial97
27c3775f99
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into Fix_Assert
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-05-28 17:44:23 +03:00
Trial97
bf0a577fb9
Fixed repaint issue
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-05-28 16:57:35 +03:00
flow
954d4d701a
Merge pull request #1034 from kerichdev/patch-1
2023-05-28 10:56:44 -03:00
flow
ce2d58bb7d
Merge pull request #1083 from Ryex/fix/memory-leaks-develop
2023-05-28 10:11:43 -03:00
Rachel Powers
7af116fb00
refactor: function scope statics
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-28 05:06:28 -07:00
Rachel Powers
0357921284
cleanup: move qstyle getInstance decl inline
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-28 04:37:09 -07:00
TheKodeToad
86974b046e
Clarify comment
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-05-28 11:48:09 +01:00
Rachel Powers
a04a6f1e0d
fix(memory leak): don't give shared pointers out to foldermodels (causes cyclic refrence)
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-28 02:15:39 -07:00
Rachel Powers
37420405c7
fix(memory leak): refactor NoBigComboStyle -> singleton
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-27 23:22:40 -07:00
seth
acf1946dac
chore(nix): update sources
...
Signed-off-by: seth <getchoo@tuta.io >
2023-05-27 19:25:58 -04:00
seth
a52574b026
chore(nix): add nil
...
Signed-off-by: seth <getchoo@tuta.io >
2023-05-27 19:25:49 -04:00
seth
5d14724e66
chore(deps): enable nix lockfile maintenance for renovate
...
Signed-off-by: seth <getchoo@tuta.io >
2023-05-27 19:17:44 -04:00
seth
d582bf7f1f
feat(nix): flake-utils -> flake-parts
...
Signed-off-by: seth <getchoo@tuta.io >
2023-05-27 19:14:50 -04:00
Trial97
7d79abb607
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into Fix_Assert
2023-05-27 23:06:55 +03:00
Rachel Powers
c81cb59b4b
fix(memory leak): don't capture job and create cyclic refrence
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-26 21:21:10 -07:00
Rachel Powers
ff03dd22fe
fix(memory leak): don't override default deconstructor + reset shared_ptr + ensure modal get's cleaned up
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-26 21:10:49 -07:00
Rachel Powers
aae892dfd1
fix(memory leak): IndexedPack too large to live inside a qlist without pointers ()
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-26 19:21:07 -07:00
Rachel Powers
2680dba0aa
fix: use <= when compareing release types
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-26 17:16:50 -07:00
Rachel Powers
832a61f886
fix: make codeQl happy
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-26 16:34:30 -07:00
Rachel Powers
cf4df19986
feat: display release type
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-26 16:23:43 -07:00
Rachel Powers
c156034069
feat: add verion_type / release_type to IndexedVersion
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-26 13:50:22 -07:00
Sefa Eyeoglu
f24211e8b5
Merge pull request #1088 from DioEgizio/update-qt651
...
chore: update to Qt 6.5.1
2023-05-26 07:31:18 +02:00
Rachel Powers
e61d8e4dc8
fix: katabasis and QStyle leaks
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-25 16:16:58 -07:00
flow
403279e926
Merge pull request #1087 from PrismLauncher/renovate/cachix-install-nix-action-21.x
2023-05-25 19:08:16 -03:00
DioEgizio
70983c7269
chore: update to Qt 6.5.1
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2023-05-25 16:38:24 +02:00
Rachel Powers
086a7e19f0
feat: Column on left, hideable
...
- columns are hideable (saves to settings)
- image column moved to left
- datamodals can provide resize modes
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-24 20:15:34 -07:00
renovate[bot]
42f9eccb17
chore(deps): update cachix/install-nix-action action to v21
2023-05-24 14:21:39 +00:00
Tayou
3c937532f2
fix System theme colors on windows
...
Signed-off-by: Tayou <tayou@gmx.net >
2023-05-24 15:18:08 +02:00
TheKodeToad
863027cbe8
Enable size grip
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-05-22 11:56:54 +01:00
Rachel Powers
6b8fe283f0
fix: memory leak, set parent so it's in tree to get cleaned up.
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-21 01:49:13 -07:00
Rachel Powers
7983977156
feat: Qt 5.15 adds transfer timeouts. at least use it for downloads
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-21 01:48:34 -07:00
Rachel Powers
21cb459899
fix: memory leak NetJob wans't getting cleaned up. ensure lambda capture of job doens;t increase refcount or it will be cyclic
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-21 01:47:54 -07:00
Rachel Powers
1b3ff96ffd
fix: memory leak with NetJob and responce not getting cleaned up
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-21 01:46:28 -07:00
Trial97
2f37cb31d9
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
2023-05-20 13:36:05 +03:00
Trial97
e5534cd1f3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into Fix_Assert
2023-05-20 13:35:47 +03:00
flow
42ceaa0015
Merge pull request #1080 from Scrumplex/update-social-links
2023-05-19 16:37:03 -03:00
Sefa Eyeoglu
90b330d4ba
chore: update social links
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-05-19 18:34:54 +02:00
leo78913
4f0ec908ec
feat: add a close button to the main toolbar when running on gamescope
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-05-17 00:57:28 -03:00
Rachel Powers
bd1ea64d02
cleanup
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-16 00:01:52 -07:00
Rachel Powers
649753e97e
cleanup: remove unneeded headers
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-15 16:40:56 -07:00
Rachel Powers
fc656b6927
fix: when given a remost resource, download and identify it before import.
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-15 16:34:33 -07:00
Kode
3be18b58bb
Better variable name :p
...
Signed-off-by: Kode <TheKodeToad@proton.me >
2023-05-15 19:15:56 +01:00
TheKodeToad
22aaf56855
De-hardcode .index
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-05-15 18:48:49 +01:00
leo78913
7537ea1ef5
make instance settings account selector a comboBox
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-05-14 16:33:41 -03:00
Trial97
94cd831e8d
Made sure the metadata is valid when checking mod deps
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-05-14 22:13:53 +03:00
Keri
2078133493
fix: remove unnecessary keywords from desktop file
...
this messes with apps that use tag search like rofi
Signed-off-by: Keri <kerichuudev@gmail.com >
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-05-14 14:38:19 +02:00
Trial97
ffcc58cb3e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
2023-05-14 14:20:24 +03:00
Trial97
8c7fd3327e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into Fix_Assert
2023-05-14 14:20:04 +03:00
Kode
f60562c5a2
Merge branch 'develop' into mrpack-export
...
Signed-off-by: Kode <TheKodeToad@proton.me >
2023-05-13 19:07:03 +01:00
TheKodeToad
18cfe219fe
Hopefully This Works™
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-05-13 18:58:05 +01:00
TheKodeToad
129e959a3b
Move setAbortable(true)
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-05-13 18:28:51 +01:00
TheKodeToad
e1b6020b76
Make some changes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-05-13 18:24:01 +01:00
Sefa Eyeoglu
d5c6a1b4d1
Merge pull request #1007 from Ryex/fix/network_and_signals
2023-05-13 19:06:47 +02:00
Redson
79ce7eb1fc
fix: shouldDisplay() is now redundant.
...
Signed-off-by: Redson <redson@riseup.net >
2023-05-13 09:00:10 -03:00
Rachel Powers
b1ffc8ddab
refactor: normalize url fn & cleanup
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-12 16:37:45 -07:00
Kode
5b8d025440
ty!
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: Kode <TheKodeToad@proton.me >
2023-05-12 14:43:55 +01:00
Rachel Powers
3e11d94829
spelling suggestions from code review
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-12 01:47:18 -07:00
Rachel Powers
6b6d6a01dc
Merge branch 'develop' into fix/network_and_signals
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-12 01:13:17 -07:00
Rachel Powers
82287e0407
Merge branch 'develop' into curseforge-url-handle
2023-05-12 01:00:26 -07:00
Sefa Eyeoglu
c5aff7cc1e
Merge pull request #961 from Ryex/better-tasks
2023-05-12 09:47:19 +02:00
Rachel Powers
b16829b0f9
Gib -> GiB
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-12 00:21:37 -07:00
Rachel Powers
f27716656c
fix: remove qt < 5.6 support process error signal
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-11 16:32:00 -07:00
Redson
37a6ef95f0
feat: Don't hide the settings tab when an instance is running
...
Signed-off-by: Redson <redson@riseup.net >
2023-05-10 08:25:13 -03:00
Redson
475761b295
fix: Prism sets the data dir to the working directory.
...
Signed-off-by: Redson <redson@riseup.net >
2023-05-09 06:36:21 -03:00
Redson
0b251fa754
feat: Add the launcher root folder to the Folders menu
...
Signed-off-by: Redson <redson@riseup.net >
2023-05-08 19:57:30 -03:00
Rachel Powers
30cf73a22f
typo fix
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-07 13:23:59 -07:00
Rachel Powers
884ac73078
Merge remote-tracking branch 'upstream/develop' into better-tasks
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-07 13:21:21 -07:00
Trial97
ef6cbdfa2a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
2023-05-07 19:01:20 +03:00
Rachel Powers
718abaae0e
doc fixes
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-06 19:18:39 -07:00
Rachel Powers
62a402d05a
refactor: move functions to utils + code-review fixes
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-06 19:10:58 -07:00
Sefa Eyeoglu
ce5bb29c44
Merge pull request #1054 from Ryex/more-lax-block-mods-filename-check
2023-05-06 09:54:59 +02:00
Sefa Eyeoglu
d535f73a58
Merge pull request #950 from DioEgizio/resize-settings
...
fix: divide minecraftpage into tabs
2023-05-06 08:28:46 +02:00
DioEgizio
d38696f411
Update launcher/ui/pages/global/MinecraftPage.ui
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2023-05-06 07:15:14 +02:00
Rachel Powers
a3173b5371
fix: ensure Application accepts URLs and local files form cmd args
...
refactor: Move curseforge:// url scheme detection to Import Page
feat: pass along extra CF pack info so pack metadata is established.
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-05 15:05:17 -07:00
timoreo
54fb799d95
Fix command line args
...
Signed-off-by: timoreo <contact@timoreo.fr >
2023-05-05 15:05:17 -07:00
timoreo
565202c990
Added a protection against giving a mod url
...
Signed-off-by: timoreo <contact@timoreo.fr >
2023-05-05 15:05:17 -07:00
timoreo
63c21c53af
Added url handler for curseforge
...
Signed-off-by: timoreo <contact@timoreo.fr >
2023-05-05 15:05:17 -07:00
Rachel Powers
d0b6f0124b
change: don't search appdata locaiton for logging rules if using custom data dir
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-05 14:13:34 -07:00
Rachel Powers
b266068644
Apply suggestions from code review
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-05 14:07:10 -07:00
Rachel Powers
74e7c13a17
feat: display license and issue tracker
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-05 13:46:38 -07:00
Rachel Powers
3cfcc83ea9
change: don't toggle a resource's enabeling just by selecting it. only if they are on the checkbox.
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-05 13:46:01 -07:00
Rachel Powers
ee94be624e
use 32x32 images for image column
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-05 11:28:19 -07:00
Rachel Powers
2fe3dc5960
fix: fix qchar conversion and codeql
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-05 11:13:36 -07:00
Rachel Powers
fd7338d3f3
fix: grow pixmapcache if it is evicting too fast
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-04 23:47:27 -07:00
Rachel Powers
ed185f047f
feat(resourcePackPage): icon column
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-04 23:46:00 -07:00
Rachel Powers
d384d991fa
feat(texturepackPage): icon column
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-04 23:45:24 -07:00
Rachel Powers
9913080a82
feat(modpage): mod icon in description and column
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-04 23:44:28 -07:00
Rachel Powers
ec157b766e
feat(mod parsing): load extra mod details
...
- (image, license, issuetracker)
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-04 23:42:42 -07:00
Trial97
469ef3e06d
Fixed code error
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-05-05 00:04:24 +03:00
Trial97
107b470289
Updated required_by as dependency
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-05-04 23:54:46 +03:00
Rachel Powers
e0635955df
fix: super lax compare
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-04 13:30:39 -07:00
Trial97
8b14b946e2
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-05-04 22:35:16 +03:00
Trial97
f7b912fc9d
Fixed comments
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-05-04 22:25:05 +03:00
Trial97
9fbec3793f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
2023-05-04 20:29:33 +03:00
Rachel Powers
5ec4cbf1cb
fix add an addtion lax file name match with replaced with +
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-03 20:31:15 -07:00
Trial97
e4449a0ba3
Initialized variable
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-05-03 09:09:07 +03:00
Trial97
42dc3ed03f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into Fix_Assert
2023-05-03 00:56:26 +03:00
Trial97
f6ed2036b3
Removed comment
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-05-03 00:55:18 +03:00
Trial97
f8bf71e152
Moved the selected resources to one list
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-05-03 00:49:54 +03:00
TheKodeToad
e0380960fd
Change to use future
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-05-02 14:23:31 +01:00
Sefa Eyeoglu
64ba5e4ed1
Merge pull request #833 from Ryex/advanced_copy_instance
2023-05-02 12:11:41 +02:00
Rachel Powers
733619ca74
feat: estimate remining time on downloads
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-01 10:48:00 -07:00
Rachel Powers
9f9c829bc5
fix: prevent logspam, fix MacOS theme artifacts
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-01 10:48:00 -07:00
Rachel Powers
236764adf6
refactor: Qt can handle const& in signals and slots
...
While most Qt types cna use implicit data sharing
pasing our own structs means copies. const& ensure
it's only copied as needed by Qt.
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-01 10:48:00 -07:00
Rachel Powers
a80b425551
fix: no need for const bool
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-01 10:48:00 -07:00
Rachel Powers
d7032d975c
fix: no need to loop all sub tasks
...
pathc by flowin
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-05-01 10:48:00 -07:00
Rachel Powers
96decbac27
feat: default qtlogging.ini file
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-01 10:48:00 -07:00
Rachel Powers
0fb6a2836b
refactor: propogate only only one StepProgress at a time
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-01 10:48:00 -07:00
Rachel Powers
fe36471b8d
refactor: logging.h -> Logging.h
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-01 10:48:00 -07:00
Rachel Powers
6b28af6cc5
fix: clean up license headers for Tasks
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-01 10:48:00 -07:00
Rachel Powers
6306fb564b
feat: add UID to debug lines of upload tasks
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-01 10:48:00 -07:00
Rachel Powers
cdccb25fe3
feat: add download size to download details alongside speed
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-01 10:48:00 -07:00
Rachel Powers
b6452215c1
feat: add details signal to Task
...
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-01 10:47:50 -07:00
Rachel Powers
f1028fa66d
fix: properly map progress range
...
- doument PCRE used for URL compacting
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-01 10:47:31 -07:00
Rachel Powers
9d2f0e4dc8
feat: Propogated subtask progress
...
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-01 10:47:20 -07:00
Rachel Powers
f997529cd4
feat: better task tracking
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-05-01 10:45:34 -07:00
Rachel Powers
495103f72e
fix: set x-xbl-contract-version header during xbox auth step
...
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-05-01 10:43:31 -07:00
Rachel Powers
d80dee2a54
refactor: pass instance ptr to resource models. use it to find instance root.
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-04-29 19:55:37 -07:00
Rachel Powers
788fa40c2a
refactor: Move ini to use QSettings && drop get/setList functions
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-04-29 19:55:24 -07:00
Sefa Eyeoglu
ae75585b52
Merge pull request #1040 from Scrumplex/remove-modpacksch
...
Remove FTB modpack support
2023-04-29 08:04:53 +02:00
Sefa Eyeoglu
ff07714e8c
chore: remove FTB modpack support
...
We have been contacted by Feed the Beast to drop support for the FTB
modpack browser from Prism Launcher.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-04-28 11:35:20 +02:00
Sefa Eyeoglu
f54fc16718
Merge pull request #1025 from japa4551/lastLaunchTimeDate
2023-04-27 10:09:53 +02:00
Trial97
61a2355618
Removed formated but not used files
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-27 01:41:26 +03:00
Trial97
248920a221
Removed extra code
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-27 01:33:46 +03:00
Japa
7298f9c273
Fixed typo
...
Signed-off-by: Japa <japa4551@protonmail.com >
2023-04-26 16:06:17 -03:00
Trial97
b2ecb9ac09
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop
2023-04-22 22:28:08 +03:00
Trial97
f738d7566e
Fixed code qulity
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-22 22:27:33 +03:00
Japa
672f5cf160
Update launcher/minecraft/MinecraftInstance.cpp
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: Japa <japa4551@protonmail.com >
2023-04-21 19:46:33 -03:00
Trial97
1d167f8fda
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-22 01:32:33 +03:00
Trial97
460e83207f
Fixed removeIf for Qt version
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-22 01:18:27 +03:00
Trial97
75116364c6
Small Cleanup
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-22 00:55:11 +03:00
Trial97
f7931c2ee2
Better version handling
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-22 00:47:51 +03:00
Kode
dfc2b9c76a
thanks flowln! :P
...
Signed-off-by: Kode <TheKodeToad@proton.me >
2023-04-21 20:49:47 +01:00
Trial97
22bbf1bd1f
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-21 21:11:09 +03:00
Trial97
10aac4fe17
Fixed assert
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-21 21:03:01 +03:00
Trial97
42bc91463e
Updated links
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-21 20:37:17 +03:00
Trial97
b4fa6e120a
Fixed tipo
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-21 18:42:06 +03:00
Trial97
2c744da9f7
More cleanup
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-21 18:42:06 +03:00
Trial97
ffaa47bf54
Small cleanup
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-21 18:42:06 +03:00
Trial97
63c4469475
Merge branch 'develop' of github.com:Trial97/PrismLauncher into develop
2023-04-21 18:42:06 +03:00
Trial97
c1490cd627
Refator task to work with multiple providers
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-21 18:42:06 +03:00
Alexandru Ionut Tripon
1a390b6043
Merge branch 'PrismLauncher:develop' into develop
2023-04-21 18:42:06 +03:00
Trial97
fac33498db
Made some copy by reference
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-21 18:42:06 +03:00
Trial97
31e84780a8
Hope to fix windows build errors
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-21 18:42:06 +03:00
Trial97
f3f8f3574a
Small headers removal
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-21 18:42:05 +03:00
Trial97
7bd26ce468
Semi fixed the Modrinth dependency implementation
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-21 18:42:05 +03:00
Trial97
bcea19b957
Tried to fix codeQL
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-21 18:42:05 +03:00
Trial97
5079ce8d64
Fixed headers
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-21 18:42:05 +03:00
Alexandru Ionut Tripon
f231a33f6e
Merge branch 'PrismLauncher:develop' into develop
2023-04-21 18:42:05 +03:00
Trial97
4fe497cd68
First working version with curseforge mods
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-21 18:42:05 +03:00
Trial97
5655a33515
Added Dependency API
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-21 18:42:05 +03:00
Japa
92cda68480
Update launcher/minecraft/MinecraftInstance.cpp
...
Co-authored-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
Signed-off-by: Japa <japa4551@protonmail.com >
2023-04-21 11:18:17 -03:00
Japa
f41426f394
Instance Description displays the last launch date
...
Initial Draft using the Standard C++ Library, still requires testing.
Signed-off-by: Japa <japa4551@protonmail.com >
2023-04-21 00:30:38 -03:00
Tayou
87db723008
add global .editorconfig for doxygen comment style
...
Signed-off-by: Tayou <tayou@gmx.net >
2023-04-18 20:25:45 +02:00
DioEgizio
8dc3267925
Merge pull request #994 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x
2023-04-18 18:54:11 +02:00
TheKodeToad
709736d3f9
Make response const
...
I don't think the segfault fix was ideal :P
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-04-18 09:28:10 +01:00
Rachel Powers
12f0d51c0c
Fix: signal/slot macro -> func pointer & network fixes
...
- 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-04-17 18:23:18 -07:00
TheKodeToad
2e9403a324
This was moved
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-04-17 13:19:59 +01:00
TheKodeToad
ba17efa381
Smol fixes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-04-17 13:18:25 +01:00
TheKodeToad
b8e0c8ebc6
Boring changes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-04-17 10:16:03 +01:00
Sefa Eyeoglu
1b05303250
Merge pull request #946 from Ryex/subfolder-watch
2023-04-14 17:10:25 +02:00
renovate[bot]
51095c5a27
chore(deps): update hendrikmuhs/ccache-action action to v1.2.9
2023-04-14 06:31:06 +00:00
Rachel Powers
a02f67ed0e
refactor: rename watch_subdirectories -> watch_recurisve (prevent confusion of behavior)
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-04-12 11:30:02 -07:00
Trial97
11f8d25d94
Added missing character
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-12 00:49:50 +03:00
Trial97
4fbd5abe41
Added task to load dependencies
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-12 00:45:44 +03:00
Trial97
d524935b67
Added task to load local mod information
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-11 20:55:10 +03:00
Trial97
6d5c629b43
Added dependencies to the APIs
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-04-10 00:04:35 +03:00
Kode
3a7961834a
Remove seek
...
Don't need it if the data is already in a byte array.
Signed-off-by: Kode <TheKodeToad@proton.me >
2023-04-09 21:28:40 +01:00
DioEgizio
95842ee25f
Merge pull request #983 from DioEgizio/update-qt650-win
2023-04-08 22:14:26 +02:00
DioEgizio
371c839573
chore: update Qt to 6.5.0 on Windows
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2023-04-08 19:38:46 +02:00
DioEgizio
1b8b044b52
Merge pull request #982 from Scrumplex/fix-theming-style
2023-04-08 19:26:43 +02:00
Sefa Eyeoglu
a988111507
fix: do not apply system theme on launch
...
Closes PrismLauncher/PrismLauncher#490
Regression introduced by PrismLauncher/PrismLauncher#249
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-04-08 18:48:05 +02:00
Rachel Powers
c56db0408b
fix: load setting state with page. don't translate "..."
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-04-08 07:26:56 -07:00
Rachel Powers
2321d9c065
fix: canonical*File*Path()
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-04-07 18:36:35 -07:00
flow
ed085630db
Merge pull request #968 from Scrumplex/nix/sync-2023-04-02
2023-04-07 06:51:14 -07:00
flow
74d5c7c1a4
Merge pull request #972 from DioEgizio/update-qt650
2023-04-07 06:50:02 -07:00
TheKodeToad
813ccc1381
How did i-
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-04-07 11:03:11 +01:00
TheKodeToad
b65f4c9536
Better collectFileListRecursively error
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-04-06 19:59:24 +01:00
TheKodeToad
012d8bb468
Revert concurrent syntax
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-04-06 19:58:09 +01:00
TheKodeToad
d7a137ad13
Remove more prototype not good code
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-04-06 19:24:19 +01:00
TheKodeToad
073aaf9b3b
Remove "prototype" field
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-04-06 19:19:41 +01:00
TheKodeToad
871d647c93
Use local metadata
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-04-06 19:18:36 +01:00
Rachel Powers
0ce3049579
fix: sysinfo libs needed too
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-04-03 18:48:28 -07:00
Rachel Powers
de20258aa7
fix: filelink needs network for local socket
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-04-03 18:30:28 -07:00
Rachel Powers
41c5e523b2
fix: add back QT::Widgets link
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-04-03 18:09:01 -07:00
Rachel Powers
197be9cfd0
fix: remove fixed datastream version
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-04-03 18:00:56 -07:00
Rachel Powers
5b50b806ec
refactor: remove data duplication in statis FS Names
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-04-03 17:14:06 -07:00
Rachel Powers
62c59820cf
fix: harden watchPath. NO DUPLICATES! >:(
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-04-03 15:26:26 -07:00
DioEgizio
0cf1fc72a3
chore: update to qt 6.5.0 on macos
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2023-04-03 18:01:23 +02:00
Rachel Powers
5ce7874280
fix: no loops in watch paths! >:(
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-04-02 18:55:21 -07:00
Rachel Powers
ba2b5c3a65
fix: Apply suggestions from code review
...
-expand columspan on new UI element
-improve tooltip
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-04-02 16:39:13 -07:00
Sefa Eyeoglu
0a9081cb87
Merge pull request #965 from getchoo/update-manoghud-detection
2023-04-02 17:55:19 +02:00
flow
eea1e3b800
Merge pull request #967 from PrismLauncher/renovate/flatpak-flatpak-github-actions-6.x
2023-04-02 08:03:02 -07:00
Sefa Eyeoglu
70364884a9
feat(nix): add support for GameMode
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-04-02 11:35:35 +02:00
Sefa Eyeoglu
ea7f03770c
refactor(nix): use qtWrapperArgs
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-04-02 11:33:04 +02:00
txtsd
bc1a7d2890
Merge pull request #966 from getchoo/use-ninja
...
use ninja in nix builds
2023-04-02 14:06:35 +05:30
renovate[bot]
732bc53692
chore(deps): update flatpak/flatpak-github-actions action to v6
2023-04-02 03:14:42 +00:00
seth
4055e34320
chore: use system architecture to detect vulkan layers
...
Signed-off-by: seth <getchoo@tuta.io >
2023-04-01 13:09:09 -04:00
seth
81b1406290
feat(nix): use ninja for builds
...
Signed-off-by: seth <getchoo@tuta.io >
2023-04-01 13:06:53 -04:00
Rachel Powers
538092b727
fix: typos, CamelCase to camelCase the new names
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-31 20:31:27 -07:00
Rachel Powers
4df4b43900
fix: Apply suggestions from code review (string changes)
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-31 18:25:29 -07:00
seth
3e3b92d4c1
chore: improve detection of newer vulkan layers
...
i've been scrump'd
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: seth <getchoo@tuta.io >
2023-03-31 20:09:26 +00:00
seth
c7dc115365
fix: search for newer mangohud vulkan layers
...
Signed-off-by: seth <getchoo@tuta.io >
2023-03-31 15:49:09 -04:00
TheKodeToad
e42050cc8a
Skip lookup if no files and fail if zipping fails
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-28 14:22:28 +01:00
Rachel Powers
df17f5e899
fix: use QDir::Filter::NoDotAndDotDot
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-27 19:11:26 -07:00
Rachel Powers
a0045ece07
feat: add setting to watch recursively
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-27 19:01:53 -07:00
DioEgizio
4c013e59f0
divide minecraftpage into tabs
...
this way small screen users can use the launcher settings without having window a bigger than their actual screens
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2023-03-25 13:12:50 +01:00
Sefa Eyeoglu
09d607f39c
Merge pull request #945 from Scrumplex/fix-logging-newlines
2023-03-25 10:37:02 +01:00
Sefa Eyeoglu
9418c62d95
refactor: reprocess log lines per instance
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-03-22 10:32:17 +01:00
Rachel Powers
ef50e5595e
fix: don't try to watch the entier filesystem by watching parent links
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-21 12:17:01 -07:00
Rachel Powers
02bf086c09
feat: watch sub directories for mods
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-21 11:07:20 -07:00
Sefa Eyeoglu
77932061bc
chore: update ignores for Nix
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-03-21 18:33:41 +01:00
Sefa Eyeoglu
44bf32e729
fix: handle partial lines in LoggedProcess
...
Fixes PrismLauncher/PrismLauncher#930
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-03-21 18:30:46 +01:00
Rachel Powers
0c986ba4d0
spelling and formatting
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 16:38:40 -07:00
Rachel Powers
a28193430c
fix: adjust geometry and add missing tooltip
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:33 -07:00
Rachel Powers
0bec0046bb
format: clang-format to fix windows fallout
...
it looked fine over in vscod on windows but
as soon as I opened it on linux via Helix
the chaos was clear
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:33 -07:00
Rachel Powers
a96519cbdc
workflow: add filelink.exe to SignTool call
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:33 -07:00
Rachel Powers
458c2f38bc
cleanup: code review sugestions
...
clean up translation strings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:33 -07:00
Rachel Powers
dc5402349e
refactor: use UUID toString mode
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:33 -07:00
Rachel Powers
ae289c923c
fix: clean up initial review comments (flowin)
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:33 -07:00
Rachel Powers
e0ef86340f
feat: connect new help button help-pages/instance-copy
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:33 -07:00
Rachel Powers
1ca2c59f2e
feat: track instance copies that use links
...
confirm deleations when other instances link to it
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
3ec92acfe7
fix: use noexcept overload of std::filesystem::hard_link_count
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
656bfd36f6
fix: ensure filelink.exe is included in setup.exe
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
562ae676a5
fix: mingw still missing typedefs
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
72292f4e03
fix: windows compile broke
...
move winapi defs into #ifndef blocks don't check explicitly for __mingw__ define
function name win_ioctl_clone didn't get updated in teh last commit
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
536da704fc
refactor: cleanupFilesystem.cpp
...
* remove now redundant reflink/clone code for windows
* remove unnessacery debug code that could slow things down
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
a0e03c41c0
fix: typos
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
a1053a4c5a
feat: warnings when instance resources are linked
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
9f441a9678
feat: Add UAC icon when symlinking on windows.
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
7870cf28e5
fix: add missing mingw defs
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
9939367db7
feat(reflink): ioctl_clone for winbtrfs & ReFS
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
1210c3256d
fix: macos compat after refactor of clonefile
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
2e8d04aad0
feat: support reflink on windows via winbtrfs!
...
https://github.com/maharmstone/btrfs
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
3a0e4546c2
fix: windows test compat
...
fix: compiler warning on int qint32 compare
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
cd2419137d
fix: better test compareison (also qt5 compat)
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
34ac8b3ec3
fix: Qt < 5.14.0 compat
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -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
bc8336a4b1
fix: cleanup UI, detect FAT and turn off links
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
397e7f0363
feat(reflink): hook up relink / clone on the copy dialog
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
c5bbe42b57
feat: reflink / Clone support!
...
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
Rachel Powers
1bed7754e0
feat(symlinks): make recursive links explicit
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
5978882378
feat(symlinks&hardlinks): linkup copy dialog
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
8ba51c7900
refactor: make complete list of links to make and send that.
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
6d160a7b7e
feat: successful process elevation and comunication!
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
32409a361b
fix CMakeLits.txt for non MSVC windows builds
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
2ceefea5f3
qt5 compatability
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
485f156e57
working outside windows
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:32 -07:00
Rachel Powers
f794e49bb6
we want to make links!
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-03-20 14:56:27 -07:00
TheKodeToad
46f448dfba
Improve invokeMethod syntax
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-19 21:26:25 +00:00
TheKodeToad
710156b9f1
Replace native file separator - this was accidentally brought to my attention on Modrinth's guild
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-19 21:25:12 +00:00
txtsd
6dcf34acdc
Merge pull request #937 from DioEgizio/update-qt6
2023-03-19 22:17:26 +05:30
DioEgizio
d2f674e08f
chore: update qt6 to 6.4.3 on windows and macos
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2023-03-19 17:11:16 +01:00
TheKodeToad
ec8cb056bf
QRegExp -> QRegularExpression :P
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-19 11:49:24 +00:00
TheKodeToad
1893871a99
Merge branch 'PrismLauncher:develop' into mrpack-export
2023-03-18 14:02:05 +00:00
TheKodeToad
8837f06e4e
Only add summary if not empty
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-18 14:01:41 +00:00
TheKodeToad
5346dfc782
Use first line of notes for summary
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-18 12:57:44 +00:00
TheKodeToad
ddca838e46
Info and error dialogs
...
TODO: is there a better approach?
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-18 12:24:18 +00:00
Sefa Eyeoglu
45b0367d14
Merge pull request #931 from Janrupf/feature/custom-downloads-dir
2023-03-14 13:53:51 +01:00
Sefa Eyeoglu
dce86edff0
Merge pull request #934 from heftymouse/develop
2023-03-14 13:52:44 +01:00
Sefa Eyeoglu
84e91ec3b5
Merge pull request #888 from Scrumplex/nix-stuff
2023-03-14 13:52:31 +01:00
Sefa Eyeoglu
05b6969ee5
fix: add mnemonic to downloads directory setting
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-03-14 13:35:16 +01:00
TheKodeToad
3390e84a9f
Merge branch 'PrismLauncher:develop' into skinfix
2023-03-14 12:07:05 +00:00
Nikhil B
af949f5cdd
Add visual studio files to gitignore
...
Signed-off-by: Nikhil B <59918974+heftymouse@users.noreply.github.com >
2023-03-14 16:52:06 +05:30
Sefa Eyeoglu
7707af08e3
chore(nix): update sources
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-03-14 11:19:23 +01:00
Sefa Eyeoglu
5db4fabcad
chore(nix): add deadnix
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-03-14 10:59:43 +01:00
Sefa Eyeoglu
cfca82ceb3
chore(nix)!: use overlays.default
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-03-14 10:58:41 +01:00
Sefa Eyeoglu
a1130dace0
chore: format markdown files
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-03-14 10:54:50 +01:00
Sefa Eyeoglu
95a0bd61a9
feat(nix): add pre-commit-hooks.nix
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-03-14 10:53:51 +01:00
Sefa Eyeoglu
b324778be7
feat(nix): add devShell
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-03-14 10:51:47 +01:00
Sefa Eyeoglu
950f921c09
refactor(nix): use flake-utils
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-03-14 10:50:07 +01:00
Sefa Eyeoglu
9dff1bac83
chore(nix): format code using alejandra
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-03-14 10:48:19 +01:00
Janrupf
c17f6e37e5
feat: Add setting for downloads directory
...
Closes #641
Signed-off-by: Janrupf <business.janrupf@gmail.com >
2023-03-13 21:58:22 +01:00
Sefa Eyeoglu
e0e26a37b5
Merge pull request #927 from kthchew/fix/mingw-build
2023-03-13 21:24:48 +01:00
Sefa Eyeoglu
15a0c03664
Merge pull request #928 from PrismLauncher/renovate/actions-cache-3.x
...
chore(deps): update actions/cache action to v3.3.1
2023-03-13 18:14:35 +01:00
txtsd
7642e75b28
Merge pull request #929 from Scrumplex/drop-snap
2023-03-13 22:37:16 +05:30
Sefa Eyeoglu
4b36d1e3ea
chore: drop Snap packaging
...
We do not have a lot of expertise dealing with Snap and as it is
currently breaking our CI, it might be good to drop support for it.
This does not mean that it won't come back in the future, but as it
stands, it was effectively unmaintained and was only used for nightly
builds anyway.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-03-13 15:33:23 +01:00
renovate[bot]
20525bec29
chore(deps): update actions/cache action to v3.3.1
2023-03-13 10:50:27 +00:00
Kenneth Chew
430369feb8
fix: explicit conversion to C string to fix MinGW g++ 10 build
...
Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com >
2023-03-12 18:33:48 -04:00
Kenneth Chew
5ac3e5c958
Update tomlplusplus library
...
Fix build on MinGW g++ 10
Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com >
2023-03-12 18:33:48 -04:00
TheKodeToad
2e1c123c05
Merge branch 'PrismLauncher:develop' into skinfix
2023-03-10 11:17:06 +00:00
TheKodeToad
83c5264598
Stupidly small skinfixfix as requested by DioEgizio
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-10 11:04:15 +00:00
txtsd
abc2a529fb
Merge pull request #919 from PrismLauncher/renovate/actions-cache-3.x
2023-03-09 20:54:31 +05:30
renovate[bot]
c638fd9056
chore(deps): update actions/cache action to v3.3.0
2023-03-09 14:41:24 +00:00
Sefa Eyeoglu
1dd96898e1
Merge pull request #896 from TheKodeToad/modrinth-token
2023-03-09 15:10:40 +01:00
TheKodeToad
2cc9b0df06
Only select some paths by default - again!
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-08 18:10:52 +00:00
txtsd
3bd4ad7c93
Merge pull request #918 from Scrumplex/qt6-default
2023-03-08 21:18:53 +05:30
Sefa Eyeoglu
a8ffdeca2b
chore!: switch to Qt 6 by default
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-03-08 11:22:30 +01:00
TheKodeToad
59b15c5f08
Fix another duplicate name 🤦
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-07 21:03:09 +00:00
TheKodeToad
59cf8f678f
(hopefully) Fix duplicates names
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-07 20:50:19 +00:00
TheKodeToad
088be050b2
Apply flowln's suggestion :)
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-07 20:46:27 +00:00
TheKodeToad
5d5fcae501
Further reduce buggy behaviour
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-06 17:24:04 +00:00
TheKodeToad
970ec8187c
More refactoring
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-05 18:25:57 +00:00
TheKodeToad
76f66148db
Apply flowln's suggestion
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-05 18:21:24 +00:00
Sefa Eyeoglu
6bdd6ce571
Merge pull request #912 from Scrumplex/bump-ghc-filesystem
...
Bump ghc-filesystem
2023-03-05 17:25:38 +01:00
Sefa Eyeoglu
dd96e1819d
fix: remove unneeded alias for ghc_filesystem
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-03-05 14:24:40 +01:00
Sefa Eyeoglu
07702d3be7
fix: drop unneeded GHC_FILESYSTEM_WITH_INSTALL
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-03-05 14:23:40 +01:00
Sefa Eyeoglu
b9dfcf6d2f
chore: bump ghc-filesystem
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-03-05 14:21:07 +01:00
Sefa Eyeoglu
f3f0652d2b
Merge pull request #853 from kumquat-ir/nil
...
NilLoader mod metadata support
2023-03-05 13:39:00 +01:00
Sefa Eyeoglu
aae60334d1
Merge pull request #911 from flowln/fix_zip_extract_windows
2023-03-05 13:09:25 +01:00
Sefa Eyeoglu
b38af948b9
Merge pull request #857 from Ryex/fix_windows_default_apps
2023-03-05 13:09:11 +01: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
TheKodeToad
87384182a1
Fix abort?
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-04 11:07:07 +00:00
TheKodeToad
f583e617ec
Implement abort (possible broken?) and therefore make it work without crashing!
...
The shared pointer was going out of scope 🤦 .
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-04 10:37:56 +00:00
TheKodeToad
a2716f5cf6
Improve code
...
Even more broken now (it is stuck loading forever)!
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-04 10:24:25 +00:00
TheKodeToad
55f928f845
More consistent naming
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-03 15:06:29 +00:00
TheKodeToad
2343aad088
Make it work! (TODO make it not crash)
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-03 15:00:07 +00:00
TheKodeToad
dcaa907fed
Mod loader support
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-03 11:25:11 +00:00
TheKodeToad
adcdf28d64
Move task to another thread
...
I don't know whether this is the prefered method.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-03 11:24:36 +00:00
TheKodeToad
f28a7b9d08
Add PackIgnoreProxy.h to cmake
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 19:50:42 +00:00
TheKodeToad
6505b0c065
Move logic to task
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 19:48:41 +00:00
TheKodeToad
88ef02474f
Minify index JSON
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 17:36:44 +00:00
TheKodeToad
9ec32b2561
Fix QuaZipFile usage
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 17:36:28 +00:00
TheKodeToad
a5dd6b6cd7
Export without file urls
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 16:41:09 +00:00
TheKodeToad
46cc325f7c
Add file tree
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 11:25:36 +00:00
TheKodeToad
0fadb5a2be
Add *basic* interaction
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 10:31:53 +00:00
TheKodeToad
8b897ac714
Fix menu being set as central widget
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 10:31:53 +00:00
TheKodeToad
a80b820e94
UI for mrpack export (broken)
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 10:31:53 +00:00
TheKodeToad
4efbf22089
Prism-ify more license headers
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 10:19:42 +00:00
TheKodeToad
5c913149c8
Merge branch 'PrismLauncher:develop' into modrinth-token
2023-03-02 10:10:46 +00:00
Sefa Eyeoglu
9265c319a9
Merge pull request #788 from flowln/other_resource_downloaders_two
...
Add resource pack, texture pack and shader pack downloaders
2023-03-02 10:08:45 +00:00
TheKodeToad
cbe6eff2fa
Move Modrinth before CurseForge for consistency
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 09:28:14 +00:00
TheKodeToad
1f3d18ec12
Replace with exact match and add TODO to improve
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 09:26:00 +00:00
Sefa Eyeoglu
89255e34bd
fix: change wording of TP/RP download buttons
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-03-02 09:42:28 +01:00
TheKodeToad
a7b8092296
Add link
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-01 14:41:16 +00:00
TheKodeToad
1feb630520
Allow custom Modrinth API token
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-01 14:24:56 +00:00
flow
9f202caf93
Merge pull request #895 from Scrumplex/fix-component-creation
...
Use makeShared for importing components
2023-03-01 12:08:46 +00:00
Sefa Eyeoglu
651e511ff0
fix: use makeShared for importing components
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-03-01 12:33:00 +01:00
Sefa Eyeoglu
b46aca52ee
Merge pull request #894 from PrismLauncher/renovate/cachix-install-nix-action-20.x
...
chore(deps): update cachix/install-nix-action action to v20
2023-03-01 11:22:59 +00:00
Sefa Eyeoglu
0eae9355e6
Merge pull request #889 from flowln/fix_zip_extract
2023-03-01 09:51:08 +01:00
Sefa Eyeoglu
4878f1a438
Merge pull request #735 from Scrumplex/import-component
2023-03-01 09:49:47 +01:00
renovate[bot]
f986b4cd56
chore(deps): update cachix/install-nix-action action to v20
2023-03-01 07:20:11 +00:00
flow
d5c6704475
fix: prevent crash when aborting import task while extracting pack
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-02-24 20:34:43 -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
kumquat-ir
01c4ed232e
license stuff
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2023-02-24 15:01:59 -05:00
kumquat-ir
dc8109658c
review fixes
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2023-02-22 13:20:13 -05:00
Sefa Eyeoglu
8ce8055aeb
Merge pull request #846 from PrismLauncher/renovate/vedantmgoyal2009-winget-releaser-2.x
2023-02-22 16:19:11 +01:00
flow
a71b743ee3
Merge pull request #881 from PrismLauncher/renovate/actions-cache-3.x
2023-02-22 07:07:55 -08:00
renovate[bot]
c50e9ac418
chore(deps): update actions/cache action to v3.2.6
2023-02-21 12:33:23 +00:00
kumquat-ir
7973b01e81
fix metadata for mods with .nilmod extension
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2023-02-19 17:21:53 -05:00
TheKodeToad
6a5e9a59df
Fix screwed up ui file
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-02-19 12:00:59 +00:00
TheKodeToad
bb62c62a03
Fix cmark again 🤦
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-02-19 11:37:59 +00:00
TheKodeToad
9cc3d9d4ce
Merge remote-tracking branch 'upstream/develop' into skinfix
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-02-19 11:35:26 +00:00
Sefa Eyeoglu
b977ac6df5
Merge pull request #865 from Scrumplex/codesign-windows
2023-02-17 17:56:55 +01:00
kumquat-ir
256fc322a8
minor cleanup
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2023-02-16 12:57:35 -05:00
Sefa Eyeoglu
33bf85a387
fix(actions): don't fail if code signing certificate is missing
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-02-16 16:41:40 +01:00
Sefa Eyeoglu
1f0fc61b53
Merge pull request from GHSA-gq28-qx55-mh2r
...
Don't extract files outside of target path
2023-02-15 21:48:06 +01:00
Sefa Eyeoglu
89c945ecc8
feat(ci): add Windows codesigning
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-02-15 20:43:33 +01:00
Sefa Eyeoglu
c15962c6c1
Merge pull request #859 from Ryex/fix-KISS-Linux-build
...
Add missing header to Application.cpp: Fix build failure on KISS Linux
2023-02-13 08:37:39 +01:00
kumquat-ir
9c2a3231c5
do not create nilmods folder
...
"it cant be that easy" - me, clueless
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2023-02-13 01:45:23 -05:00
Rachel Powers
80840f1fdb
fix: add missing header to Application.cpp
...
fails to compile on KISS Linux without
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-02-12 22:32:34 -07:00
Rachel Powers
7d02e1f866
feat: make shell association an optional section
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-02-12 17:34:37 -07:00
Rachel Powers
d93cb751b0
fix: oversight caused prism to be .zip windows default
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-02-12 16:23:33 -07:00
kumquat-ir
c07fff7503
switch to qdcss for parsing
...
make it not horrible to look at
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2023-02-12 17:23:15 -05:00
kumquat-ir
7896dd19c1
nilmods instance page
...
mostly copied from the coremod page impl
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2023-02-11 17:46:17 -05:00
kumquat-ir
f5f2d33f93
parse nil metadata
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2023-02-11 17:46:17 -05:00
renovate[bot]
4331eaae2e
chore(deps): update vedantmgoyal2009/winget-releaser action to v2
2023-02-11 15:48:00 +00:00
DioEgizio
d5d4f87236
Merge pull request #831 from PrismLauncher/renovate/cachix-install-nix-action-19.x
2023-02-11 16:47:30 +01:00
DioEgizio
5d49433326
Merge pull request #841 from RaptaG/patch-1
2023-02-11 08:45:42 +01:00
RaptaG
381d7413c8
Link license in the shield badge
...
So that no trash URL shows when hovering!
Signed-off-by: RaptaG <77157639+RaptaG@users.noreply.github.com >
2023-02-10 19:47:08 +02: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
Sefa Eyeoglu
a6ac832f8f
Merge pull request #839 from PrismLauncher/renovate/actions-cache-3.x
...
chore(deps): update actions/cache action to v3.2.5
2023-02-10 08:27:00 +01:00
renovate[bot]
104863846b
chore(deps): update actions/cache action to v3.2.5
2023-02-10 06:24:45 +00:00
Sefa Eyeoglu
5883c30b84
Merge pull request #834 from pandaninjas/patch-2
2023-02-09 09:29:13 +01:00
flow
cebaae76b4
Merge pull request #832 from ktheticdev/develop
...
Fix README COPR typo
2023-02-08 14:32:16 -08:00
PandaNinjas
d886d32bd8
Replace potentially ReDOSable regex
...
Signed-off-by: PandaNinjas <admin@malwarefight.gq >
2023-02-07 17:21:00 +00:00
ktheticdev
8440c2819b
Fix README.md typo
...
Signed-off-by: ktheticdev <64607352+ktheticdev@users.noreply.github.com >
2023-02-07 11:10:43 +04:00
renovate[bot]
8114d8778f
chore(deps): update cachix/install-nix-action action to v19
2023-02-06 15:31:42 +00:00
DioEgizio
f36c3a3f6c
Merge pull request #819 from Scrumplex/fix-launch-script
2023-02-06 16:26:54 +01:00
flow
46c6cc2d2b
chore: add my copyright headers
...
.-.
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-02-05 17:02:56 -03:00
flow
ada5e88eb9
feat(RD): add texture pack downloader
...
This extends the resource pack downloader, with the custom behavior of
filtering the versions that shows up, to those <= 1.6. As always, Flame
is funky and requires a bit more workarounds than average.
This will also get a nice improvement when the Version parsing and
comparison PR gets merged! :D
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-02-05 17:02:56 -03:00
flow
b724607e31
feat(RD): add shader pack downloader
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-02-05 17:02:56 -03:00
flow
c3ea303a37
feat(RD): add resource pack downloader
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-02-05 17:02:52 -03:00
Sefa Eyeoglu
e89a10945c
Merge pull request #823 from BalkanMadman/linux-java
...
Fix https://github.com/PrismLauncher/PrismLauncher/issues/790
2023-02-05 19:09:48 +01:00
Sefa Eyeoglu
8ddc89fa01
Merge pull request #825 from Ryex/cmd_env_native_sep
...
fix https://github.com/PrismLauncher/PrismLauncher/issues/824
2023-02-05 18:42:19 +01:00
Sefa Eyeoglu
a47bf72b07
Merge pull request #751 from Edgars-Cirulis/develop
2023-02-05 17:48:26 +01:00
Rachel Powers
34460dd77a
ensure command env vars use native path seperators
...
fix #824
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-02-04 12:28:52 -07:00
BalkanMadman
c125c96e88
Java installations detection fix for Linux
...
Signed-off-by: BalkanMadman <zurabid2016@gmail.com >
2023-02-04 16:48:06 +02:00
Sefa Eyeoglu
d2fd0fd8e8
Merge pull request #802 from KosmX/develop
2023-02-04 14:43:28 +01:00
flow
74a875bdce
Merge pull request #803 from TheLastRar/msys2-ccache
2023-02-04 05:37:23 -08:00
Sefa Eyeoglu
edaa66f622
fix: use /usr/bin/env bash in launch script
...
This should make it possible to run these scripts on any system, as
/bin/bash is not standard! Notably this fixes the script on NixOS.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-02-04 01:06:16 +01:00
Sefa Eyeoglu
c392db7e0d
Merge pull request #815 from Scrumplex/fix-funny
2023-02-03 18:44:07 +01:00
Sefa Eyeoglu
6ac073e779
fix: fix component uid regex
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-02-03 18:32:57 +01:00
flow
58d9ceda4b
Merge pull request #804 from flowln/improve_big_concurrent_task_test
2023-02-02 13:47:51 -08:00
flow
3781c64d41
Merge pull request #810 from flowln/error_on_bad_file_paths_as_we_should_catquake
2023-02-02 13:47:36 -08:00
flow
4166d9ab7b
fix: give error when components have bad uids
...
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-02-02 17:11:24 -03:00
flow
435273e08a
fix(Inst.Import): don't allow bad file path in mrpack import
...
This checks the URL of the path of the file to be downloaded,
ensuring that it always contains the root .minecraft target folder,
following the warning in the mrpack documentation.
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-02-02 17:11:24 -03:00
KosmX
35a62d9787
commit requested change, make the lock static
...
Signed-off-by: KosmX <kosmx.mc@gmail.com >
2023-02-01 23:31:12 +01:00
TheLastRar
75683039c5
CI: Always update windows ccache
...
Also change name to avoid pulling the stale cache
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2023-02-01 20:13:26 +00:00
TheLastRar
1a609612f2
CI: Move mingw restore cache before setup ccache
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2023-02-01 20:13:26 +00:00
TheLastRar
121a7a9e23
CI: Log ccache stats for msys2
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2023-02-01 20:13:26 +00:00
flow
e593faf245
fix(tests): improve the reliability of the Task's stack test
...
This actually takes into account the amount of stuff put into the stack
in each iteration, and thus avoids having to change the stack size of
the thread, and using ad-hoc values for the other stuff. It also reduces
the time the test takes to run.
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-02-01 16:58:33 -03:00
KosmX
ec5bb944b2
thread-safe logger
...
Signed-off-by: KosmX <kosmx.mc@gmail.com >
2023-02-01 14:59:11 +01:00
flow
deed49574a
Merge pull request #798 from PrismLauncher/renovate/actions-cache-3.x
2023-01-30 07:02:51 -08:00
renovate[bot]
7cc39cd357
chore(deps): update actions/cache action to v3.2.4
2023-01-30 13:29:47 +00:00
flow
a714d5966e
Merge pull request #795 from leo78913/mainwindow-fixes
...
closes https://github.com/PrismLauncher/PrismLauncher/issues/792
2023-01-29 10:35:26 -08:00
leo78913
2b0252d4ae
Fix: fix some regressions in the main window
...
this removes the update action from the help button
and fixes the add to path action not showing on macos
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-01-28 15:09:26 -03:00
flow
c78db5459e
Merge pull request #724 from leo78913/dot-ui-mainwindow
...
Closes https://github.com/PrismLauncher/PrismLauncher/issues/594
Closes https://github.com/PrismLauncher/PrismLauncher/issues/69
Closes https://github.com/PrismLauncher/PrismLauncher/issues/473
2023-01-27 10:55:49 -08:00
leo78913
a27564ed70
better fix for WideBar::insertSeparator
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-01-27 13:48:12 -03:00
leo78913
df8df41621
Remove unused BarEntry variable
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-01-27 12:40:27 -03:00
leo78913
d5a0d4b452
Update launcher/ui/MainWindow.ui
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-01-27 12:35:53 -03:00
leo78913
357b6ee991
Update launcher/ui/MainWindow.ui
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-01-27 12:35:41 -03:00
leo78913
4d2b5c2f42
refactor: clean up some MainWindow stuff
...
this makes the accounts button and menubar item share the same QMenu
and also refactors some code
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-01-26 19:48:21 -03:00
flow
f705cf09bc
Merge pull request #787 from flowln/make_shared_ptrs_explicit
2023-01-26 10:15:28 -08:00
flow
29f7ea752f
refactor: make shared_qobject_ptr ctor explicit
...
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-25 16:57:51 -03:00
flow
9b7c8ea22d
Merge pull request #779 from TheLastRar/zlib-undo-rename
2023-01-25 11:53:51 -08:00
Sefa Eyeoglu
199a7df807
refactor: add error handling to component import
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-01-25 10:43:23 +01:00
Sefa Eyeoglu
5186ad95d3
Merge pull request #784 from flowln/fix_resource_folder_double_smart_ptrs
2023-01-25 10:33:01 +01:00
Sefa Eyeoglu
0546345182
Merge pull request #458 from Scrumplex/remove-updater
2023-01-25 10:32:49 +01:00
flow
90feaaf2df
fix(Tasks): don't try to start more tasks than necessary
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-24 17:04:05 -03:00
flow
6d27ef5eea
fix(ResourceFolder): don't create two smart ptrs for the same raw ptr
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-24 17:04:01 -03:00
flow
e4e8a51e5c
Merge pull request #781 from Ryex/patch-1
2023-01-24 11:15:33 -08:00
Rachel Powers
3ddf413332
Update launcher/Application.cpp
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-01-24 09:24:12 -07:00
flow
6eb36fb053
Merge pull request #783 from DioEgizio/update-cmark-fix-cve
2023-01-24 07:25:26 -08:00
DioEgizio
58239ff98f
fix: update cmark to fix a CVE
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2023-01-24 15:05:13 +01:00
Sefa Eyeoglu
6e841a3b7e
Merge branch 'develop' into remove-updater
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-01-24 14:40:17 +01:00
Rachel Powers
085e067fc1
remove NDEBUG check per Scrumplex's orders
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-01-24 02:26:21 -07:00
Rachel Powers
c45fa016c0
fix: let jars be found from inside build dir for debug builds
...
debug bug builds run form inside the build dir before they are bundled can't find the jars
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-01-23 18:36:58 -07:00
Sefa Eyeoglu
16477a8f6c
Merge pull request #675 from flowln/generalize_mod_model
2023-01-23 23:58:52 +01:00
Sefa Eyeoglu
04e4900415
Merge pull request #758 from flowln/fix_process_events_backstab
2023-01-23 23:58:41 +01:00
TheLastRar
322f317a5b
fix: Undo zlibs file rename when using bundled zlib
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2023-01-23 22:36:26 +00:00
flow
ea5020e188
fix(license): add/fix my copyright/license headers
...
*sobbing in messy legal stuff i know nothing about*
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-23 11:12:43 -03:00
Sefa Eyeoglu
cefa1662ef
Merge pull request #772 from TheLastRar/zlib-fallback-bundled-fix
...
Fix: zlib fallback not working
2023-01-23 00:07:34 +01:00
TheLastRar
2a949fcb86
fix: zlib fallback
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2023-01-22 15:04:15 +00:00
flow
445f9e5f71
feat+fix(Version): make comparsion FlexVer-compatible
...
... and fixes a minor issue in the parsing.
This changes the expected behavior of Versions in one significant way:
Now, Versions like 1.2 or 1.5 evaluate to LESS THAN 1.2.0 and 1.5.0
respectively. This makes sense for sorting versions, since one expects
the versions without patch release to 'contain' the ones with, so the
ones without should be evaluated uniformily with the ones with the
patch.
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-21 18:47:47 -03:00
leo78913
5a25ce8c1b
Fix main window icon and stuff
...
i forgor 💀
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-01-20 19:45:43 -03:00
leo78913
670cf8ee07
Fix: make the newsLabel toolbutton fullwidth again
...
this reverts it to how it was before the MainWindow .ui port
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-01-20 19:45:43 -03:00
leo78913
6c5f6e8900
Fix status bar name
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-01-20 19:45:43 -03:00
leo78913
4ed4fb2314
remove useless setEnabled calls
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-01-20 19:45:43 -03:00
leo78913
f16989bea9
feat(WideBar): custom context menu actions
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-01-20 19:45:43 -03:00
leo78913
55d4064335
Fix: translate actionNoDefaultAcount text
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-01-20 19:45:43 -03:00
leo78913
3b38a4c690
Fix: translate NoAccountsAdded text
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-01-20 19:45:43 -03:00
leo78913
ada595663d
fix(widebar): fix insertSeparator
...
WideBar::insertSeparator was adding the separator to the end of the toolbar
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-01-20 19:45:43 -03:00
leo78913
b2de01b076
feat(WideBar): Allow disabling alt shortcuts
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-01-20 19:45:43 -03:00
leo78913
f3acf35aea
refactor: Port the main window to a .ui file
...
some stuff still needs to be done in the c++ side because qt designer is dumb >:(
the instance toolbar icon and instance name buttons are still added manually inside MainWindow.cpp
looks almost identical, with some minor tweaks:
- the instance toolbar is now a WideBar, so you can customize what actions you want :D
- the instance toolbar buttons are now fullwidth
- the close window button is now at the end of the file menu
- the help menu has some layout changes
this also fixes some stuff:
- menus not having tooltips
- the top toolbar not connecting to the title bar in kde
- the instance toolbar separators looking weird after you move the toolbar
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-01-20 19:45:43 -03:00
leo78913
3da1d6a464
feat: add Widebar::InsertWidgetBefore method
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2023-01-20 19:44:39 -03:00
flow
b9df10c8bd
Merge pull request #766 from TayouVR/change-cat-on-settings-change
...
closes https://github.com/PrismLauncher/PrismLauncher/issues/763
2023-01-20 08:36:08 -08:00
flow
ec1f73c827
fix(tests): add some comments on the stack overflow Task test
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-20 12:55:38 -03:00
Tayou
cdc9f93f71
make MainWindow cat update instantly
...
Signed-off-by: Tayou <tayou@gmx.net >
2023-01-20 15:16:25 +01:00
flow
bcebb1920f
refactor: clean up Section struct
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-20 11:15:26 -03:00
flow
81848e05f1
refactor: simplify Version operators
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-20 11:15:26 -03:00
flow
5ae69c079a
feat(tests): add FlexVer test vector to the Version tests
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-20 11:15:26 -03:00
Edgars Cīrulis
0199d8a74f
Version.cpp: Add new line
...
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com >
2023-01-19 14:12:59 +02:00
Edgars Cīrulis
f49ad2ee03
Version.h: Fix comparison of null version in Version class
...
Co-authored-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com >
2023-01-19 10:40:30 +02:00
Rachel Powers
7ed993b54e
fix: proper null padded version comparison
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-01-19 09:51:11 +02:00
Rachel Powers
9934537e19
feat: add debug printing for Version
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-01-19 09:50:45 +02:00
flow
00d42d296e
fix: call processEvents() before adding new tasks to the task queue
...
This allows the ongoing task to go off the stack before the next one is
started.
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-18 16:23:30 -03:00
flow
ad74fedfba
feat(tests): add test for stack overflow in ConcurrentTask
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-18 16:23:30 -03:00
Edgars Cīrulis
730f714e97
Version.cpp: Remove unnecessary QStringList include
...
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com >
2023-01-17 22:39:19 +02:00
Edgars Cīrulis
3bec4a80b3
Version.cpp: Decompose version strings according to flexver
...
Co-authored-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com >
2023-01-17 22:39:12 +02:00
Edgars Cīrulis
a84e4b0e07
Version.cpp: Format parse function code using clang-format
...
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com >
2023-01-17 07:14:49 +02:00
Edgars Cīrulis
198139feb4
Version.cpp: Simplify Version::parse by using const auto& current_char
...
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com >
2023-01-17 07:14:37 +02:00
Edgars Cīrulis
de11017552
Version.cpp: Use anonymous function to eliminate code duplication
...
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com >
2023-01-17 07:14:29 +02:00
Edgars Cīrulis
6fb837c529
Version.cpp: Add version string parser to split on '.' character
...
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com >
2023-01-17 07:14:05 +02:00
Edgars Cīrulis
c0c3892064
Version.cpp: Improve version parsing to handle mixed numeric and alphabetic characters
...
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com >
2023-01-17 07:13:24 +02:00
Sefa Eyeoglu
1a35fec134
Merge pull request #696 from Ryex/import-all-the-things
...
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/581
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/700
2023-01-16 10:04:09 +01:00
flow
f1247d2224
Merge pull request #753 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x
2023-01-15 11:39:50 -03:00
renovate[bot]
7992b7eb89
chore(deps): update hendrikmuhs/ccache-action action to v1.2.8
2023-01-15 13:40:16 +00:00
Sefa Eyeoglu
cd893e18d2
chore: update license headers
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-01-14 17:21:52 +01:00
Sefa Eyeoglu
a5c8b166fe
Merge pull request #746 from RaptaG/patch-1
2023-01-14 17:17:49 +01:00
RaptaG
72a9b98ef0
We're in 2023 :)
...
Signed-off-by: RaptaG <77157639+RaptaG@users.noreply.github.com >
2023-01-14 17:55:56 +02:00
flow
cf022524d1
Merge pull request #743 from flowln/fix_mods_with_wrong_modListVersion
2023-01-14 12:19:12 -03:00
flow
ebb0596c1a
fix: don't fail mod parsing when encountering invalid modListVersion
...
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-13 21:15:10 -03:00
flow
3de681d2d6
Merge pull request #685 from byteduck/instance-accounts
2023-01-13 17:21:12 -03:00
Rachel Powers
f7b0ba88da
Apply suggestions from code review
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-01-13 13:15:13 -07:00
flow
c95c81d42f
fix(ModUpdater): ensure instead of require icon_url
...
The spec says that this can be null, and indeed some mods have it set to
null, and should still be considered as valid.
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-13 16:59:37 -03:00
flow
9407596b12
fix(ModUpdater): fail mods individually when there's errors in the JSON
...
Prevents a single problematic mod from invalidating all the API
response.
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-13 16:49:21 -03:00
flow
c294c2d1df
refactor(RD): allow setting custom folder target for downloaded resources
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-13 16:23:09 -03:00
flow
bd36f8e220
fix(RD): set resource strings for ReviewMessageBox too
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-13 16:23:09 -03:00
flow
3a168ba6dd
feat(tests): add very basic ResourceModel test
...
______very_____ basic indeed, creating tests is super boring :c
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-13 16:23:09 -03:00
flow
1919069b12
fix(RD): don't assert search offset on fetchMore() in ResourceModel
...
This allows the standard QAbstractItemModelTester to work without
shenanigans!
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-13 16:23:09 -03:00
flow
ba677a8cb7
refactor: change some ResourceAPI from NetJob to Task
...
This makes it easier to create resource apis that aren't network-based.
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-13 16:23:09 -03:00
flow
e62e1d9701
refactor(RD): move BaseInstance dep. to subclasses of ResourceModel
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-13 16:23:08 -03:00
flow
b3330cb0da
fix(RD): correctly set the strings for the specific resource names
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-13 16:23:08 -03:00
flow
7d128c79a3
fix: CodeQL warnings about the rule of two
...
shush
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-13 16:23:08 -03:00
flow
3cff23dae2
refactor(RD): move success callbacks from ModModel to ResourceModel
...
While implementing the resource pack downloader in another branch, I
noticed that most of the code in the success callback was identical in
both cases, safe for a few minute differences in strings. So, this tries
to make it easier to share this piece of code.
However, it still leaves the possibility of extending the methods in
ResourceModel to accomodate for cases where this similarity may not
hold.
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-13 16:23:08 -03:00
flow
c3f0139f76
refactor(RD): add helper in ResourceModel to find current sorting
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-13 16:23:08 -03:00
flow
563fe8d515
fix(RD): separate search and versions/info tasks
...
This allows us to check whether a search request is already on-going, in
which case we don't need to make another one (and shouldn't).
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-13 16:23:08 -03:00
flow
38e20eb148
fix(RD): pass copy of IndexedPack to callbacks instead of ref.
...
This prevents a crash in which the pack list gets updated in a search
request meanwhile a versions / extra info request is being processed.
Previously, this situation would cause the reference in the latter
callbacks to be invalidated by an internal relocation of the pack list.
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-13 16:23:07 -03:00
flow
36571c5e22
refactor(RD): clear up sorting methods
...
This refactors the sorting methods to join every bit of it into a single
list, easing maintanance. It also removes the weird index contraint on
the list of methods by adding an index field to the DS that holds the
method.
Lastly, it puts the available methods on their respective API, so other
resources on the same API can re-use them later on.
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-13 16:23:07 -03:00
flow
c8eca4fb85
fix: build with qt5.12 on Linux and pedantic flag
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-13 16:23:07 -03:00
flow
0e207aba6c
feat(RD): add roleNames and Q_PROPERTY to ResourceModel
...
in preparation for QML interop.
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-13 16:23:07 -03:00
flow
45d1319891
refactor(RD): decouple ResourceModels from ResourcePages
...
This makes it so that we don't need a reference to the parent page in
the model. It will be useful once we change the page from a widget-based
one to a QML page.
It also makes tasks be created in the dialog instead of the page, so
that the dialog can also have the necessary information to mark versions
as selected / deselected easily. It also makes the task pointers into
smart pointers.
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-13 16:23:07 -03:00
flow
39b7ac90d4
refactor(RD): unify download dialogs into a single file
...
No need for multiple files since the subclasses are so small now
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-13 16:23:06 -03:00
flow
ef87bdf18a
fix(RD): prevent weird behavior of progress widget
...
when i.e. clicking on links or just using the downloader at all, this
prevents some flickering and the widget never getting hidden in some
cases.
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-13 16:23:06 -03:00
flow
433a802c6e
refactor: put resource downloading classes in common namespace
...
Puts them all inside the 'ResourceDownload' namespace, so that it's a
bit clearer from the outside that those belong to the same 'module'.
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-13 16:23:06 -03:00
flow
6a18079953
refactor: generalize mod models and APIs to resources
...
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-13 16:23:00 -03:00
flow
b937d33436
Merge pull request #714 from redstrate/cmark
2023-01-13 16:16:00 -03:00
Sefa Eyeoglu
f7244fbf68
Merge pull request #737 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x
...
chore(deps): update hendrikmuhs/ccache-action action to v1.2.7
2023-01-13 08:17:59 +01:00
Aaron
4e80d1fc79
DCO Remediation Commit for Aaron <10217842+byteduck@users.noreply.github.com>
...
I, Aaron <10217842+byteduck@users.noreply.github.com >, hereby add my Signed-off-by to this commit: 160dd09fc2
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com >
2023-01-12 20:16:48 -08:00
Aaron Sonin
b2f48eaeb8
Merge branch 'PrismLauncher:develop' into instance-accounts
2023-01-12 20:11:46 -08:00
Aaron
160dd09fc2
Fix instance account selector face for offline accounts
2023-01-12 20:03:31 -08:00
renovate[bot]
80eea05deb
chore(deps): update hendrikmuhs/ccache-action action to v1.2.7
2023-01-12 22:06:50 +00:00
Sefa Eyeoglu
5e89ba7079
Merge pull request #732 from DioEgizio/actually-fix-openssl3-mac-failures
2023-01-12 16:31:03 +01:00
DioEgizio
ff7878217d
fix: add cmark:p to mingw build
...
this way we can just dynamically link it on that build instead of building it ourselves and statically linking it
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2023-01-12 10:08:52 -05:00
Joshua Goins
807da6a035
fix: Remove extra line breaks for modrinth descriptions
...
Signed-off-by: Joshua Goins <josh@redstrate.com >
2023-01-12 10:08:52 -05:00
Joshua Goins
4e2a958896
fix(flatpak): enable builddir
...
Signed-off-by: Joshua Goins <josh@redstrate.com >
2023-01-12 10:08:52 -05:00
Sefa Eyeoglu
3ee0ec7cd0
fix(nix): add cmark dependency
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-01-12 10:08:52 -05:00
Sefa Eyeoglu
22a2b7ac46
refactor: support system and bundled cmark
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-01-12 10:08:52 -05:00
Joshua Goins
aa7c910e26
build: remove hoedown vendored source
...
Signed-off-by: Joshua Goins <josh@redstrate.com >
2023-01-12 10:08:52 -05:00
Joshua Goins
24a4bd3a1c
refactor: replace hoedown markdown parser with cmark
...
Signed-off-by: Joshua Goins <josh@redstrate.com >
2023-01-12 10:08:52 -05:00
Sefa Eyeoglu
fff52cb247
feat: add button to import component JSONs
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-01-11 13:50:57 +01:00
Sefa Eyeoglu
219c5b323d
Merge pull request #731 from flowln/windows_server_trash
2023-01-11 09:49:20 +01:00
DioEgizio
14278a9e35
fix: set HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK to 1
...
should fix some random failures
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2023-01-10 20:02:20 +01:00
Sefa Eyeoglu
dd013209e8
Merge pull request #730 from DioEgizio/aaaaaaaa-revert
...
Revert "Merge pull request #729 from DioEgizio/fix-mac-openssl3-failing"
2023-01-10 17:44:23 +01:00
flow
96d5438633
Merge pull request #249 from TayouVR/theme-selector-first-time-wizard
2023-01-10 13:28:57 -03:00
flow
391ef64c22
fix(FileSystem): don't attempt to trash items on Windows Server
...
For some reason this makes some of our CI test runs super slow, and
sometimes fail miserably.
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-01-10 12:50:56 -03:00
DioEgizio
d45a62b3a6
Revert "Merge pull request #729 from DioEgizio/fix-mac-openssl3-failing"
...
it was necessary :/
This reverts commit 976e550aa7 , reversing
changes made to 61144f7a21 .
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2023-01-10 16:47:28 +01:00
Sefa Eyeoglu
976e550aa7
Merge pull request #729 from DioEgizio/fix-mac-openssl3-failing
...
fix: just use github runner's openssl 1.1 instead of installing 3 on …
2023-01-10 16:28:02 +01:00
Tayou
668b19d119
Add hint about Cat
...
Signed-off-by: Tayou <tayou@gmx.net >
2023-01-10 16:09:57 +01:00
Sefa Eyeoglu
5c48f0b458
fix: set minimum size for setup wizard
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-01-10 16:06:50 +01:00
Tayou
689fe1e2c7
CRLF -> LF
...
damn you visual studio for creating CRLF files everywhere...
Signed-off-by: Tayou <tayou@gmx.net >
2023-01-10 16:06:50 +01:00
Tayou
7d440402ad
Update launcher/Application.cpp with suggestion from scrumplex
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: Tayou <tayou@gmx.net >
2023-01-10 16:06:42 +01:00
Tayou
6daa457838
Implement Suggestions from flow & Scrumplex
...
Signed-off-by: Tayou <tayou@gmx.net >
2023-01-10 16:06:42 +01:00
Tayou
49d317b19a
UX tweak + formatting + added cat to wizard
...
Signed-off-by: Tayou <tayou@gmx.net >
2023-01-10 16:06:24 +01:00
Tayou
1b80ae0fca
add theme setup wizard
...
Signed-off-by: Tayou <tayou@gmx.net >
2023-01-10 16:06:01 +01:00
DioEgizio
a113ecca8b
fix: just use github runner's openssl 1.1 instead of installing 3 on macos signing
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2023-01-10 15:03:28 +01:00
Sefa Eyeoglu
61144f7a21
Merge pull request #726 from TheLastRar/qt6-win-darkmode
...
Closes https://github.com/PrismLauncher/PrismLauncher/issues/158
2023-01-10 08:48:17 +01:00
Rachel Powers
574af2c795
chore: cleanup review suggestions
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-01-09 17:18:08 -07:00
Rachel Powers
a4870d4834
fix: fix #700
...
fixed by properly converting from a file path and converting to native seperators.
should have known naive handling of file path as a URL would come back to bite us cross platform.
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-01-09 17:00:12 -07:00
TheLastRar
78bbcac0ea
ui: Let Qt 6.4.2 handle dark mode titlebar
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2023-01-09 19:44:11 +00:00
TheKodeToad
d4b346b7ae
Fix oversights
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-01-09 10:48:46 +00:00
Sefa Eyeoglu
ca9b2525c8
Merge pull request #715 from getchoo/add-teawie
2023-01-09 09:46:31 +01:00
Sefa Eyeoglu
bb1c387a98
Merge pull request #722 from PrismLauncher/renovate/actions-cache-3.x
2023-01-09 09:41:32 +01:00
Sefa Eyeoglu
38ce37b6fd
Merge pull request #720 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x
2023-01-09 09:41:03 +01:00
renovate[bot]
7fdc81236e
chore(deps): update actions/cache action to v3.2.3
2023-01-09 07:54:22 +00:00
renovate[bot]
fca40c1c6b
chore(deps): update hendrikmuhs/ccache-action action to v1.2.6
2023-01-08 22:40:41 +00:00
TheKodeToad
52b3a54e4b
Fix cloaks conflicting with join server endpoint
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-01-08 15:36:36 +00:00
flow
d5d5d66e03
Merge pull request #716 from DioEgizio/qt6.4.2-winmsvc
...
closes https://github.com/PrismLauncher/PrismLauncher/issues/288
2023-01-08 11:33:13 -03:00
DioEgizio
0481ae187a
chore: update windows msvc to qt 6.4.2
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2023-01-08 10:34:45 +01:00
seth
9de6927c3f
feat: add CC BY-SA 4.0 info for teawie images
...
Signed-off-by: seth <getchoo@tuta.io >
2023-01-07 19:18:22 -05:00
Rachel Powers
30b01ef053
fix: *sigh* no implicit QString->QFileInfo conversion in Qt6, again...
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-01-07 15:04:23 -07:00
Rachel Powers
03b75bf2a9
feat: Import all the things!
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-01-07 15:04:22 -07:00
Sefa Eyeoglu
f3f628410d
Merge pull request #576 from Ryex/identify-zip-packs
...
fix https://github.com/PrismLauncher/PrismLauncher/issues/349
2023-01-07 17:33:34 +01:00
Sefa Eyeoglu
9901ecda49
Merge pull request #710 from byquanton/develop
...
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/708
2023-01-07 17:18:10 +01:00
flow
39becf607e
Merge pull request #713 from redstrate/fix-html-rendering
2023-01-07 12:57:35 -03:00
seth
f5955a4738
feat: add bday teawie
...
Signed-off-by: seth <getchoo@tuta.io >
2023-01-07 04:47:53 -05:00
seth
e018b30875
fix: make spooky teawie load
...
gimp fail
Signed-off-by: seth <getchoo@tuta.io >
2023-01-07 04:38:26 -05:00
seth
2dbd775cf3
feat: add xmas teawie
...
Signed-off-by: seth <getchoo@tuta.io >
2023-01-07 04:37:41 -05:00
seth
a5051327db
feat: add spooky teawie
...
Signed-off-by: seth <getchoo@tuta.io >
2023-01-07 03:42:53 -05:00
seth
8140f5136d
feat: add teawie
...
drawn by sympathytea (https://github.com/SympathyTea )
Signed-off-by: seth <getchoo@tuta.io >
2023-01-06 22:28:15 -05:00
Joshua Goins
f04703f09b
Strip certain HTML tags when rendering mod pages
...
Some mod pages use certain tags for centering purposes, but trips up
hoedown.
Signed-off-by: Joshua Goins <josh@redstrate.com >
2023-01-06 15:05:19 -05:00
TheKodeToad
be7f81421a
Finishing touches
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-01-06 10:46:43 +00:00
TheKodeToad
17317ea308
Move legacy support classes to another jar
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-01-06 09:23:36 +00:00
TheKodeToad
cb32711077
Slim skin fix - thanks to @craftycodie and @DelofJ
...
!
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-01-06 09:21:43 +00:00
byquanton
2faf8332ee
fix: Add 1.16+ Forge library prefix in TechnicPackProcessor.cpp
...
Signed-off-by: byquanton <32410361+byquanton@users.noreply.github.com >
2023-01-06 02:44:10 +01:00
Aaron Sonin
e0e3d4d8fe
Merge branch 'PrismLauncher:develop' into instance-accounts
2023-01-02 11:59:29 -07:00
Aaron
ba81ad1ac3
Reword instance-specific account settings, apply clang-format
...
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com >
2023-01-02 11:17:19 -07:00
Aaron Sonin
eefb259ddf
Remove unecessary delete in InstanceSettingsPage destructor
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: Aaron Sonin <10217842+byteduck@users.noreply.github.com >
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com >
2023-01-02 11:17:19 -07:00
Aaron Sonin
9b8add1961
Properly connect signal in instance settings for account selector
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: Aaron Sonin <10217842+byteduck@users.noreply.github.com >
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com >
2023-01-02 11:17:19 -07:00
Aaron Sonin
e186523878
Add null check for face in instance account settings selector
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: Aaron Sonin <10217842+byteduck@users.noreply.github.com >
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com >
2023-01-02 11:17:19 -07:00
Aaron Sonin
021e6c02d7
Replace unecessary type check with assertion in InstanceSettingsPage
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: Aaron Sonin <10217842+byteduck@users.noreply.github.com >
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com >
2023-01-02 11:17:19 -07:00
Aaron
cba3d68063
Fix conflicting layout name in InstanceSettingsPage
...
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com >
2023-01-02 11:17:19 -07:00
Aaron
7e2d78bab5
Allow selecting a default account to use with an instance
...
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com >
2023-01-02 11:17:19 -07:00
DioEgizio
4b12c85d91
Merge pull request #673 from PrismLauncher/renovate/flatpak-flatpak-github-actions-5.x
...
chore(deps): update flatpak/flatpak-github-actions action to v5
2022-12-30 19:23:10 +01:00
Rachel Powers
0ebf04a021
fix newlines
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-12-30 10:21:49 -07:00
flow
d55f47077a
Merge pull request #626 from leo78913/mods-provider-column
...
closes https://github.com/PrismLauncher/PrismLauncher/issues/402
2022-12-30 11:39:03 -03:00
Sefa Eyeoglu
11df4845b7
fix: remove Flatpak cache key workaround
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-30 15:36:35 +01:00
Rachel Powers
7f438425aa
refactor: add an identify function to make easy to reuse
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-12-29 19:47:19 -07:00
Rachel Powers
c470f05abf
refactor: use std::filesystem::rename insted of copy and then moving.
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-12-29 17:21:54 -07:00
flow
141e94369e
feat(Mods): hide 'Provider' column when no mods have providers
...
This makes the mod list look a bit less polluted in the common case of
mods having no provider whatsoever.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-29 13:21:49 -03:00
flow
257970c27d
refactor(Mods): make provider() return a std::optional
...
This makes it easier to check if a mod has a provider or not, without
having to do a string comparison.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-29 13:21:49 -03:00
flow
67ac3da8a0
Merge pull request #684 from Scrumplex/logging-categories
...
Prevents private credentials from leaking in the logs of general users
2022-12-28 09:54:23 -08:00
Sefa Eyeoglu
c1e5179b5f
Merge pull request #680 from AshtakaOOf/flathub-screenshots
2022-12-28 13:48:39 +01:00
Sefa Eyeoglu
7a651bdc53
feat: install launcher logging categories
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-27 18:10:01 +01:00
Sefa Eyeoglu
f33f596584
refactor: use ECM logging categories instead
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-27 17:34:21 +01:00
Sefa Eyeoglu
c8d8046412
refactor: add logging category for credentials
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-27 17:04:42 +01:00
Sefa Eyeoglu
4d334b645d
Merge pull request #681 from PrismLauncher/renovate/actions-cache-3.x
2022-12-27 13:54:00 +01:00
renovate[bot]
58d3779efb
chore(deps): update actions/cache action to v3.2.2
2022-12-27 12:20:21 +00:00
Rachel Powers
3691f3a296
fix: cleanup and suggested changes
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-12-26 14:50:15 -07:00
Adrien
463b4fbe0c
Fix
...
Me when me when me when
Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com >
2022-12-26 20:09:47 +01:00
Adrien
9f1c79a5ec
Update org.prismlauncher.PrismLauncher.metainfo.xml.in
...
Add ModpackUpdate and change some lines
Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com >
2022-12-26 19:59:46 +01:00
Adrien
70573b6f31
Update org.prismlauncher.PrismLauncher.metainfo.xml.in
...
Should be the right properties (I hope)
Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com >
2022-12-26 19:24:17 +01:00
Sefa Eyeoglu
6ea1234a3b
Merge pull request #618 from TheKodeToad/safer-destructive-actions
...
Fixes https://github.com/PolyMC/PolyMC/issues/948
2022-12-26 17:48:43 +01:00
TheKodeToad
434f639b0c
Use optional instead of hardcoded cancelled string
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-12-26 14:58:37 +00:00
TheKodeToad
bf04becc9e
About to -> you are about to
...
You're is used in some other places but im lazy
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-12-26 14:45:04 +00:00
chmodsayshello
e8ee4497f7
store logs in sperate directory
...
Signed-off-by: chmodsayshello <chmodsayshello@hotmail.com >
2022-12-26 09:59:26 +01:00
Rachel Powers
b2082bfde7
fix: explicit QFileInfo converison for qt6
...
fix: validatePath in validateZIPResouces
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-12-25 17:16:26 -07:00
Rachel Powers
78984eea3a
feat: support installing worlds during flame pack import.
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-12-25 16:49:56 -07:00
TheKodeToad
5c96b1c628
Remove MIT license from JsonParser
...
I don't mind, and it's my code.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-12-25 09:45:42 +00:00
Rachel Powers
8422e3ac01
feat: zip resource validation check for flame
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-12-24 20:43:17 -07:00
Rachel Powers
cfce54fe46
fix: update parse tests
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-12-24 20:43:17 -07:00
Rachel Powers
a7c9b2f172
feat: validate world saves
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-12-24 20:43:17 -07:00
Rachel Powers
eb31a951a1
feat: worldSave parsing and validation
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-12-24 20:43:01 -07:00
Rachel Powers
ccfe605920
feat: add shaderpack validation
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-12-24 15:55:10 -07:00
Rachel Powers
878614ff68
feat: add a ModUtils::validate
...
moves the reading of mod files into `ModUtils` namespace
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-12-24 09:42:02 -07:00
Rachel Powers
25e23e50ca
fix: force add of ignored testdata files
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-12-24 09:42:02 -07:00
Rachel Powers
64c51a70a3
feat: add initial support for parseing datapacks
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-12-24 09:42:02 -07:00
renovate[bot]
e4296c48c8
chore(deps): update flatpak/flatpak-github-actions action to v5
2022-12-24 16:20:44 +00:00
flow
dd3848d7b1
Merge pull request #666 from getchoo/pls-scrump
...
scrump heard your pleads, rejoice!
2022-12-24 06:38:49 -08:00
flow
56ac1a0813
Merge pull request #665 from flowln/logging_categories
2022-12-24 03:58:49 -08:00
TheKodeToad
cbe5af235c
Make requested changes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-12-24 08:59:55 +00:00
seth
f932ffcc5b
fix: check if GIT_REFSPEC is empty
...
Signed-off-by: seth <getchoo@tuta.io >
2022-12-23 20:50:08 -05:00
flow
0a50c5bf40
Merge pull request #644 from RaptaG/new-readme
2022-12-23 04:39:57 -08:00
flow
e416e5d301
Merge pull request #667 from PrismLauncher/renovate/actions-cache-3.x
2022-12-23 04:00:43 -08:00
TheKodeToad
884bd85495
Skin fix -> online fixes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-12-23 09:35:29 +00:00
TheKodeToad
94067f34cf
Try to make some of the suggested changes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-12-23 09:34:26 +00:00
renovate[bot]
3227859992
chore(deps): update actions/cache action to v3.2.1
2022-12-23 08:18:30 +00:00
seth
01139c3b50
fix: assume builds are stable when git isn't installed
...
Signed-off-by: seth <getchoo@tuta.io >
2022-12-22 19:25:04 -05:00
flow
ee3e65d759
feat(docs): add note about logging env variables in man page
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-22 19:18:16 -03:00
flow
c85867395d
feat: use Qt logging facilities instead of our own
...
This system allows us to globally define categories, and control whether
they are shown or not at runtime. It also does some things by it's own,
so we can remove some (uhhh) code.
Lastly, this allows changing the behavior of the logger at runtime via
environment variables that Qt takes care of for us.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-22 19:15:50 -03:00
flow
bf2ce54076
Merge pull request #656 from PrismLauncher/renovate/actions-cache-3.x
2022-12-21 07:30:23 -08:00
renovate[bot]
07de285299
chore(deps): update actions/cache action to v3.2.0
2022-12-21 14:46:35 +00:00
Sefa Eyeoglu
8c194cd245
Merge pull request #649 from Scrumplex/fix-winget-release-no9999999
2022-12-19 16:36:42 +01:00
Sefa Eyeoglu
8cbec3d5a0
fix: update installers-regex for winget releaser again
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-19 16:31:50 +01:00
Sefa Eyeoglu
cdf05e74c8
Merge pull request #647 from Scrumplex/update-flake
2022-12-19 16:09:55 +01:00
Sefa Eyeoglu
b98b4f1027
chore(nix): update flakes
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-19 15:54:10 +01:00
Sefa Eyeoglu
fc11dfd6b4
refactor(nix): use tomlplusplus from nixpkgs
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-19 15:54:09 +01:00
Sefa Eyeoglu
483a5b6cae
fix(nix): use jdk17 instead of jdk
...
See NixOS/nixpkgs#206806
Co-authored-by: Infinidoge <infinidoge@doge-inc.net >
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-19 15:44:05 +01:00
Sefa Eyeoglu
df1b7f1656
Merge pull request #628 from flowln/fix_multiple_resource_packs_crash
...
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/624
2022-12-19 15:35:34 +01:00
RaptaG
a566d1c5de
Change numbered list to bullet list
...
Signed-off-by: RaptaG <77157639+RaptaG@users.noreply.github.com >
2022-12-18 18:01:44 +02:00
Sefa Eyeoglu
11c8237d8b
Merge pull request #642 from DioEgizio/dont-ship-unnecessary-tlsbackends
...
fix: exclude unused tls backends
2022-12-18 16:27:48 +01:00
RaptaG
6dc19c85a8
Improve the README
...
Not very serious changes, just some enhancements to make it look better!
Signed-off-by: RaptaG <77157639+RaptaG@users.noreply.github.com >
2022-12-18 15:23:22 +02:00
DioEgizio
6e07c11f65
fix: exclude unused tls backends
...
makes bundles slightly smaller on windows and macos:
- qopensslbackend will not be used neither on macos nor on qt6 windows, so let's just not copy it
- qcertonlybackend won't be used and wouldn't work for prism anyways as it doesn't support some features we use
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-12-18 11:03:48 +01:00
Sefa Eyeoglu
8da6667816
Merge pull request #636 from flowln/fix_component_version_when_updating
...
Correctly set component versions in Modrinth pack updating
2022-12-17 17:26:34 +01:00
flow
81fedbf03c
refactor(Tasks): remove 'm_total_size' from ConcurrentTask
...
We can use the queues directly instead.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-17 13:10:19 -03:00
flow
0516055b31
Merge pull request #630 from leo78913/yeet-scrollbars
2022-12-17 08:02:41 -08:00
flow
e3f8d99087
refactor(Inst. Import): use m_* for member variables in MR components
...
Makes it clearer what is being changed when.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-17 12:41:10 -03:00
flow
22aebc2215
fix(Inst. Import): correctly set component versions when updating
...
This makes it so that the later call to parse the old manifest doesn't
change the class data, so that the new data con continue there and be
reflected on the component list later.
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-17 12:38:58 -03:00
leo78913
3653e9d5e3
let the theme decide the notes page right margin
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-12-17 12:05:20 -03:00
flow
40f16b6d62
Merge pull request #631 from getchoo/better-msvc-flags
2022-12-17 05:53:17 -08:00
seth
a61daa40dc
fix: re-enable /GS and only use some flags on release builds
...
Signed-off-by: seth <getchoo@tuta.io >
2022-12-16 16:05:12 -05:00
flow
ee67b5f1ad
Merge pull request #607 from flowln/dont_crash_on_zip_import
...
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/609
2022-12-16 07:22:22 -08:00
leo78913
aa3633d2d7
fix: translate unknown mod provider
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-12-16 11:13:54 -03:00
seth
7b805a38b9
feat: improve msvc build flags
...
- adds /GL, /Gy, and /LTCG for better optimizations
- adds /Gw for a smaller binary size
- adds /guard:cf for added security at runtime
- removes unneeded /GS flag as that's already enabled by default
Signed-off-by: seth <getchoo@tuta.io >
2022-12-15 18:50:35 -05:00
leo78913
c8d8dda79a
fix: only show scrollbars when needed
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-12-15 16:34:52 -03:00
flow
c440f33122
fix(ResourceModel): use a single ConcurrentTask for parsing tasks
...
This avoids creating a bunch of threads that fills up the maximum amount
allowed by QThreadPool, and causes a deadlock between the helper threads
and the main thread (main thread tries to create threads in painting
code, but isn't able to, so it keeps waiting for a thread to free up,
but all the threads are waiting on the main thread to process some
events).
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-15 13:51:07 -03:00
flow
b0c866bfaa
feat(Tasks): allow adding subtasks while running in ConcurrentTask
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-15 13:48:53 -03:00
flow
dd578354c4
feat(Tasks): add ConcurrentTask::clear to allow re-using tasks
...
This way old runs won't pile up in the internal DSs
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-15 13:45:50 -03:00
flow
fdac978c84
Merge pull request #625 from Edgars-Cirulis/develop
2022-12-15 07:55:28 -08:00
Sefa Eyeoglu
3b81ada1c3
Merge pull request #593 from Scrumplex/fix-winget-release-no999999
2022-12-15 16:35:15 +01:00
TheKodeToad
87bcefd08a
Automatically add add-opens if Java version >= 9
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-12-15 15:28:24 +00:00
leo78913
4ee29b388d
feat: add a provider column to the mods page
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-12-15 12:02:08 -03:00
TheKodeToad
8a6776731a
Use reflection to access DatatypeConverter
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-12-15 14:59:39 +00:00
TheKodeToad
bfa5fe1598
Better skin fix error handling
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-12-15 14:59:39 +00:00
TheKodeToad
ead59c0246
Improve the skin fix code
...
- Spoof 404 instead of keeping original URL.
- Move JsonParseException to the package.
- Pass proxy as null to reduce code duplication.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-12-15 14:59:39 +00:00
TheKodeToad
cfeadf858e
Add workaround to warning
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-12-15 14:59:39 +00:00
TheKodeToad
7534eaf006
Only use DatatypeConverter as a fallback
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-12-15 14:59:39 +00:00
TheKodeToad
8a81aaaa0a
Add separate util class
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-12-15 14:59:39 +00:00
TheKodeToad
b544661e81
Experimental skin fix, inspired by craftycodie's
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-12-15 14:59:38 +00:00
Edgars Cīrulis
52dc9068e5
ApplicationMessage: Use QHash instead of QMap
...
QHash provides faster lookup times than QMap because it uses a hash table to store the elements, while QMap uses a self-balancing binary tree.
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com >
2022-12-15 16:17:19 +02:00
flow
4f1ea712da
Merge pull request #605 from flowln/fix_crash_in_downloader_image
...
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/590
2022-12-15 04:47:56 -08:00
Sefa Eyeoglu
849b92665e
Merge branch 'develop' into remove-updater
2022-12-14 23:22:27 +01:00
Sefa Eyeoglu
d193ed9eeb
Merge pull request #561 from leo78913/iconpicker-stuff
...
closes https://github.com/PrismLauncher/PrismLauncher/issues/494
2022-12-14 23:15:21 +01:00
TheKodeToad
ee003cd9ee
Add confirmation on customised components
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-12-14 15:40:20 +00:00
TheKodeToad
127b094c41
Improve handling of destructive actions
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-12-14 15:20:42 +00:00
Sefa Eyeoglu
b2285be5bc
Merge pull request #612 from DioEgizio/move-cat-right
...
closes https://github.com/PrismLauncher/PrismLauncher/issues/611
2022-12-14 13:04:41 +01:00
Sefa Eyeoglu
6ede02bb84
Merge pull request #608 from Scrumplex/bump-7.0
2022-12-14 11:33:46 +01:00
DioEgizio
821c424b66
move cat to bottom right
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-12-14 08:36:35 +01:00
flow
5450e0edf3
fix(Inst.Import): don't set managed pack info from imported ZIPs
...
This prevents the Managed Pack page from showing up even though there's
no way for it to work correctly.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-13 13:43:27 -03:00
flow
e05ccc0e55
Merge pull request #601 from Scrumplex/fix-translations-3
2022-12-13 07:01:23 -08:00
Sefa Eyeoglu
4f3786c2e1
chore: bump to 7.0
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-13 11:10:05 +01:00
Sefa Eyeoglu
107977f3d1
fix: update source strings
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-13 10:40:35 +01:00
Sefa Eyeoglu
813663485d
Merge pull request #604 from flowln/fix_crash_with_gtk2
...
fix: crash with GTK2 theme due to QProxyStyle in ManagedPackPage
2022-12-13 08:31:52 +01:00
flow
64585d8f78
fix(Inst.Import): don't assert extra data when importing from ZIP
...
ZIPs don't have the necessary data in those cases.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-13 00:31:41 -03:00
flow
756d933d1a
fix: bind image fetch callback lambda to the parent object
...
Fixes a possible crash with the callback being called after the image
object was already deleted.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-12 23:51:22 -03:00
flow
83deccf266
fix(ManagedPackPage): crash with GTK2 theme due to QProxyStyle
...
Seemingly related issue: https://bugreports.qt.io/browse/QTBUG-49940
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-12 23:31:10 -03:00
flow
aaef448959
Merge pull request #600 from TheLastRar/reset-stylesheet
...
Resolves https://github.com/PrismLauncher/PrismLauncher/issues/510
2022-12-12 13:28:24 -08:00
TheLastRar
7e96077ed7
Fix: Reset stylesheet before setting style
...
Resolves #510
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-12-12 20:22:08 +00:00
Sefa Eyeoglu
c44f931059
fix: update installers-regex for winget releaser
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-12 19:03:32 +01:00
flow
15084c8d6d
Merge pull request #587 from unascribed/patch/libraries-wording
2022-12-11 16:57:45 -08:00
Una
822c5a530e
Not all libraries are from Mojang
...
Signed-off-by: Una <me@unascribed.com >
2022-12-11 16:11:32 -08:00
flow
6eb641ae56
Merge pull request #585 from DioEgizio/remove-leftover-todo
2022-12-11 13:02:08 -08:00
DioEgizio
9eb14e6b9b
fix: remove leftover TODO
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-12-11 20:35:39 +01:00
Sefa Eyeoglu
7cc42269a9
Merge pull request #569 from Jan200101/PR/fix-mangohud
2022-12-11 18:31:05 +01:00
flow
c45442760c
Merge pull request #584 from TayouVR/fix-breeze-colors-and-matrix-icon
2022-12-11 09:24:53 -08:00
Tayou
83f0611200
fix breeze icon colors and matrix icon
...
Signed-off-by: Tayou <tayou@gmx.net >
2022-12-11 17:36:05 +01:00
flow
d95625ed88
Merge pull request #486 from flowln/wide_bar_customization
2022-12-11 04:16:45 -08:00
flow
5622bcc563
Merge pull request #461 from flowln/fix_big_resource_pack_imgs
...
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/360
2022-12-11 04:16:21 -08:00
Jan200101
deb9c98630
chore: replace naive mangohud preload with vklayer detection
...
Signed-off-by: Jan200101 <sentrycraft123@gmail.com >
2022-12-11 11:01:34 +01:00
Jan200101
2c1e887c8d
chore: replace naive mangohud detection with vulkan layer detection
...
Signed-off-by: Jan200101 <sentrycraft123@gmail.com >
2022-12-11 11:01:33 +01:00
flow
4a13d72997
Merge pull request #32 from flowln/modpack_update_page
...
Closes https://github.com/PrismLauncher/PrismLauncher/issues/180
Closes https://github.com/PrismLauncher/PrismLauncher/issues/170
2022-12-10 06:34:18 -08:00
leo78913
2d5820e910
Update launcher/icons/IconList.cpp
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-12-10 10:31:44 -03:00
leo78913
6cb857b895
Update launcher/icons/IconList.cpp
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-12-10 10:31:30 -03:00
Sefa Eyeoglu
590875d022
Merge pull request #575 from Ryex/blockedmods-only-drop-local
...
Prevent potental crash if droping non local files in BlockedModsDialog
2022-12-10 02:46:55 +01:00
Rachel Powers
8f30237765
fix: prevent potental crash if droping non local files
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-12-09 17:21:40 -07:00
flow
cb0339b492
Merge pull request #572 from DioEgizio/breeze-icons-improvements
2022-12-09 04:14:36 -08:00
Sefa Eyeoglu
e427174ff0
Merge pull request #571 from Ryex/blocked-targetFolder
...
fix(blockedmods): Track and use targetFolder for blocked files
2022-12-09 08:33:10 +01:00
DioEgizio
fc4c57f0d9
feat: improve new.svg in breeze icon packs
...
makes it better and more similar to the one in legacy
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-12-09 07:49:16 +01:00
flow
9ad4ae5340
Merge pull request #568 from leo78913/flatpak-shortcuts
2022-12-08 17:53:33 -08:00
Rachel Powers
0f48e0fc06
fix(blockedmods): Track and use targetFolder for blocked files
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-12-08 18:42:51 -07:00
leo78913
37ad1b40d8
fix: fix creating instance shortcuts in flatpak
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-12-08 20:18:07 -03:00
Jan200101
514e7ae6a0
fix: re-add LD_LIBARY_PATH to mangohud
...
Upstream officially supports the use of $LIB/mangohud/
Signed-off-by: Jan200101 <sentrycraft123@gmail.com >
2022-12-08 23:09:14 +01:00
leo78913
ab2f3bb5bc
make removeButton a member of IconPickerDialog
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-12-08 11:13:53 -03:00
flow
34230bfcf4
fix: don't try updating Flame instance names when updating versions
...
Since the exact version string is only available in the manifest,
there's no easy way of getting it before commiting to the update, so
there's not much of a good way of showing the updated name in the UI,
and using the displayName is weird and gives some buggy behavior.
We may want to re-enable it in the future if we find a reliable way of
showing the correct info on the UI before starting the update.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-07 18:05:46 -03:00
flow
c390e211ee
Merge pull request #565 from DioEgizio/shortcut-menu-bar
2022-12-07 12:57:46 -08:00
DioEgizio
b0d69db878
fix: add instance shortcut creation action to menubar
...
also moves deleteinstance to the same place as the instance toolbar
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-12-07 16:52:06 +01:00
flow
b373beee21
Merge pull request #511 from Scrumplex/fix-blocked-mods-usability
2022-12-07 06:12:09 -08:00
leo78913
8c99edd3c5
feat+refactor: trash instance icons
...
also refactor IconList::deleteIcon
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-12-06 20:25:42 -03:00
leo78913
8036272e87
fix: disable remove icon button for default icons
...
pressing this button in the icon picker dialog when a default icon is selected does nothing so why not disable it
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-12-06 20:10:30 -03:00
flow
6f50809457
fix(FlamePage): don't assert / suggest blocked modpacks
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:35 -03:00
flow
bb386a1162
fix(ManagedPackPage): only update the current instance exactly
...
Also carry on the original ID to avoid updating the wrong instance.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:34 -03:00
flow
80054e4db2
fix(ManagedPackPage): preserve pack ID from Modrinth update
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:34 -03:00
flow
1630a23fb0
refactor(InstanceImport): require rvalue from 'extra_info' mappings
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:34 -03:00
flow
4e75419e08
fix(ManagedPagePage): don't reload pack info when not needed
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:34 -03:00
flow
089018015a
refactor(ManagedPackPage): use smart pointers instead of raw ones
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:34 -03:00
flow
feb6f285ce
feat(ManagedPackPage): add reload button when in a fail state
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:34 -03:00
flow
cb12c51afc
fix(ManagedPackPage): check app capabilities for creating the CF page
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:34 -03:00
flow
c5c426ecbc
chore(ManagedPackPage): format and add headers
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:33 -03:00
flow
74f7039abf
fix(ManagedPackPage): clear combo boxes when adding new versions
...
Prevents versions to undergo mitosis.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:33 -03:00
flow
57b905be24
feat(ManagedPackPage): implement Flame modpack updating button
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:33 -03:00
flow
34794cc4af
fix(ManagedPackPage): give extra_info to InstanceImportTask in MR packs
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:33 -03:00
flow
38f59fdf39
fix(ManagedPackPage): add warning about old bug with pack IDs
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:33 -03:00
flow
527c1113f1
feat(ManagedPackPage): add Flame UI
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:33 -03:00
flow
04dbe28793
fix(ManagedPackPage): better changelog text when fetching / no changelog
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:33 -03:00
flow
968366c2ae
feat+fix: allow forwarding extra info to InstanceImportTask
...
This allows us to pass to the creation instances their actual pack ID
and version ID, that in Flame's case, are only available before starting
to create an instance.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:32 -03:00
flow
7f5dea28bb
feat(ManagedPackPage): add link to the Modrinth's pack page
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:32 -03:00
flow
d4979974b4
fix(ManagedPackPage): better UX for when network requests fail / are pending
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:32 -03:00
flow
9539230915
fix: do not display managed pack page for providers without an impl. yet
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:32 -03:00
flow
25cfa26e7b
fix: use rich text in changelog for modrinth modpacks
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:32 -03:00
flow
0ff8891c66
feat: add ManagedPackPage to the instance pages
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:32 -03:00
flow
58d2c15ffa
feat: add functionality to MR modpack update in the page :D
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:32 -03:00
flow
82699cc297
feat: allow skipping the update confirmation dialog
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:32 -03:00
flow
08d008a5aa
refactor: abstract away update confirmation dialog
...
... so that we can avoid code duplication.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 17:00:29 -03:00
flow
9e17ff884f
feat: add PageContainer::getPage
...
This allows us to directly access a page from outside. This will be
useful for telling the ManagedPackPage who is the window it's on, so
that we can close it when updating :^)
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 16:54:54 -03:00
flow
1c567232e3
feat: add (current) indicator to the currently installed version in MR
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 16:54:54 -03:00
flow
cba2608c1c
feat: add logic for the modrinth instance modpack page
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 16:54:54 -03:00
flow
e5c42f68c2
feat: add basic ManagedPackPage classes
...
The idea is to have a base class that defines common behavior, and
subclasses for each modpack provider, adding specific behavior.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 16:54:54 -03:00
flow
02b4468bcd
feat(ui): add ManagedPackPage ui
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-06 16:54:50 -03:00
Sefa Eyeoglu
746f6945da
fix: remove rogue notr
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-06 20:52:32 +01:00
Sefa Eyeoglu
5cab4d8864
chore: reformat code
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-06 20:52:31 +01:00
Sefa Eyeoglu
5cedfcbfaf
chore: add license headers
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-06 20:52:14 +01:00
Sefa Eyeoglu
c06abd9b6b
refactor: replace Open All with Open Missing
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-06 20:52:13 +01:00
Sefa Eyeoglu
e08d97825d
feat: implement lax filename match in BlockedModsDialog
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-06 20:51:18 +01:00
Sefa Eyeoglu
d61323aa6d
fix: improve resize behavior of BlockedModsDialog
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-06 20:51:18 +01:00
flow
5ae044db93
Merge pull request #556 from DioEgizio/modrinth-icon-larger
2022-12-06 11:50:35 -08:00
flow
c6e4fdac7e
Merge pull request #557 from Scrumplex/fix-fswatcher-segfault
...
Closes https://github.com/PrismLauncher/PrismLauncher/issues/555
2022-12-06 11:50:03 -08:00
Sefa Eyeoglu
9669377b06
Merge pull request #560 from edgarogh/fix-minutes-unit
...
Closes https://github.com/PrismLauncher/PrismLauncher/issues/553
2022-12-06 14:45:46 +01:00
Sefa Eyeoglu
c8c3fe1023
chore: add license headers
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-06 13:18:50 +01:00
Sefa Eyeoglu
85bddbed86
chore: reformat code
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-06 13:16:27 +01:00
Edgar Onghena
318a2a429c
Fix minutes unit
...
Replaced "m" with "min" in `Time::prettifyDuration`
Signed-off-by: Edgar Onghena <dev@edgar.bzh >
2022-12-06 13:01:43 +01:00
Sefa Eyeoglu
07359865c6
fix: don't allocate BlockedsModsDialog
...
Fixes temporary memory leak!
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-05 21:39:26 +01:00
Sefa Eyeoglu
2fd7338cd3
dix: disable FS watcher after closing BlockedModsDialog
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-05 21:39:24 +01:00
DioEgizio
ce3cfa212c
fix: make modrinth icon larger
...
before it was considerably smaller than the other modpack platform icons which looked weird
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-12-05 20:27:29 +01:00
DioEgizio
b29c99656e
Merge pull request #546 from DioEgizio/add-server-icon
...
feat: add a proper server icon
2022-12-05 07:49:55 +01:00
Sefa Eyeoglu
45b0762096
Merge pull request #547 from flowln/fix_copying_instance
...
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/545
2022-12-04 23:47:09 +01:00
DioEgizio
aceafb28f6
feat: add server icon to simple colored icons too
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
Co-Authored-By: leo78913 <leo3758@riseup.net >
2022-12-04 21:29:00 +01:00
flow
928939cbe3
fix(Inst.Copy): create FS::copy object inside the secundary thread
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-04 12:29:38 -03:00
DioEgizio
2462b8e524
feat+fix: better flat icon
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-12-04 13:30:24 +01:00
DioEgizio
263a72879d
fix: oyxgen is lgpl3!
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-12-04 12:50:40 +01:00
DioEgizio
70620d5137
feat: add a proper server icon
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-12-04 12:45:39 +01:00
Sefa Eyeoglu
79d5beff8d
Merge pull request #541 from ryanccn/warn-before-trash-instance
...
Closes https://github.com/PrismLauncher/PrismLauncher/issues/192
closes https://github.com/PrismLauncher/PrismLauncher/issues/462
2022-12-03 15:20:49 +01:00
Ryan Cao
fa3caf091a
fix: warn before trashing instances
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-12-03 21:54:41 +08:00
Sefa Eyeoglu
93707560cb
Merge pull request #506 from Protrikk/develop
2022-12-02 22:04:33 +01:00
Sefa Eyeoglu
5c6f325071
Remove blue-ish tint from remaining flat white icons
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-02 20:47:11 +01:00
Sefa Eyeoglu
b9a17f5999
Merge branch 'upstream/develop' into develop
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-12-02 20:46:04 +01:00
flow
ab23f542c6
Merge pull request #423 from TheKodeToad/addagent
...
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/414
2022-12-02 06:40:18 -08:00
flow
fa98bf1ee7
Merge pull request #481 from ryanccn/import-resource-pack-dialog-uwu
2022-12-02 06:39:54 -08:00
flow
3cc987a5b4
fix: explicitly set scheme for local file in -I argument
...
Otherwise isLocalFile() will return false for local files without the
file:// thingy.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-01 22:54:03 -03:00
Sefa Eyeoglu
d1a1b8b6e8
Merge pull request #524 from DioEgizio/woa
...
add windows on arm builds
2022-12-01 23:09:37 +01:00
Sefa Eyeoglu
0d08e082be
Merge pull request #538 from flowln/fix_some_cf_imports
...
A couple fixes for CF instance imports
2022-12-01 23:06:35 +01:00
flow
386fb28a35
fix(FileResolvingTask): Fail instead of crash when there's API errors
...
Also remove non-used variable (rip).
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-01 15:33:35 -03:00
flow
79b79b752c
fix(Inst.Import): Show error reason in fail dialog
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-01 15:32:26 -03: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
DioEgizio
4c1c26a0e6
chore: drop Windows-MinGW-w64-Legacy
...
this brings back the number of builds as the same as before the pr
this is one of the slowest builds + windows 7/8.1 users can just use Windows-MSVC-Legacy
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-11-30 18:45:34 +01:00
Sefa Eyeoglu
9e1653ebb4
Merge pull request #436 from Scrumplex/feat-change-maxmem
...
Closes https://github.com/PrismLauncher/PrismLauncher/issues/426
2022-11-30 18:22:55 +01:00
DioEgizio
99dd9874df
refactor+fix: refactor the windows part of the release workflow and add arm to it
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-11-30 13:46:55 +01:00
TheLastRar
24193163e1
Maybe fix ResourceFolderModel Clang64 test failure
...
Previously this test would fail sometimes without including ECMQueryQt
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-30 13:46:55 +01:00
TheLastRar
94d164c0f2
Remove unused QT_DATA_DIR/QT_MKSPECS_DIR
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-30 13:46:55 +01:00
TheLastRar
efef2e95ab
Use ECMQueryQt Only with Qt5
...
Qt6 provides CMake variables for the paths we need
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-30 13:46:55 +01:00
DioEgizio
5efa725e92
feat(actions) add arm64 build
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-11-30 13:46:55 +01:00
flow
42c00213ce
Merge pull request #238 from santiagocezar/new-icons
2022-11-29 14:30:29 -08:00
flow
b7d1b9ac61
Merge pull request #527 from DioEgizio/revert-6.4.1-winmsvc
2022-11-29 14:27:29 -08:00
Sefa Eyeoglu
52d06ed814
chore: move instance_icons.svg
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-29 20:07:00 +01:00
Sefa Eyeoglu
46a1c855a9
Merge pull request #528 from Scrumplex/fix-resourcepages-runningstate
2022-11-29 19:50:00 +01:00
TheKodeToad
31dc82b1a6
Make requested changes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-29 09:43:08 +00:00
flow
4e27e132a0
fix: don't disable interaction on non-mod models when inst. is running
...
It is still useful for mods though, since we don't wnt to allow
disabling mods when the instance is running, as that wouldn't affect the
running instance, possibly causing confusion
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-28 12:02:38 -03:00
Sefa Eyeoglu
a5b0b4800a
fix: make resource buttons work when instance is running
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-27 23:10:32 +01:00
Santiago Cézar
e6244c937a
Merge branch 'develop' into new-icons
...
Signed-off-by: Santiago Cézar <48573316+santiagocezar@users.noreply.github.com >
2022-11-27 16:28:42 -03:00
Santiago Cézar
3cbf8d4993
resolving reviews
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-27 16:24:45 -03:00
Sefa Eyeoglu
f3279a0697
Merge remote-tracking branch 'upstream/develop' into import-resource-pack-dialog-uwu
2022-11-27 20:05:21 +01:00
Sefa Eyeoglu
8cac61f0be
fix: check resource pack validity solely using pack format
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-27 18:41:52 +01:00
Sefa Eyeoglu
236c196e68
fix: improve code readability
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-27 18:38:56 +01:00
DioEgizio
6c09efd630
fix: use qt 6.4.0 on windows msvc for now
...
qt 6.4.1 has a very bad scaling regression
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-11-27 15:24:15 +01:00
DioEgizio
cc92e1b0b6
Merge pull request #521 from Scrumplex/missing-icons
2022-11-26 19:02:03 +01:00
DioEgizio
c90f2c3ac6
fix: use monochrome icon for breeze
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-11-26 15:05:08 +01:00
Sefa Eyeoglu
6bdd27a08e
Merge pull request #493 from Scrumplex/cachix
...
Closes https://github.com/PrismLauncher/PrismLauncher/issues/491
2022-11-26 14:24:06 +01:00
Sefa Eyeoglu
80ff0b1418
Merge pull request #492 from Scrumplex/update-nix
2022-11-26 14:03:51 +01:00
Santiago Cézar
a8943ce1ee
remove unused ftb icon
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-25 15:15:08 -03:00
Santiago Cézar
71d35dc70b
meat is now round
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-25 15:15:08 -03:00
Santiago Cézar
9daf2a2996
resize to 24x24
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-25 15:15:07 -03:00
Santiago Cézar
f5d6aea942
forgot ftb
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-25 15:15:07 -03:00
Santiago Cézar
5850447fd0
merge with upstream
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-25 15:14:52 -03:00
Santiago Cézar
e12a7a4415
gradients!
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-25 14:22:49 -03:00
Santiago Cézar
81d84b8d02
initial icons
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-25 14:22:49 -03:00
flow
bae0a0530b
fix(RPImportDialog): allow changing item size to accomodate wrapped text
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-25 11:51:08 -03:00
Sefa Eyeoglu
cbf4159c7e
fix: add missing shortcut icons
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-25 14:03:10 +01:00
flow
4a1d082614
reafctor(WideBar): connect to signal instead of overriding menu method
...
This makes stuff more standard and closer to what we do in other places
in the codebase.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-25 09:33:05 -03:00
Sefa Eyeoglu
fd8b4c5368
Merge pull request #227 from Leo40Git/feature/instance-shortcuts
...
Closes https://github.com/PrismLauncher/PrismLauncher/issues/210
2022-11-25 13:11:00 +01:00
Sefa Eyeoglu
5872c34315
Merge pull request #412 from leo78913/legacy-icons
...
add the missing icons to the legacy icon theme
2022-11-25 08:36:42 +01:00
flow
b60fe08d44
Merge pull request #514 from DioEgizio/force-bundled-libs-win
2022-11-23 15:11:45 -08:00
DioEgizio
6a51eda361
fix: force bundled libs on win msvc
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-11-23 19:53:55 +01:00
TheKodeToad
96e8217b00
Button to add agent
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-23 09:46:55 +00:00
Sefa Eyeoglu
e6cb6cae11
Merge pull request #508 from TheLastRar/ForceBundledLibs
2022-11-23 09:49:24 +01:00
TheLastRar
980f03dd20
Fix: Launcher_FORCE_BUNDLED_LIBS Failing to find bundled zlib
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-22 19:23:09 +00:00
flow
20c281d6f8
fix: reset wide bar settings when the list of actions changes
...
This prevents changes to the actions to cause non-intuitive issues in
the Wide bar, hiding items that previously weren't hidden.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-22 14:30:54 -03:00
Trisave
66f9fed2f2
Remove blue-ish tint from flat white icons
...
Signed-off-by: Trisave <42098407+Protrikk@users.noreply.github.com >
2022-11-22 18:30:21 +01:00
flow
68b7aa0a4d
Merge pull request #498 from Scrumplex/fix-copy-signal
2022-11-21 13:44:43 -08:00
Ryan Cao
f916ce8752
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import-resource-pack-dialog-uwu
2022-11-21 23:19:50 +08:00
Sefa Eyeoglu
fdbd8d9d2b
refactor: remove old updater
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-21 16:18:05 +01:00
Sefa Eyeoglu
4208c2c72a
fix: actually emit fileCopied
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-21 15:47:15 +01:00
DioEgizio
5cc91965d0
Merge pull request #487 from TayouVR/breeze-icon-themes
2022-11-21 14:43:58 +01:00
Sefa Eyeoglu
c74f852364
Merge pull request #243 from Scrumplex/migration-dialog
...
Closes https://github.com/PrismLauncher/PrismLauncher/issues/46
Closes https://github.com/PrismLauncher/PrismLauncher/issues/204
2022-11-21 12:14:49 +01:00
Sefa Eyeoglu
c1b3a3adb4
fix(actions): don't ignore nix files
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-21 11:43:46 +01:00
Ryan Cao
7096f02b88
fix: text wrapping
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-21 18:15:03 +08:00
Sefa Eyeoglu
70a11935a8
feat(actions): add Nix build
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-21 00:22:25 +01:00
Sefa Eyeoglu
f601135cc0
refactor(nix): synchronize changes from nixpkgs
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-20 23:49:11 +01:00
Sefa Eyeoglu
884fe0d574
feat: validate maximum memory allocation in wizard
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-20 18:16:19 +01:00
DioEgizio
ffcbf97dcc
fix: add Breeze copyright notice to COPYING
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-11-20 17:48:44 +01:00
flow
f55fc51e9b
fix: remove commented-out assertions
...
They may not hold true at all times, and that's fine.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-20 11:11:08 -03:00
flow
df0f9259c0
refactor: move RP/TP validation to their respective utils
...
This makes it easier to validate individual resources, and allows the
logic to be used in other places in the future, if we need to.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-20 11:10:26 -03:00
Tayou
bb7a321c6e
add breeze themes
...
Signed-off-by: Tayou <tayou@gmx.net >
2022-11-20 05:24:10 +01:00
flow
2d69d63efe
feat(InstancePages): save/load wide bar visibility settings
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-19 18:41:31 -03:00
flow
479843f56b
feat(WideBar): allow loading/unloading visibility via a byte array
...
I really wanted to use a QBitArray :c
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-19 18:41:31 -03:00
flow
6e1639551b
feat(WideBar): allow hiding buttons with right-click
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-19 18:41:30 -03:00
flow
2367903ac6
refactor: clean up WideBar a bit
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-19 18:41:30 -03:00
Sefa Eyeoglu
30607c34a1
Merge pull request #291 from TheKodeToad/betterjavalauncher
2022-11-19 18:45:15 +01:00
Sefa Eyeoglu
817947c928
Merge pull request #483 from jopejoe1/patch-1
2022-11-19 18:44:09 +01:00
Sefa Eyeoglu
29926a59bb
Merge pull request #482 from DioEgizio/fix-cache-flatpak
2022-11-19 18:10:03 +01:00
Ryan Cao
d92ae530d7
fix: stray include
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-20 00:34:44 +08:00
Ryan Cao
e0e428ce38
fix: add support for CLI and drag and drop
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-20 00:28:35 +08:00
jopejoe1
d1db7a0e23
Fix New Zealand English display
...
Signed-off-by: jopejoe1 <34899572+jopejoe1@users.noreply.github.com >
2022-11-19 16:28:27 +00:00
DioEgizio
c27ebde575
fix(actions): fix cache on flatpak
...
currently there's a [bug](https://github.com/flatpak/flatpak-github-actions/issues/80 ) on the stable version of the flatpak action which causes the cache key to be wrong. this commit work arounds it
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-11-19 17:14:19 +01:00
Ryan Cao
a99cd16422
fix: resource pack import dialog icons and add message
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-20 00:14:16 +08:00
Ryan Cao
1f6b8f9d2b
fix instance IDs and resource pack imports
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-19 23:59:30 +08:00
Ryan Cao
a33b804923
fix: add resource pack format for 1.19.3
...
Co-authored-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-19 23:47:47 +08:00
Ryan Cao
f527958cb3
fix: check if packFormat is valid for resourcepack parsing
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-19 23:42:56 +08:00
Ryan Cao
b1bdc6f745
fix resource packs and add support for texture packs
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-19 23:38:05 +08:00
Ryan Cao
8dacbafc8b
feat: initial support for smart resource pack parsing on file handler
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-19 23:14:57 +08:00
TheKodeToad
70fa92f22c
Remove dirty printStackTrace hacks
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-19 13:59:22 +00:00
flow
3482076a20
Merge pull request #476 from Scrumplex/matrix
2022-11-19 05:07:33 -08:00
Sefa Eyeoglu
f7239f7f8a
chore: update community links
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-19 13:34:02 +01:00
flow
20ba787c00
Merge pull request #474 from Scrumplex/translations-maybe2
2022-11-19 03:41:54 -08:00
TheKodeToad
669eef92eb
Make requested changes and utilise AssertionError
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-19 08:54:17 +00:00
Sefa Eyeoglu
c6d9edb78f
chore: improve display names of more languages
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-18 22:21:55 +01:00
Sefa Eyeoglu
347ae0a9ad
Merge pull request #456 from DioEgizio/flatpak-build
...
closes https://github.com/PrismLauncher/PrismLauncher/issues/62
2022-11-18 21:37:14 +01:00
DioEgizio
dbd01d35e6
Merge pull request #455 from leo78913/menubar-stuff
2022-11-18 17:20:50 +01:00
flow
b24c09665f
Merge pull request #439 from Ryex/better-blocked-mods
2022-11-17 11:29:28 -08:00
Sefa Eyeoglu
fa96ebd382
Merge pull request #471 from IDeletedSystem64/develop
2022-11-17 20:28:42 +01:00
Rachel Powers
52d43f843b
feat(BlockModsDialog): remove redundant Ui info
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-11-17 11:46:14 -07:00
Sophie Marie
90376749f0
Fix AUR qt5-git and git having the wrong AUR links
...
Signed-off-by: Sophie Marie <twilightsparkle@duck.com >
2022-11-17 12:42:34 -06:00
flow
5cf2a8b5fc
Merge pull request #454 from RedsonBr140/menu-themes
2022-11-17 09:47:55 -08:00
Redson
f72ac94c11
fix: Fix usage below
...
Signed-off-by: Redson <redson@riseup.net >
2022-11-17 06:39:05 -03:00
RedsonBr140
bd3a693e70
chore: Change var name
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: RedsonBr140 <redson@riseup.net >
2022-11-17 06:20:53 -03:00
Sefa Eyeoglu
298871e207
Merge pull request #467 from Scrumplex/fix-meta-extensions-json
...
Fix serialization of components with custom metadata
2022-11-16 23:54:26 +01:00
Sefa Eyeoglu
ce958f4ffd
refactor: use isEmpty instead of size for lists
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-16 23:20:47 +01:00
Sefa Eyeoglu
2de150bfc8
Merge pull request #431 from FayneAldan/version
2022-11-16 18:20:32 +01:00
Sefa Eyeoglu
40970a1a87
fix: serialize metadata extensions
...
Prism has introduced a few extensions to the meta component version
format, which were not exported as JSON in the launcher. This caused the
`Customize` button on the version page to not write these new properties
to the custom component file.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-16 18:11:18 +01:00
Sefa Eyeoglu
8aae652be1
fix: remove unnecessary condition
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-16 18:10:54 +01:00
RedsonBr140
37a117d2ef
chore: Var definition inside the for loop
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: RedsonBr140 <redson@riseup.net >
2022-11-16 12:24:28 -03:00
txtsd
debc1659e1
Merge pull request #464 from DioEgizio/qt-6.4.1
2022-11-16 15:23:52 +05:30
flow
23e411c42b
Merge pull request #459 from Scrumplex/bump-tomlplusplus
2022-11-16 01:34:15 -08:00
DioEgizio
88feebe499
chore: use qt 6.4.1 on Windows-MSVC
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-11-16 09:55:46 +01:00
Fayne Aldan
e8b871ac72
Merge branch 'PrismLauncher:develop' into version
2022-11-15 18:34:24 -07:00
Fayne Aldan
9f30c6d94b
Add commit hash to --version
...
Signed-off-by: Fayne Aldan <FayneAldan@gmail.com >
2022-11-15 18:33:51 -07:00
flow
c4c1e75de8
fix: use QPixmapCache only from the main thread
...
It's a required condition.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-15 18:14:03 -03:00
Sefa Eyeoglu
c1763cc4b0
fix: disable FLOAT16 in toml++
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-15 21:23:20 +01:00
Sefa Eyeoglu
ee096edfff
chore: bump tomlplusplus
...
Should fix issues with builds on aarch64
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-15 20:58:07 +01:00
DioEgizio
464b9ebc95
feat: add flatpak builds to the ci for testing
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-11-15 17:45:12 +01:00
flow
7705f290ca
fix: don't retry to load RP images that can't fit in the cache
...
Avoids an infinite loop when the image is too big.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-15 12:07:11 -03:00
leo78913
7439fd6bcb
fix: Fix some stuff in the menu bar
...
- Remove duplicated launch actions
- Enable the add instance action icon in menus
- Remove ugly separator at the end of the help menu if the updater is disabled
- Add icons to the help and news menu items
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-11-15 10:56:41 -03:00
Redson
6fe626ab9a
feat: Make the changes persistent.
...
Signed-off-by: Redson <redson@riseup.net >
2022-11-15 06:09:13 -03:00
Redson
a12f892841
fix: Check the box when the theme is changed via settings
...
Signed-off-by: Redson <redson@riseup.net >
2022-11-15 05:46:24 -03:00
Redson
aa3ea79f94
fix: Check the current theme box on startup.
...
Signed-off-by: Redson <redson@riseup.net >
2022-11-15 05:38:31 -03:00
Redson
ef53455b66
fix: Build on QT6
...
Signed-off-by: Redson <redson@riseup.net >
2022-11-15 05:19:46 -03:00
ADudeCalledLeo
ba46ff6692
Merge remote-tracking branch 'upstream/develop' into feature/instance-shortcuts
2022-11-15 10:05:04 +02:00
leo78913
0e916244f0
feat: Add themes and their logic.
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-11-14 21:10:48 -03:00
RedsonBr140
1e4ee02cbc
Merge branch 'PrismLauncher:develop' into menu-themes
2022-11-14 21:09:37 -03:00
flow
cedc7754d9
Merge pull request #428 from DioEgizio/fixes-to-CI
2022-11-14 14:16:01 -08:00
flow
fece9e207b
Merge pull request #448 from TheLastRar/fixup-warnings
2022-11-14 14:15:46 -08:00
ADudeCalledLeo
cca052ccc9
Restore QRC headers
...
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-14 22:46:41 +02:00
Sefa Eyeoglu
5be9472912
fix: fix potentially uninitialized variable
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-14 21:20:38 +01:00
Sefa Eyeoglu
f60b09568c
Merge pull request #112 from ryanccn/macos-add-to-path
2022-11-14 21:12:36 +01:00
Redson
be765f8d88
feat: Add empty menu
...
Signed-off-by: Redson <redson@riseup.net >
2022-11-14 16:33:25 -03:00
leo78913
8d6aecd944
add the missing icons to the legacy icon theme
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-11-14 16:16:52 -03:00
TheLastRar
aef5349aee
Pass index.parent() as parent parameter for rowCount
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-14 19:05:57 +00:00
TheLastRar
ac993aa31f
Use Q_UNUSED instead of [[maybe_unused]] in onParseFailed
...
Qt5 on Ubuntu cannot handle [[maybe_unused]] in this function
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-14 19:05:57 +00:00
TheLastRar
fce323b945
Check parent in rowCount/columnCount/canFetchMore
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-14 19:05:57 +00:00
TheLastRar
5558f3d2cc
Mark paramaters of dropMimeData as unused
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-14 19:05:57 +00:00
TheLastRar
08f8623cb7
Mark paramaters of onParseFailed as unused
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-14 19:05:56 +00:00
TheLastRar
f8a137a26e
Mark loadExtraPackInfo abstract
...
All classes that inherit from ModModel override this method
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-14 19:05:56 +00:00
TheLastRar
3cba359d38
Mark paramater runtimeContext as unused
...
Base class uses variable, but ImplicitRule does not
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-14 19:05:56 +00:00
TheLastRar
b8d7aedb2c
Mark paramater line as unused in guessLevel()
...
The base method doesn't use this variable, but classes overriding this method do
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-14 19:05:56 +00:00
TheLastRar
55c7b291e1
Remove unused qhash function
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-14 19:05:56 +00:00
TheLastRar
472d931b4b
Prefix member variables in HttpMetaCache
...
MSVC warns about shadowing variables
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-14 19:05:56 +00:00
ADudeCalledLeo
ce892c9e77
Add icon
...
NOTE: Currently missing on Legacy, Flat and Flat (White)
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-14 21:02:31 +02:00
Sefa Eyeoglu
e14b998da3
refactor: improve readability
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-14 18:38:12 +01:00
Ryan Cao
2c9452efaf
Merge branch 'develop' into macos-add-to-path
2022-11-14 19:26:31 +08:00
Ryan Cao
97a7af855f
slight reword: "install to PATH"
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-14 19:21:47 +08:00
ADudeCalledLeo
5be8545edc
Windows, Linux: prevent segfault on missing icon
...
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-13 20:18:51 +02:00
txtsd
0a04c3a2a7
fix: Fix the error that CodeQL caught
...
Signed-off-by: txtsd <code@ihavea.quest >
2022-11-13 18:54:55 +01:00
DioEgizio
dcfc15a0a1
feat+fix: move codeql to its own workflow
...
i think it's better practice, it should slightly improve linux qt6 build times and i noticed ccache? is messing up with it because alerts get randomly fixed
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-11-13 18:54:55 +01:00
DioEgizio
841c2e9166
fix: disable caching Qt on release
...
it's good practice to not cache on release builds
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-11-13 18:54:55 +01:00
DioEgizio
07392d493c
fix: disable building snaps on release
...
the snap infra should already be able to deal with it, i think
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-11-13 18:54:55 +01:00
ADudeCalledLeo
acd50969e0
Linux: remove TryExec entry from .desktop files
...
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-13 19:50:27 +02:00
Sefa Eyeoglu
074b53eb6b
Merge pull request #445 from flowln/optimize_edit_instance
2022-11-13 17:18:06 +01:00
ADudeCalledLeo
c4cfec1e94
Undo accidental tomlplusplus downgrade
...
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-13 18:00:18 +02:00
ADudeCalledLeo
b0269e6dfc
Linux: fixes
...
- Fix shortcut icons
- Possibly fix shortcut creation on AppImages
- Fix shortcut not working if path to launcher contains spaces
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-13 17:51:29 +02:00
ADudeCalledLeo
43b9d9484d
tabs -> spaces
...
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-13 15:49:28 +02:00
ADudeCalledLeo
69bbb29328
Mac: attempt 2
...
- create .command files instead of .sh
- fix shortcuts not working if path to Prism Launcher contains spaces
- fix path to executable in shortcutss
- add check for running from extracted folder (prevents creating shortcuts)
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-13 15:47:37 +02:00
flow
577069cfb4
fix: don't have the clear button on instance page filters
...
This thing is otherworldly unoptimized. o.O
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-12 19:23:57 -03:00
Sefa Eyeoglu
fe94c3609e
fix: implement code review suggestions
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-12 20:28:30 +01:00
Sefa Eyeoglu
173aed7fd8
chore: add REUSE headers
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-12 20:28:30 +01:00
Sefa Eyeoglu
335bec68fb
fix: prevent abort for un-abortable tasks
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-12 20:28:30 +01:00
Sefa Eyeoglu
bbb7e9f5c7
feat: show current copy operation in migration dialog
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-12 20:28:30 +01:00
Sefa Eyeoglu
086304f7f2
feat: add initial Migration dialog
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-12 20:28:30 +01:00
Sefa Eyeoglu
bd7065eece
feat: add SimplePrefixMatcher
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-12 20:28:30 +01:00
Sefa Eyeoglu
15aaff7c1c
feat: add dryRun to copy operation
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-12 20:28:29 +01:00
Sefa Eyeoglu
e048bce13e
refactor: allow copy operation with whitelist
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-12 20:27:13 +01:00
Sefa Eyeoglu
ddfb449b28
fix: remove PolyMC data paths
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-12 20:27:13 +01:00
ADudeCalledLeo
5322155b19
Mac: fix build
...
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-12 20:48:21 +02:00
ADudeCalledLeo
45ce72593a
Windows: remove icon if shortcut creation fails
...
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-12 20:43:58 +02:00
ADudeCalledLeo
b813c867b5
refactor #if checks
...
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-12 20:41:52 +02:00
ADudeCalledLeo
f7d7d76ee8
Mac: now supported! [UNTESTED]
...
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-12 20:36:49 +02:00
ADudeCalledLeo
7e5076b068
Linux: fix path shortcut is written to
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-12 20:19:32 +02:00
ADudeCalledLeo
dbe0553b4a
Move addAction call above left-align loop
...
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-12 20:19:31 +02:00
ADudeCalledLeo
9be48f1dc4
this ain't static, falco
...
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-12 20:19:31 +02:00
ADudeCalledLeo
6043444e4e
Apply suggestions from code review
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-12 20:19:30 +02:00
ADudeCalledLeo
487e352642
Fix nested #if directive
...
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-12 20:19:29 +02:00
ADudeCalledLeo
cc5f82bfac
Windows: fix window icon being replaced
...
Dunno why it happens but the fix was literally 2 lines, so whatever I guess
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-12 20:19:28 +02:00
ADudeCalledLeo
4d4dfab388
Windows: add instance icon to shortcut
...
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-12 20:19:28 +02:00
ADudeCalledLeo
b83f9be1bd
Add missing fail check for CoInitialize
...
Add a few comments
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-12 20:19:27 +02:00
ADudeCalledLeo
6ae3b183fd
Remove unnessecary "is defined" check
...
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-12 20:19:27 +02:00
ADudeCalledLeo
f12117c532
[UNTESTED] Linux: add icons to shortcuts
...
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-12 20:19:26 +02:00
ADudeCalledLeo
70768189ba
Windows: implement FS::createShortcut
...
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-12 20:19:25 +02:00
ADudeCalledLeo
30b266622c
Add 'Create shortcut' button to instance toolbar
...
Implemented on Windows only rn!
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com >
2022-11-12 20:18:49 +02:00
Rachel Powers
25b306b7e1
feat: mark folder paths as links
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-11-11 18:32:11 -07:00
Rachel Powers
9af1b00df5
feat: add list of watched folders
...
move explanation text into dialog class and it's own label
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-11-11 18:05:19 -07:00
Rachel Powers
51c27e2748
always use the pending path set to avoid task duplication.
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-11-11 16:33:52 -07:00
Rachel Powers
b9e2c3524c
chore: clang format & cleanup
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-11-11 16:07:57 -07:00
Rachel Powers
3f6cc17818
properly handle a currently running hashing task
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-11-11 15:45:40 -07:00
Rachel Powers
5909af9878
drag&drop + add folder to watch
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-11-11 14:17:33 -07:00
flow
64576f4c4c
Merge pull request #304 from Ryex/move-downloads
...
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/222
2022-11-11 12:48:53 -08:00
DioEgizio
21dbd28a2f
Merge pull request #266 from Ryex/windows-file-association
2022-11-11 15:46:03 +01:00
Sefa Eyeoglu
b57fee1a44
fix: swap spin box and state icon
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-11 15:24:14 +01:00
Sefa Eyeoglu
cabd887866
feat: use icons to show memory allocation state
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-11 15:22:16 +01:00
Sefa Eyeoglu
863a168cb5
feat: raise memory limits to 1TiB
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-11 15:05:00 +01:00
Sefa Eyeoglu
5ee4fb3522
feat: validate maximum memory allocation
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-11 15:04:05 +01:00
Rachel Powers
bb8ac9b99a
changed name of file type association
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-11-11 05:46:41 -07:00
Rachel Powers
2f10fa8b61
add some extra debug logs for CF blocked mods
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-11-11 05:41:32 -07:00
flow
46a8e18841
Merge pull request #367 from TheKodeToad/linkjumping
...
fix https://github.com/PrismLauncher/PrismLauncher/issues/363
2022-11-10 08:08:44 -08:00
flow
6c53e68a52
Merge pull request #406 from Scrumplex/fix-clear-metadata
2022-11-10 07:50:14 -08:00
Sefa Eyeoglu
392452d422
Merge pull request #397 from flowln/windows_mod_updater_fixes_maybe
...
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/226
2022-11-10 14:34:15 +01:00
TheKodeToad
99ed0b6c2c
Implement flowln's suggestions
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-10 11:14:58 +00:00
Sefa Eyeoglu
e6d057fe6d
Merge pull request #415 from TayouVR/fix-main-warning
2022-11-09 18:27:40 +01:00
flow
9ad6eb11a3
refactor: fix CodeQL warnings in StringUtils::naturalCompare
...
I have no idea why this function exists, so better to just let it exist.
=D
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-09 14:14:25 -03:00
TheKodeToad
32c2ad2bbd
A lot more cleanup
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 17:51:18 +00:00
TheKodeToad
f2ca9a6b31
Revert switch to JUL for better colours
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 17:38:23 +00:00
TheKodeToad
50d40257fe
Always use this for consistency
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 17:38:23 +00:00
TheKodeToad
d90eff64d0
Add StringUtils to CMakeLists.txt
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:37:27 +00:00
TheKodeToad
e6dc34fe10
More license fixing
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:37:27 +00:00
TheKodeToad
745c331311
Remove last case of printStackTrace
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:37:27 +00:00
TheKodeToad
1ea2e85415
Implicit is generally prefered
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:37:27 +00:00
TheKodeToad
4a2df30f92
Try to use more standard exit codes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:37:27 +00:00
TheKodeToad
922220c11e
More consistent logging text
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:37:27 +00:00
TheKodeToad
56d5035c63
Fix the warnings properly
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:37:27 +00:00
TheKodeToad
4abf3a20c6
More standard code formatting profile
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:37:25 +00:00
TheKodeToad
5912ef3b45
Just ignore empty lines
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:37:00 +00:00
TheKodeToad
9931c9a286
Remove arguments being passed twice
...
Passing the classpath into stdin has no effect. Java is already provided the classpath with -cp, which pretty much takes up the largest part of the arguments anyway, which leads me to wonder, what's the point of stdin arguments at all?
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:37:00 +00:00
TheKodeToad
1da834f650
*opinionated change* Remove LauncherFactory
...
Factories in OOP are a classic example of over-enginneering. When you only have two launchers I personally think that it's not very useful.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:37:00 +00:00
TheKodeToad
fb677a7489
So turns out we can have nice things
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:36:55 +00:00
TheKodeToad
404796d4b2
Sorry for reverting a lot but copying a list just hurts me
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:36:35 +00:00
TheKodeToad
5b9bfe8891
Attempt to mimic clang-format
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:36:33 +00:00
TheKodeToad
779bc2c63d
Fix WrongMethodTypeException. Invoke exact don't work like that
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:35:46 +00:00
TheKodeToad
cae1ba7cd8
Less needless verbosity, and return fallback
...
Needlessly verbose commit message ik.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:35:46 +00:00
TheKodeToad
8ce78dcc54
Try to improve consistency
...
- Makes code formatting more consistent with the C++ codebase. Probably removes some trailing whitespace. Maybe it would be best to commit an Eclipse or IntelliJ code format preferences file?
- Removes obscure suppressions. I personally think it's better to only suppress warnings that javac complains about. Suppressing a lot of non-standardised warnings (many of them turned off by default even in IntelliJ) just creates needless clutter.
- Fixes some trivial warnings instead of suppressing them. serialVersionUID is sort of stupid, but I'd rather mentally ignore it or just fix it if it's really that annoying.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:35:43 +00:00
solonovamax
afe088dba1
Fix license headers
...
- Update license headers in several files to remove multimc apache reference, when unneeded
- LauncherFactory: we've entirely rewritten this class at this point, so it's fully under GPL code
- Launcher: this interface contains zero logic, and only a single method named `launch`, so I doubt you can actually copyright that
- LauncherProvider: same as above
- ParseException, ParameterNotFoundException: same as above; this class contains almost no logic (And the logic that was added is under GPL)
- ReflectionUtils, StringUtils: add license header
- Everything else: modify the program name in the license header from "PolyMC - Minecraft Launcher" to "Prism Launcher"
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com >
2022-11-08 16:25:09 +00:00
solonovamax
e899e31745
More informative exceptions in entrypoint
...
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com >
2022-11-08 16:25:09 +00:00
solonovamax
dabb84f62a
Cleanup launcher classes
...
Cleanup a bunch of the code in launcher classes
- Migrate the majority of the reflection to ReflectionUtils
- Decrease logic in AbstractLauncher
- Add logging to launcher classes at FINE level
- make mcParams in AbstractLauncher an immutable list to prevent runtime manipulation
- StandardLauncher instead copies the list to modify it
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com >
2022-11-08 16:25:09 +00:00
solonovamax
9b8096c699
Get rid of gross HashMap being used by LauncherFactory and instead use *fancy* enum
...
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com >
2022-11-08 16:25:09 +00:00
solonovamax
ac5b74301e
Cleanup splitting string into a pair
...
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com >
2022-11-08 16:25:09 +00:00
TheKodeToad
609b30110b
Make main static
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
Inline local variable
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:25:09 +00:00
TheKodeToad
35d200356f
Create launcher.impl.legacy
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:25:09 +00:00
TheKodeToad
0cd1d7aa7e
Excessive safety
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:25:09 +00:00
TheKodeToad
ade7526f5f
Remove the need for LegacyUtils
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:25:09 +00:00
TheKodeToad
a7b1700d42
Better variable naming
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:25:09 +00:00
TheKodeToad
c0b8c53e69
Attempt to sort out copyright headers
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:25:09 +00:00
TheKodeToad
e86fbc697f
Fix formatting
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:25:09 +00:00
solonovamax
e5622ce824
Code cleanup to net.minecraft.Launcher
...
No code logic has been changed, only:
- add @Override annotatons
- change setVisible(boolean b) -> setVisible(boolean visible)
- Change block commend on class -> javadoc comment
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com >
2022-11-08 16:25:09 +00:00
solonovamax
99d9868116
Cleanup EntryPoint code
...
- Don't return an int from listen(). An enum is preferred.
- Make parseLine() static, and pass Parameters to it.
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com >
2022-11-08 16:25:09 +00:00
solonovamax
107fa6b4f7
Code refactors
...
- Refactor LauncherFactory.LauncherProvider to LauncherFactory
- Refactor all launcher related components to launcher package
- some basic code cleanup
- Rename all, allSafe -> getList and first, firstSafe -> getString
- Rename Utils -> LegacyUtils
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com >
2022-11-08 16:25:09 +00:00
solonovamax
9062d28704
Get rid of singleton, and refactor LauncherFactory to be a static class
...
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com >
2022-11-08 16:25:09 +00:00
TheKodeToad
e68dcea6bc
Various tweaks to the Java component of the launcher
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-08 16:24:55 +00:00
txtsd
787c5a515f
Merge pull request #407 from AshtakaOOf/readme
2022-11-08 17:25:19 +05:30
txtsd
ce2df4b36f
chore(readme): Specify openSUSE Tumbleweed
...
Signed-off-by: txtsd <code@ihavea.quest >
2022-11-08 17:24:00 +05:30
txtsd
fcb9733df0
Merge pull request #392 from PrismLauncher/max_ram_logic
2022-11-08 12:23:24 +05:30
Adrien
245928a064
Update README.md
...
Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com >
2022-11-07 20:33:09 +01:00
flow
589d160515
fix: use cross-platform toStdString in FlameHasher
...
Almost the same issue from toml++ :p
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-07 14:04:48 -03:00
Adrien
380e76a2e3
Add Tumbleweed
...
Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com >
2022-11-07 17:14:16 +01:00
Tayou
9ac6114b63
Fix warning in main function
...
main could according to the compiler end up not returning. of course it will always return, but I satisfied the compiler by adding a default case.
Signed-off-by: Tayou <tayou@gmx.net >
2022-11-07 14:33:37 +01:00
DioEgizio
d558ff305a
Merge pull request #411 from TheLastRar/configurationless-install
...
Fix: Configuration-less config for Qt Install
2022-11-07 13:30:39 +01:00
Adrien
89aaac3a70
Update README.md
...
Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com >
2022-11-06 21:56:02 +01:00
TheLastRar
456999eee6
Fix: Configuration-less config for Qt Install
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-06 14:25:38 +00:00
TheKodeToad
16e3b786fc
Implement Scrumplex's suggestions
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-06 10:09:06 +00:00
DioEgizio
126bbd67f7
Merge pull request #405 from AshtakaOOf/spooky
2022-11-06 07:27:39 +01:00
Adrien
38e1d44dbb
Update README.md
...
Add copr
Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com >
2022-11-06 03:42:51 +01:00
Sefa Eyeoglu
9fb80a2687
Merge pull request #242 from marcelohdez/more-copy-options
2022-11-06 01:10:24 +01:00
Sefa Eyeoglu
d5d224d89a
fix: save metacache after clearing
...
If the user closes the launcher right after clearing, it probably
didn't actually clear the cache yet.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-06 01:05:13 +01:00
Sefa Eyeoglu
4708ce4226
refactor: rename halloween cats to -spooky
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-06 00:47:33 +01:00
Sefa Eyeoglu
a0580946dc
fix: allow -ween variants for all cats
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-06 00:04:43 +01:00
Sefa Eyeoglu
e68fd7c1e3
Merge pull request #383 from leo78913/toolbar-lock
2022-11-06 00:00:47 +01:00
Adrien
369419870e
add: Spooky Rory
...
Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com >
2022-11-05 23:55:43 +01:00
leo78913
0938f80b41
Update launcher/ui/MainWindow.cpp
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-11-05 18:10:36 -03:00
flow
9f462dcc27
fix: update tomlplusplus submodule
...
This fixes an issue with Windows TOML file parsing with non-latin
characters.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-05 16:28:54 -03:00
Rachel Powers
96008d3bb2
add -I import flag & don't clobber .zip assoc
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-11-05 08:07:58 -07:00
Rachel Powers
c05f744ec2
windows file association is *hard*
...
new macros!
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-11-05 08:07:58 -07:00
Ryan Cao
3df31579a1
fix: @timoreo22
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-05 22:31:38 +08:00
Ryan Cao
f1d3481a29
fix: remove dumb FS::symlink function
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-05 22:25:22 +08:00
Ryan Cao
cf3aad9c41
fix: use osascript to get admin privileges
...
inspired from VSCode's approach
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-05 22:18:05 +08:00
Ryan Cao
7b1e68bfa8
initial support for add to PATH action
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-05 22:17:59 +08:00
DioEgizio
82256a2fe8
Merge pull request #400 from DioEgizio/bump-6.0
2022-11-05 14:35:21 +01:00
DioEgizio
016b3448e8
chore: bump to 6.0
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-11-05 13:34:02 +01:00
Sefa Eyeoglu
2dde26e485
Merge pull request #399 from ryanccn/readme-adaptive-logo-fix
2022-11-05 13:07:53 +01:00
Ryan Cao
2999afe781
fix: width="50%"
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-05 19:20:08 +08:00
Ryan Cao
bfc5a6488b
fix(docs): use new format for adaptive images in README
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-05 19:16:56 +08:00
Sefa Eyeoglu
4af22d663a
Merge pull request #229 from ryanccn/macos-drag-n-drop
2022-11-05 11:17:21 +01:00
Sefa Eyeoglu
ba8322aa5c
Merge pull request #396 from leozamboni/develop
2022-11-05 11:17:13 +01:00
Sefa Eyeoglu
e4bd82190a
Merge pull request #149 from TayouVR/better-custom-themes
2022-11-05 11:16:41 +01:00
Sefa Eyeoglu
695734636f
Merge pull request #294 from piperswe/add-snapcraft-yml
2022-11-05 11:09:51 +01:00
Sefa Eyeoglu
bdac2a5f4d
fix: add missing newline
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-05 11:09:35 +01:00
Sefa Eyeoglu
f8ea6212c7
fix: fix icon install path
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-05 10:42:44 +01:00
Sefa Eyeoglu
5e9b26dbef
Merge pull request #366 from TheLastRar/MSVC-Build
2022-11-04 23:49:54 +01:00
Sefa Eyeoglu
67c99369ab
fix: use KDEInstallDirs for manpage
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-04 23:43:18 +01:00
flow
d35c2db41e
fix: separate types of std::string in Packwiz
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-04 16:53:25 -03:00
flow
dff5fea976
feat: add more separation between types of std::string in StringUtils
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-04 16:53:25 -03:00
flow
ab6c7244fc
refactor: move FS's toStdString to StringUtils
...
This is so that anyone can use it :)
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-04 16:53:25 -03:00
flow
353b51f11e
refactor: move MMCStrings -> StringUtils
...
General utilities can go in here >:)
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-04 16:53:24 -03:00
flow
76050880f1
fix: use unicode variant for marking '.index' hidden
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-04 16:53:21 -03:00
TheLastRar
396a7994f9
Workflow: Add MSVC Builds to release workflow
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-04 18:11:39 +00:00
TheLastRar
e29259cd55
Fix: Resolve ambiguous overload errors
...
Clang-cl fails to select the correct function and instead errors
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-04 18:11:39 +00:00
TheLastRar
79a728d7d2
Fix: Conflicting types for hoedown functions
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-04 18:11:39 +00:00
TheLastRar
98444bd865
CI: Add VC variables before packaging on Windows
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-04 18:11:39 +00:00
TheLastRar
3f75e1cb1d
CI: Build MSVC Legacy as 32bit
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-04 18:11:39 +00:00
TheLastRar
4f327120ac
CI: Link to release libraries even in debug
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-04 18:11:39 +00:00
TheLastRar
cc8456ec6b
CI: Use msbuild generator for msvc builds
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-04 18:11:38 +00:00
TheLastRar
f8ad1a052f
CMake: Support multi-configuration generators
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-04 18:11:38 +00:00
TheLastRar
372ce588cd
CI: Add MSVC Builds
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-04 18:11:38 +00:00
TheLastRar
12632ec404
CMake: Build flags for MSVC
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-04 18:11:37 +00:00
TheLastRar
e777c26a14
CMake: Add fallback to bundled ECM
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-04 18:11:37 +00:00
TheLastRar
1d38248194
Libraries: Add ECM
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-04 18:11:36 +00:00
TheLastRar
d52868c6c5
CI: Exclude zlib tests
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-04 18:11:36 +00:00
TheLastRar
29c1639b1d
CMake: Force bundled zlib to take our IPO settings
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-04 18:11:36 +00:00
TheLastRar
653a953d2f
CMake: Add zlib
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-04 18:11:35 +00:00
leozamboni
9f5537d936
feat: spooky cat for halloween
...
Signed-off-by: leozamboni <leonardonunes169@gmail.com >
2022-11-04 15:09:57 -03:00
Sefa Eyeoglu
21a7af535c
Merge branch 'develop' into macos-drag-n-drop
2022-11-04 18:30:42 +01:00
Sefa Eyeoglu
a241d3f187
refactor(cmake): use KDEInstallDirs for Linux install paths
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-04 18:29:19 +01:00
txtsd
8f045af867
Merge pull request #374 from flowln/fix_lto
2022-11-04 15:39:41 +05:30
TheLastRar
6d4efc0443
Libraries: Add zlib
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-03 21:35:28 +00:00
TheLastRar
e2e6d00064
CMake: Remove CMP0020 OLD
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-03 21:35:28 +00:00
TheLastRar
e682c3e9b8
Fix: Correct exclusions for debug QT plugins
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-03 21:35:28 +00:00
TheLastRar
fe347262e9
Fix: Using uint8_t in std::uniform_int_distribution is undefined
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-03 21:35:27 +00:00
TheLastRar
c993209b76
Fix: Explicitly specify Version.h path
...
MSVC uses a different search mechanism that ends up picking the mete Version.h
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-03 21:35:27 +00:00
Sefa Eyeoglu
2cf4d5f8ec
Merge pull request #389 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x
2022-11-03 21:58:29 +01:00
renovate[bot]
c6ab9718ae
chore(deps): update hendrikmuhs/ccache-action action to v1.2.5
2022-11-03 19:50:27 +00:00
txtsd
3e3ef03855
Merge pull request #379 from TheLastRar/win-stacksize
2022-11-03 10:52:36 +05:30
Tayou
c2f37716e5
clang_format for PR files
...
I'm getting a rendezvous... I thought I did this already
Signed-off-by: Tayou <tayou@gmx.net >
2022-11-03 05:05:07 +01:00
Tayou
e9bfd43ff7
added requested changes
...
Signed-off-by: Tayou <tayou@gmx.net >
2022-11-03 05:04:36 +01:00
flow
2958ffa73f
Merge pull request #382 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x
2022-11-02 16:50:47 -07:00
leo78913
3d11d044d2
add an option to lock the toolbars
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-11-02 20:33:02 -03:00
renovate[bot]
7eb0b1c69a
chore(deps): update hendrikmuhs/ccache-action action to v1.2.4
2022-11-02 23:02:32 +00:00
TheLastRar
8d39a9ea61
Fix: Increase stack size on Windows to 8MiB
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-02 20:13:44 +00:00
TheKodeToad
cb796dbdfb
Remove unnecessary block
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-02 16:38:32 +00:00
Ryan Cao
4254c20eda
experimental: install mime info in CMake
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-02 23:28:42 +08:00
Sefa Eyeoglu
094b57bb23
Merge pull request #372 from santiagocezar/rory
2022-11-02 12:06:08 +01:00
Santiago Cézar
9ca4f19aea
remove logcat
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-02 07:45:43 -03:00
TheKodeToad
a29d88c313
Even more fixes
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-02 09:59:58 +00:00
TheKodeToad
a1ed8154f7
Another fix
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-02 09:31:39 +00:00
TheKodeToad
6c45a990ef
A good use of auto
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-02 09:13:44 +00:00
TheKodeToad
8dfa3393dc
Formatting and forward-declaration
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-02 08:43:46 +00:00
txtsd
d12323396f
Merge pull request #346 from ryanccn/more-user-friendly-java-warning-text-ahaha
2022-11-02 10:38:26 +05:30
Santiago Cézar
48d34741f3
keyboard navigation is important
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-01 22:53:45 -03:00
Santiago Cézar
76203018e9
forgot the qrc
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-01 20:21:34 -03:00
flow
7956e6f04e
fix: don't use forward-declared Ptr types in meta/
...
This would cause ODR violations when those headers were included in
other places that also included stuff like "Version.h" (note the
"meta/Version.h"), which can cause problems, especially in LTO.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-01 19:48:26 -03:00
Santiago Cézar
668342b470
add rory flat too (and holiday variants)
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
Co-authored-by: Ashtaka <66513643+AshtakaOOf@users.noreply.github.com >
2022-11-01 19:31:37 -03:00
Santiago Cézar
0a0ce74105
add rory
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
Co-authored-by: Ashtaka <66513643+AshtakaOOf@users.noreply.github.com >
2022-11-01 19:06:27 -03:00
Sefa Eyeoglu
f6a3fa55b1
Merge pull request #368 from PrismLauncher/credits
2022-11-01 21:56:26 +01:00
txtsd
718a9a3559
change: Update credits
...
Replaces txtsd's GitHub link with their website
Moves DioEgizio and flowln from contributors to dev team
Signed-off-by: txtsd <code@ihavea.quest >
2022-11-02 01:20:58 +05:30
Sefa Eyeoglu
5485c5aaed
Merge pull request #365 from Scrumplex/fix-logo
2022-11-01 20:34:23 +01:00
Tayou
afcdf4b9cf
condensed icon theme code
...
Signed-off-by: Tayou <tayou@gmx.net >
2022-11-01 20:18:07 +01:00
Tayou
a3f5ea3598
added suggested changes
...
Signed-off-by: Tayou <tayou@gmx.net >
2022-11-01 20:17:53 +01:00
Tayou
fef60a9da0
add support for multiple custom themes
...
also moved theme related code from Application.cpp to new ui/themes/ThemeManager.cpp, this class should cleanly isolate theme related functions and help avoid code duplication in future theme related additions.
Themes can now be just qss or css files, they won't have color pallette information with them in that case
Signed-off-by: Tayou <tayou@gmx.net >
2022-11-01 20:10:12 +01:00
TheKodeToad
576867605d
Add another fallback
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-01 18:40:12 +00:00
TheKodeToad
d1626d20bd
Slight cleanup
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-01 18:30:11 +00:00
TheKodeToad
c890aa18f7
Only select correct mod
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-01 18:25:54 +00:00
TheKodeToad
6c7d040439
Hacky tweaks
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-01 18:12:27 +00:00
TheKodeToad
d03ae34b61
Auto-select first result
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-01 17:19:54 +00:00
TheKodeToad
b9547adce7
Add more license headers
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-01 17:02:24 +00:00
TheKodeToad
7f32c6464d
Initial better mod browser link implementation
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-11-01 16:58:22 +00:00
Rachel Powers
209a1650e4
clang_format and code cleanup
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-11-01 07:06:36 -07:00
Sefa Eyeoglu
b142e2a7a7
fix: fix logo name
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-01 13:59:11 +01:00
Rachel Powers
6010ce0dc5
chore(remove FS::copyFile):
...
Now that #333 is merged and FS::copy works on non directory copyFile can be removed.
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-11-01 04:28:57 -07:00
Rachel Powers
a7a331a26e
ensure FS::copyFile is marked for removal
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-11-01 04:24:11 -07:00
Rachel Powers
fda2c116be
code quality cleanup
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-11-01 04:24:11 -07:00
Rachel Powers
d2f3dbaa29
fix mispellings and wrap strings for translation
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-11-01 04:24:11 -07:00
Rachel Powers
e9d4793b1e
minor clean up and add some docs
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-11-01 04:24:11 -07:00
Rachel Powers
13c7efa058
copy found mods to instance (FTB and Flame)
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-11-01 04:24:11 -07:00
Rachel Powers
1598d65824
watch filesystem, compute and match hashes
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-11-01 04:24:11 -07:00
Rachel Powers
028e086960
send blocked mod info to dialog & prototype UI
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-11-01 04:24:11 -07:00
timoreo
04b39294ba
Merge pull request #333 from flowln/fix_atl_packs_post_modpack_update
2022-11-01 09:56:16 +01:00
timoreo
3a446c410c
Merge pull request #329 from flowln/only_safe_workarounds
2022-11-01 09:55:43 +01:00
DioEgizio
35edea2141
Merge pull request #359 from Chrono-byte/develop
2022-11-01 08:17:14 +01:00
Chrono
ce1a4857cc
Merge branch 'PrismLauncher:develop' into develop
2022-10-31 20:06:59 -04:00
Chrono
dfdf739282
remove one space
...
Signed-off-by: Chrono <me@disilla.org >
2022-10-31 19:44:55 -04:00
Sefa Eyeoglu
7086b1e65c
Merge pull request #351 from Scrumplex/fix-trash
2022-10-31 22:56:07 +01:00
Sefa Eyeoglu
f2d445d27b
fix: fix undo key sequence
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-31 11:34:48 +01:00
Sefa Eyeoglu
29d362a6e0
fix: do not trash instances in Flatpak
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-31 11:34:46 +01:00
DioEgizio
c8adc4e356
Merge pull request #354 from Scrumplex/translations-maybe
...
Improve display names of certain languages
2022-10-31 08:43:43 +01:00
Ryan Cao
8467daa0ec
oop
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-10-31 14:58:38 +08:00
DioEgizio
13e14b712e
Merge pull request #352 from TheLastRar/Win-setDarkWinTitlebar-10OrGreater
2022-10-31 07:51:13 +01:00
Ryan Cao
27dfe30fe6
Update VerifyJavaInstall.cpp
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-10-31 14:44:11 +08:00
flow
d89a541a8d
Merge pull request #353 from FayneAldan/accounts-consistency
2022-10-30 16:52:36 -07:00
Sefa Eyeoglu
42350e689d
chore: improve display names of certain languages
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-30 23:50:57 +01:00
Fayne Aldan
b7d5fee995
Change Profiles to Accounts for consistency
...
Signed-off-by: Fayne Aldan <FayneAldan@gmail.com >
2022-10-30 15:56:45 -06:00
TheLastRar
fd099166c6
Fix: Check if Windows 10 before calling setDarkWinTitlebar()
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-10-30 20:49:56 +00:00
Sefa Eyeoglu
b4be28b9bb
fix: fix disabled trash undo action
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-30 18:37:06 +01:00
Ryan Cao
19a8d51bf3
fix: more user friendly Java warning text
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-10-30 11:56:43 +08:00
Marcelo Hernandez
5d1aac3c53
added option to not copy screenshots
...
+ moved select all checkbox to top row, centered.
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com >
2022-10-29 22:27:31 -04:00
txtsd
87b0d3fe11
Merge pull request #342 from fn2006/prism-svg-fix
2022-10-30 01:51:14 +05:30
fn2006
98891a036d
use existing variables
...
Signed-off-by: fn2006 <usernamefn2006alreadyused@protonmail.com >
2022-10-29 17:35:37 +01:00
fn2006
b142a6da5b
fix hardcoded svg
...
Signed-off-by: fn2006 <usernamefn2006alreadyused@protonmail.com >
2022-10-29 16:42:37 +01:00
Sefa Eyeoglu
1c0139c5f4
Merge pull request #340 from PrismLauncher/repology
2022-10-29 16:16:12 +02:00
Sefa Eyeoglu
1b7ae4321d
Merge pull request #338 from Scrumplex/fix-credits-1
2022-10-29 16:15:34 +02:00
txtsd
7f991ed897
feat: Add Repology badge to README
...
Signed-off-by: txtsd <code@ihavea.quest >
2022-10-29 19:37:00 +05:30
Sefa Eyeoglu
5ed7eb9d53
chore: update credits
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-29 13:12:51 +02:00
Marcelo Hernandez
c00f96c7ca
create getters and setters for InstanceCopyPrefs
...
+ use pragma once like other .h files in this directory
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com >
2022-10-29 00:55:33 -04:00
flow
81333515e0
feat(tests): add test for FS::copy with files
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-28 20:55:25 -03:00
flow
be3c9abcfe
fix: copy single files too in FS::copy
...
eek
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-28 20:54:58 -03:00
Sefa Eyeoglu
177f17450a
Merge pull request #173 from Scrumplex/fix-icons
2022-10-29 00:35:48 +02:00
Sefa Eyeoglu
150a3adaaf
Merge pull request #267 from leo78913/toolbar-icons
2022-10-28 21:28:44 +02:00
leo78913
76146e0f17
add a flat white version of the launch icon
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-10-28 15:51:20 -03:00
leo78913
4500e345b3
Merge branch 'PrismLauncher:develop' into toolbar-icons
2022-10-28 15:46:02 -03:00
Sefa Eyeoglu
e885f3c26a
Merge pull request #65 from he3als/develop
2022-10-28 18:43:30 +02:00
flow
e6e92f2b0e
fix: only allow workarounds for blocked mods from MR when 100% safe
...
If a version on Modrinth has more than a single mod loader associated,
it means that it's possible we might get the wrong file for download,
since individual files don't really have this kind of metadata in the
API response.
So, in such cases, it's best to let the user take care of it instead.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-28 13:31:21 -03:00
Ryan Cao
03b48554b1
fix(style): convert tabs to spaces
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-10-29 00:01:22 +08:00
txtsd
f229574758
Merge pull request #322 from DioEgizio/64bit-it
2022-10-28 18:43:32 +05:30
Sefa Eyeoglu
7b446dd30f
Merge pull request #319 from Scrumplex/fix-avoid-mr-segfault
2022-10-28 13:40:52 +02:00
DioEgizio
a5be974f1a
feat: use clang64 on qt6 builds
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-10-28 08:05:31 +02:00
DioEgizio
952615eadb
Merge pull request #301 from DioEgizio/clang-attempt
...
feat(actions): use clang32 for building on windows
2022-10-28 07:54:17 +02:00
Sefa Eyeoglu
93894f62ff
fix: avoid segfault for unexpected API reponse
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-28 00:08:15 +02:00
Sefa Eyeoglu
2051de51b5
Merge pull request #318 from TheLastRar/manifest-platform
...
Fix: Don't specify x86 in manifest
2022-10-27 22:53:15 +02:00
Sefa Eyeoglu
2ba3de79d8
chore: add comment about copy bug
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-27 21:23:17 +02:00
DioEgizio
d35c985d2e
feat(actions): use clang32 for building on windows
...
*way* faster
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-10-27 21:23:17 +02:00
TheLastRar
b18466da84
Fix: Don't specify x86 in manifest
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-10-27 18:37:08 +01:00
flow
90714a93f3
Merge pull request #315 from AshtakaOOf/develop
...
Remove appveyor from README
2022-10-27 13:15:53 -03:00
Adrien
990cfb7b33
Remove appveyor
...
I forgor 💀
But seriously I forgor to remove the &logo=appveyor thing AAAAAH!!!
Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com >
2022-10-27 18:08:56 +02:00
Piper McCorkle
aacf7938ae
Add CI build for Snap
...
Signed-off-by: Piper McCorkle <contact@piperswe.me >
2022-10-26 09:25:58 -05:00
Piper McCorkle
2e0f818905
Add a snapcraft.yml for building Snaps
...
The included snapcraft.yml can be used to build a Snap (the application
format used by Canonical's modern package manager) out of Prism. If the
project wants in the future, Prism can publish these Snaps to the Snap
Store so the Prism Launcher can be installed through the Ubuntu Software
app on vanilla Ubuntu.
I haven't registered the Snap name, so it's currently free for anyone to
reserve. I'd suggest that a Prism developer register the name
prismlauncher at https://snapcraft.io/register-snap to ensure the name
belongs to the project, even if there are no plans of setting up CI to
publish snaps in the short term.
I have also modified JavaUtils.cpp to be able to autodetect the Java
versions included in the Snap, and added "*.snap" to the .gitignore so
the compiled Snap isn't accidentally committed to the repository.
Signed-off-by: Piper McCorkle <contact@piperswe.me >
2022-10-26 09:25:54 -05:00
Marcelo Hernandez
63b6c6685c
Abstract away InstanceCopyPrefs' internals through new getSelectedFiltersAsRegex() function
...
+ fix typo in comment
+ remove unused import
+ add [[nodiscard]] to methods
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com >
2022-10-26 00:20:36 -04:00
Adrien
610b971117
Improve a bit README.md ( #305 )
...
Add Open Collective and fix some stuff.
2022-10-25 21:09:45 -03:00
Sefa Eyeoglu
318f657c31
Merge pull request #231 from tobimori/patch-1
2022-10-25 20:15:31 +02:00
tobimori
482d3a1d76
update macos copyright year
...
Signed-off-by: tobimori <tobias@moeritz.cc >
2022-10-25 15:24:41 +02:00
DioEgizio
b516dd970f
Merge pull request #206 from flowln/changelog_height_fix
2022-10-25 11:29:14 +02:00
tobimori
d9463620e6
move .app rename to packaging process, update mac copyright string
...
Signed-off-by: tobimori <tobias@moeritz.cc >
2022-10-25 09:34:07 +02:00
Marcelo Hernandez
385c452ddf
remove checkBool function, add updateSelectAllCheckbox function
...
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com >
2022-10-24 20:49:40 -04:00
Marcelo Hernandez
a89df42561
Simplify bool check in CopyInstanceDialog.cpp
...
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com >
2022-10-24 19:31:40 -04:00
Sefa Eyeoglu
08cd5d52fa
Merge pull request #283 from flowln/fix_abort_on_autosearch
2022-10-24 23:00:02 +02:00
Sefa Eyeoglu
d0e668e1d8
Merge pull request #211 from Hibiii/show-instace-arg
2022-10-24 22:51:30 +02:00
Ryan Cao
eeb95f89e1
add .mrpack mime type
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-10-25 00:12:27 +08:00
flow
e4e0c27e1c
Merge pull request #281 from Scrumplex/fix-nsis-displayname
2022-10-24 11:09:23 -03:00
timoreo
6a5db12c6a
Apply some more suggestions from @flowln
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 15:00:33 +02:00
flow
b638a6ae95
fix: retry mod search job after aborting it
...
This way, we don't get stuck with an aborted job in our way! :o
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-24 09:09:24 -03:00
Sefa Eyeoglu
74b98af8e5
fix: use display name in NSIS
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-24 12:43:13 +02:00
Sefa Eyeoglu
6a474a0125
fix: update icon generate script
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-24 11:18:53 +02:00
Sefa Eyeoglu
224304813a
Merge pull request #274 from Protrikk/patch-1
2022-10-24 11:13:42 +02:00
timoreo
dcbd6cc1af
More Json:: everywhere !
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:28 +02:00
timoreo
a65f20a789
Fix a tiny formatting issue
...
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:28 +02:00
timoreo
86e3518430
Apply most of the suggestions from @flowln
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:28 +02:00
timoreo
89f1b60538
Delete out non-needed functions from SysInfo
...
Delete LaunchContext
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:28 +02:00
timoreo
dc84a61999
Added failed and aborted handlers
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:28 +02:00
timoreo
a902f29ccf
Changed to a temporary file
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:28 +02:00
timoreo
24dc154856
Add download button to more pages + UI fixes
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:27 +02:00
timoreo
68446c2a54
Obligatory formatting fix commit
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:27 +02:00
timoreo
f946964490
Regrab a few changes on SysInfo
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:27 +02:00
timoreo
53ddba8077
Made JavaDownloader a task and added some quick UI
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:27 +02:00
timoreo
54ad91c3b7
Anti-scrumped
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:27 +02:00
timoreo
89ce80b279
Fix Java downloader bugs + Add a test button in JavaPage
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:27 +02:00
timoreo
98a82cd484
Fix MMCZip bugs
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:27 +02:00
timoreo
a97387b692
Cherry-pick SysInfo from #680
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:26 +02:00
timoreo
9a4a92de4f
Clang format
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:26 +02:00
timoreo
3433c102b7
Remove old comment and change to piston-meta
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:26 +02:00
timoreo
f95856d062
Add the base of java downloading
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-10-24 08:02:18 +02:00
Marcelo Hernandez
4caf06bc99
Check "Select all" checkbox if all options are already selected
...
+ code cleanup
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com >
2022-10-23 19:30:41 -04:00
Marcelo Hernandez
15593b5c09
Add "Select all" checkbox + ui revamp + code cleanup
...
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com >
2022-10-23 19:30:41 -04:00
Marcelo Hernandez
e7e56eb1e3
add more options to copy instance dialog
...
- Copy game options, copy resource packs, copy shaders,
copy servers, and copy mods
- Also made a new InstanceCopyPrefs struct to store those
options rather than passing 7 different booleans into
InstanceCopyTask's constructor
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com >
2022-10-23 19:30:28 -04:00
leo78913
43bf601f12
add icons to the instance toolbar
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-10-23 20:04:19 -03:00
Trisave
d5109f024b
Better dark theme selection contrast
...
Tweak background of the selection background in order to make text more readable
Signed-off-by: Trisave <42098407+Protrikk@users.noreply.github.com >
2022-10-23 20:32:04 +02:00
flow
7f441f5b87
Merge pull request #228 from bensuperpc/change_cast
2022-10-23 14:28:33 -03:00
he3als
0aac85dda1
Replace tab with spaces in flat_white.qrc
...
Signed-off-by: he3als <65787561+he3als@users.noreply.github.com >
2022-10-23 14:35:33 +01:00
he3als
4777a45722
Fix new flat white icons
...
Signed-off-by: he3als <65787561+he3als@users.noreply.github.com >
2022-10-23 14:32:35 +01:00
Sefa Eyeoglu
29e6e170cc
Merge pull request #240 from jn64/fix/version-label-width
2022-10-23 02:07:29 +02:00
jn64
01db80d19a
Fix version labels width
...
Make labels fit to the contents, so Ibeam cursor doesn't appear
over empty space. Should have been done with 90025ed .
Signed-off-by: jn64 <23169302+jn64@users.noreply.github.com >
2022-10-23 03:35:23 +08:00
flow
8b28ed67ae
Merge pull request #234 from AliceDTRH/fix/dedupejava
2022-10-22 13:14:26 -03:00
Ryan Cao
f35a30d371
oops
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-10-22 23:47:53 +08:00
Ryan Cao
1a8de111a3
add linux support
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-10-22 23:46:53 +08:00
flow
9bb62e1bba
Merge pull request #233 from jamierocks/atl-fix-aborting-installs
2022-10-22 12:19:58 -03:00
AliceDTRH
b2789fef0f
Use correct variable for Windows
...
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com >
2022-10-22 17:19:34 +02:00
he3als
46fe7e77b3
DCO Remediation Commit for he3als <65787561+he3als@users.noreply.github.com>
...
I, he3als <65787561+he3als@users.noreply.github.com >, hereby add my Signed-off-by to this commit: d87f743a2b
I, he3als <65787561+he3als@users.noreply.github.com >, hereby add my Signed-off-by to this commit: 92dfd659f1
I, he3als <65787561+he3als@users.noreply.github.com >, hereby add my Signed-off-by to this commit: a6e65dfc7a
I, he3als <65787561+he3als@users.noreply.github.com >, hereby add my Signed-off-by to this commit: 99e1c13e80
Signed-off-by: he3als <65787561+he3als@users.noreply.github.com >
2022-10-22 16:14:50 +01:00
he3als
99e1c13e80
fix: add flat_white to code
2022-10-22 15:50:06 +01:00
he3als
a6e65dfc7a
Add new flat white icons
2022-10-22 15:40:39 +01:00
AliceDTRH
1471eddc7e
Deduplicates java installs before passing it on
...
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com >
2022-10-22 16:40:31 +02:00
he3als
89fd84d916
Merge branch 'PrismLauncher:develop' into develop
2022-10-22 15:30:40 +01:00
Jamie Mansfield
0e17eee096
ATLauncher: Fix pack installation always aborting
...
I made a mistake during when cherry picking a previous commit, this
applies the change - and fixes installing ATLauncher packs.
2022-10-22 15:22:30 +01:00
flow
81f1305270
Merge pull request #215 from forkiesassds/develop
2022-10-22 10:48:00 -03:00
Sefa Eyeoglu
2ec4310104
Merge pull request #230 from Scrumplex/add-pr-template
2022-10-22 15:32:00 +02:00
Sefa Eyeoglu
24e4db676a
Merge pull request #224 from jamierocks/atl-abort-close-optional-mods-dialog
2022-10-22 15:31:53 +02:00
Sefa Eyeoglu
6e21a9829d
Merge pull request #225 from Scrumplex/fix-segfault-fileresolver
2022-10-22 15:31:46 +02:00
flow
4e99e10cbd
Merge pull request #218 from getchoo/change-jars-path
2022-10-22 10:18:58 -03:00
Tobias Möritz
500a7eceab
update macOS build process to work with new .app
...
Signed-off-by: Tobias Möritz <tobias@moeritz.cc >
2022-10-22 15:10:32 +02:00
Tobias Möritz
1dad35ca76
update macos plist contents ( fixes #132 )
...
Signed-off-by: Tobias Möritz <tobias@moeritz.cc >
2022-10-22 15:00:52 +02:00
Sefa Eyeoglu
8b3093e758
chore: add PR template
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-22 14:59:57 +02:00
Ryan Cao
a406aeb3ea
feat: register as zip/mrpack handler on macOS
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-10-22 20:51:46 +08:00
Sefa Eyeoglu
970e4b020e
fix: fix segfault when resolving Flame resources
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-22 14:11:51 +02:00
Jamie Mansfield
a4f4f2891c
DCO Remediation Commit for a6b13487
...
I, Jamie Mansfield <jmansfield@cadixdev.org >, hereby add my
Signed-off-by to this commit: a6b13487f0
Signed-off-by: Jamie Mansfield <jmansfield@cadixdev.org >
2022-10-22 12:58:56 +01:00
Jamie Mansfield
a6b13487f0
ATLauncher: Abort install if optional mods dialog is closed
...
This matches the behaviour of ATLauncher.
2022-10-22 12:35:34 +01:00
Bensuperpc
56ae4e5b6a
Change old style cast to C++ cast
...
Change old style cast to C++ cast
Signed-off-by: Bensuperpc <bensuperpc@gmail.com >
2022-10-22 13:04:48 +02:00
Sefa Eyeoglu
54c26b05fa
Merge pull request #185 from flowln/fix_blocked_mods_crash
2022-10-22 12:44:20 +02:00
Sefa Eyeoglu
bd376d5217
Merge pull request #203 from Scrumplex/fix-dont-build-renove-branches
...
Don't build renovate branches
2022-10-22 10:59:49 +02:00
seth
2592c69021
semicolon fail
...
i was off by one key :(
Signed-off-by: seth <getchoo@tuta.io >
2022-10-21 21:40:21 -04:00
seth
4a2b25e841
fix: use correct variable for jars path
...
Signed-off-by: seth <getchoo@tuta.io >
2022-10-21 21:40:21 -04:00
seth
ba4af1a890
fix: make jars path specific to prism
...
Signed-off-by: seth <getchoo@tuta.io >
2022-10-21 21:40:20 -04:00
forkiesassds
9b17cde019
CurseForge modpack page improvements
...
Signed-off-by: forkiesassds <icanttellyou@memeware.net >
2022-10-22 01:20:08 +03:00
flow
7a8c963722
Merge pull request #147 from Minion3665/enhancement/update-nix-derivation
2022-10-21 19:04:35 -03:00
Hibi
82d1dbf173
DCO Remediation Commit for Hibi <69405847+Hibiii@users.noreply.github.com>
...
I, Hibi <69405847+Hibiii@users.noreply.github.com >, hereby add my Signed-off-by to this commit: 1288b92615
I, Hibi <69405847+Hibiii@users.noreply.github.com >, hereby add my Signed-off-by to this commit: 5b75869c0b
Signed-off-by: Hibi <69405847+Hibiii@users.noreply.github.com >
2022-10-21 17:59:35 -03:00
Sefa Eyeoglu
aefb8b353e
Merge pull request #187 from leo78913/menu-icons
2022-10-21 22:39:35 +02:00
Hibi
5b75869c0b
Add --show to manual page
2022-10-21 16:10:03 -03:00
Hibi
1288b92615
Add argument to show instance window
2022-10-21 15:40:28 -03:00
flow
7eecf454e8
fix: remove max height logic for mod update changelogs
...
It's not worth it to keep this, it's just a heuristic that fails from
time to time.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-21 14:07:43 -03:00
leo78913
ccf7d1e0c4
material design icons
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-10-21 14:04:04 -03:00
leo78913
e4b5cd23e6
the trashcan icons dont look like trash now
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-10-21 13:49:31 -03:00
txtsd
819296cc9c
Merge pull request #198 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x
2022-10-21 22:13:09 +05:30
txtsd
67c7d80f41
Merge pull request #197 from PrismLauncher/renovate/actions-cache-3.x
2022-10-21 22:12:48 +05:30
Sefa Eyeoglu
919f8c54d7
fix: don't build renovate branches
...
They will be built using the pull_requests event anyway.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-21 17:42:39 +02:00
Sefa Eyeoglu
cbaf71f581
Merge pull request #201 from Scrumplex/add-netlify-sponsor
2022-10-21 17:37:18 +02:00
Sefa Eyeoglu
f118c602e6
Merge pull request #202 from Heath123/patch-1
2022-10-21 17:37:09 +02:00
circuit10
ff2f40f5e1
Fix typo
...
Signed-off-by: circuit10 <heath.mitchell27@gmail.com >
2022-10-21 16:28:04 +01:00
Sefa Eyeoglu
9758c9b2a2
chore: add Netlify as sponsor
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-21 17:04:21 +02:00
renovate[bot]
09e4e100a2
chore(deps): update hendrikmuhs/ccache-action action to v1.2.3
2022-10-21 14:55:49 +00:00
renovate[bot]
bdd5c180d3
chore(deps): update actions/cache action to v3.0.11
2022-10-21 14:55:42 +00:00
DioEgizio
749b085063
Merge pull request #196 from PrismLauncher/renovate/configure
2022-10-21 16:55:17 +02:00
renovate[bot]
c5a796ad8e
chore(deps): add renovate.json
2022-10-21 14:43:02 +00:00
Sefa Eyeoglu
12d8409e65
Merge pull request #39 from Sebbl0508/mod_dialog_fontsize
2022-10-21 15:25:28 +02:00
leo78913
8db89b4cfb
Merge branch 'PrismLauncher:develop' into menu-icons
2022-10-20 17:54:43 -03:00
leo78913
31dc92dafe
add icons to the instance menu and 4 new icons:
...
delete
rename
tag
export
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-10-20 17:48:57 -03:00
flow
01b90809e8
fix: memory leak when finishing blocked mods job
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-20 16:55:22 -03:00
flow
0a7383a4e1
fix: hide ProgressDialog when failing/succeeding tasks
...
WHY IS QT LIKE THAT AAAAAAAA
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-20 16:54:39 -03:00
Sefa Eyeoglu
5e86a34925
Merge pull request #184 from Chrono-byte/develop
2022-10-20 21:52:24 +02:00
Chrono-byte
ece206b81c
Remove erroneous space
...
Signed-off-by: Chrono-byte <me@disilla.org >
2022-10-20 15:22:04 -04:00
Chrono-byte
88341b923a
fix contributor notices in AboutDialog.cpp for license compliance
...
Signed-off-by: Chrono-byte <me@disilla.org >
2022-10-20 15:14:26 -04:00
flow
5d27633821
fix: show a single line in ProjectItem's desc. when there's no more space
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-20 15:03:46 -03:00
DioEgizio
a9d4370ad4
Merge pull request #47 from TheOPtimal/develop
2022-10-20 10:01:46 +02:00
Sefa Eyeoglu
8a0318c779
Merge pull request #119 from Scrumplex/update-readme-sponsors
2022-10-20 09:59:00 +02:00
Sefa Eyeoglu
8e754d9a56
fix: update README
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-20 09:54:23 +02:00
Sefa Eyeoglu
0e209dcb02
Merge pull request #148 from ZombieNub/prismlauncher-rename
2022-10-20 09:44:25 +02:00
Zeke
6f2d6425a2
update meta to not break flatpak
...
Signed-off-by: Zeke <ezekielsmith@protonmail.com >
2022-10-20 16:54:57 +10:00
Sebastian Rueth
b46c4a81e0
check space requirements of project description
...
if there isn't enough space for 2 lines of project description, only
draw one
Signed-off-by: Sebastian Rueth <sebastian.rueth@protonmail.com >
2022-10-20 08:02:05 +02:00
TheOPtimal
b6aa33f3a6
Add Matrix Room
...
Co-authored-by: Fayne Aldan <FayneAldan@gmail.com >
Signed-off-by: TheOPtimal <41379516+TheOPtimal@users.noreply.github.com >
Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com >
2022-10-20 09:13:37 +04:00
TheOPtimal
ab68d9198d
PrismLauncher → Prism Launcher (again)
...
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
Signed-off-by: TheOPtimal <41379516+TheOPtimal@users.noreply.github.com >
Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com >
2022-10-20 09:13:37 +04:00
TheOPtimal
32eebd3ca7
PrismLauncher → Prism Launcher
...
Co-authored-by: Fayne Aldan <FayneAldan@gmail.com >
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
Signed-off-by: TheOPtimal <41379516+TheOPtimal@users.noreply.github.com >
Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com >
2022-10-20 09:13:37 +04:00
TheOPtimal
3f2e5633b4
Add OpenCollective
...
Co-authored-by: Fayne Aldan <FayneAldan@gmail.com >
Signed-off-by: TheOPtimal <41379516+TheOPtimal@users.noreply.github.com >
Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com >
2022-10-20 09:13:37 +04:00
Jacob Gogichaishvili
a99b9e80b8
Remove PolyMC's OpenCollective
...
Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com >
2022-10-20 09:13:37 +04:00
Jacob Gogichaishvili
42ed7e4626
Remove Matrix room link until one is created
...
Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com >
2022-10-20 09:13:37 +04:00
Jacob Gogichaishvili
ae910eea62
Change issue templates to Prism branding
...
Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com >
2022-10-20 09:13:37 +04:00
flow
d35920f356
Merge pull request #123 from MMK21Hub/patch-1
2022-10-19 22:00:23 -03:00
IroncladLandship
c29e7477f0
Merge branch 'develop' into prismlauncher-rename
...
Signed-off-by: IroncladLandship <jack.huffstutler@gmail.com >
2022-10-19 19:21:08 -05:00
flow
86bbc7939c
Merge pull request #100 from TheEvilSkeleton/improve-approachability
2022-10-19 21:15:37 -03:00
Skyler Grey
dab091a7b7
Update NIX.md so it has more methods + is clearer
...
- Add proper headings
- Change flake codeblocks so that configuration stuff isn't in the same
place as flake.nix stuff
- Add instructions for not using the overlay with flakes
- Add instructions for running ad-hoc with flakes
Signed-off-by: Skyler Grey <skyler3665@gmail.com >
2022-10-19 23:50:48 +01:00
Skyler Grey
513d93cfc7
Change the derivation to have parity with nixpkgs
...
- Symlink rather than copying libraries
- Update maintainers
- Reformat with nixpkgs-fmt
Signed-off-by: Skyler Grey <skyler3665@gmail.com >
2022-10-19 23:48:56 +01:00
Jackson Huffstutler
d7478c14fd
Renamed inappropriate instances of "PrismLauncher" to "Prism Launcher"
...
Signed-off-by: IroncladLandship <jack.huffstutler@gmail.com >
2022-10-19 16:03:18 -05:00
TheEvilSkeleton
297c593edd
Improve approachability
...
Signed-off-by: TheEvilSkeleton <theevilskeleton@riseup.net >
2022-10-19 15:10:35 -04:00
MMK21Hub
6439ef11aa
Fix incorrect release titles
...
Signed-off-by: MMK21Hub <KAGfan2018@outlook.com >
2022-10-19 19:21:48 +01:00
flow
d6479e133d
fix: properly center project descriptions
...
In particular, this takes into account the space used by the title, so
(hopefully) there won't be problems with custom themes with that.
Signed-off-by: flow <flowlnlnln@gmail.com >
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: Sebastian Rüth <sebastian.rueth@protonmail.com >
2022-10-19 20:12:50 +02:00
Sebastian Rüth
50bbf2aacc
fix text clipping
...
Signed-off-by: Sebastian Rüth <sebastian.rueth@protonmail.com >
2022-10-19 20:12:50 +02:00
Sefa Eyeoglu
41032aaac2
Merge pull request #110 from Scrumplex/fix-nsis-shortcut
2022-10-19 14:28:36 +02:00
Sefa Eyeoglu
4e08f28246
Merge pull request #31 from flowln/who_needs_webview
2022-10-19 14:28:29 +02:00
Sefa Eyeoglu
46c57e120f
Merge pull request #27 from flowln/ftb_install_improve
2022-10-19 13:51:35 +02:00
Sefa Eyeoglu
6b52ee61ae
Merge pull request #92 from Scrumplex/new-logo
2022-10-19 13:41:56 +02:00
Sefa Eyeoglu
61fbc5a791
refactor: replace with new logo
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-19 13:08:23 +02:00
Sefa Eyeoglu
22365205f9
fix: use display name for NSIS
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-19 12:17:06 +02:00
DioEgizio
c6515c1dad
Merge pull request #54 from Samisafool/develop
2022-10-19 12:13:13 +02:00
Samisafool
8201d1df02
Rename
...
Signed-off-by: Samisafool <thenerdiestguy@gmail.com >
2022-10-19 15:02:43 +05:30
timoreo
ddf168c536
Merge pull request #75 from Gideon9212/develop
2022-10-19 06:27:09 +02:00
Gideon9212
c9f81f56e9
Fix banner
...
Removed boosted URL for plain
Signed-off-by: Gideon9212 <gideon_gallagher@zoho.com >
2022-10-18 18:35:03 -07:00
Gideon9212
570264e1e9
Merge branch 'develop' into develop
...
Signed-off-by: Gideon9212 <gideon_gallagher@zoho.com >
2022-10-18 17:28:42 -07:00
flow
325e58d98c
Merge pull request #88 from FayneAldan/multimc-fallback
...
go all the way up the fork chain!
2022-10-18 19:27:24 -03:00
flow
23a2960aa3
Merge pull request #60 from jitterdev/develop
2022-10-18 18:53:30 -03:00
Fayne Aldan
888a87463e
Add fallback for multimc.cfg
...
Signed-off-by: Fayne Aldan <FayneAldan@gmail.com >
2022-10-18 14:40:34 -06:00
Sefa Eyeoglu
2ebaf46095
Merge pull request #82 from flowln/i_broke_something_again
2022-10-18 22:15:08 +02:00
flow
3a95a3b7c1
fix: don't take item from a possibly empty list
...
The list gets destroyed when we take the last object, so things explode.
😔
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-18 16:51:42 -03:00
Gideon9212
c4edffb388
Update banner
...
Changed to Join instead of Support server.
Signed-off-by: Gideon9212 <gideon_gallagher@zoho.com >
2022-10-18 12:10:29 -07:00
Gideon9212
5eec7cc788
Change discord invite to a banner
...
To help direct people to support with a big banner.
Signed-off-by: Gideon9212 <gideon_gallagher@zoho.com >
2022-10-18 11:40:23 -07:00
DioEgizio
fb4cf0b75d
Merge pull request #55 from flowln/config_add_fallback
2022-10-18 19:50:34 +02:00
Sefa Eyeoglu
5584884fe6
Merge pull request #68 from nightsnowlinouo/develop
2022-10-18 19:43:02 +02:00
Sefa Eyeoglu
3bb1068ef0
Merge pull request #59 from CutestNekoAqua/bug-35
2022-10-18 19:26:57 +02:00
雪鈴 SnowLin
b1b85313ae
Fix hosted weblate translation website URL
...
Signed-off-by: 雪鈴 SnowLin <113241163+nightsnowlinouo@users.noreply.github.com >
2022-10-19 01:22:58 +08:00
he3als
92dfd659f1
Fix .QRC file for flat white icons
2022-10-18 17:54:26 +01:00
he3als
d87f743a2b
Add flat white icons
...
This is mainly for dark mode users, as I think that the regular colour of the flat icons do not look good with dark mode.
2022-10-18 17:49:35 +01:00
Jitter
aec3e7b0fc
correct non-proper noun
...
Signed-off-by: Jitter <64605731+jitterdev@users.noreply.github.com >
2022-10-18 11:14:27 -05:00
Sefa Eyeoglu
243600b75b
Merge pull request #61 from pog5/develop
2022-10-18 18:03:34 +02:00
Nightly
3d89d126d0
PlaceholderMC => PrismLauncher
...
Small Correction
Signed-off-by: Nightly <62222436+pog5@users.noreply.github.com >
2022-10-18 15:52:32 +00:00
Jitter
54281e53a1
Update README.md
...
Signed-off-by: Jitter <64605731+jitterdev@users.noreply.github.com >
2022-10-18 10:35:00 -05:00
Jitter
6befd2be81
Update README.md
...
Signed-off-by: Jitter <64605731+jitterdev@users.noreply.github.com >
2022-10-18 10:34:27 -05:00
Jitter
1f0ca9ed92
Update README.md
...
Signed-off-by: Jitter <64605731+jitterdev@users.noreply.github.com >
2022-10-18 10:34:11 -05:00
Sefa Eyeoglu
f3db9c3920
Merge pull request #48 from flowln/fix_nbt
2022-10-18 17:31:46 +02:00
Cleo John
83ceb26151
Streamline Button changes to improve source readability.
2022-10-18 17:28:23 +02:00
flow
32cdfb871c
fix: add fallback for polymc.cfg
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-18 12:22:42 -03:00
flow
801e7da5ee
feat: allow specifying fallbacks to INI files
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-18 12:22:42 -03:00
flow
2cf1ab7ec5
Merge pull request #43 from SSUPII/develop
2022-10-18 11:31:38 -03:00
Sefa Eyeoglu
d049c1afaf
chore: update flake
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-18 16:28:30 +02:00
flow
9f45389bc1
Merge pull request #45 from NotNite/update-readme
2022-10-18 11:23:10 -03:00
flow
d875481969
fix: update libnbtplusplus submodule's URL
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-18 11:11:34 -03:00
Sergio
17a1e1245c
Updated HTML tags to Markdown
...
Signed-off-by: Sergio <42090377+SSUPII@users.noreply.github.com >
2022-10-18 16:04:28 +02:00
Sergio
06d28c3eec
Updated project naming
...
Signed-off-by: Sergio <42090377+SSUPII@users.noreply.github.com >
2022-10-18 15:57:43 +02:00
NotNite
684982c25c
README: PlaceholderMC -> Prism Launcher
...
Also cleaned it up a bit to make my Markdown linter happy.
2022-10-18 09:52:36 -04:00
Sergio
421522a61a
Added further clarifications
...
Signed-off-by: Sergio <42090377+SSUPII@users.noreply.github.com >
2022-10-18 15:52:00 +02:00
Sergio
f3b29d67f4
Merge branch 'PrismLauncher:develop' into develop
2022-10-18 15:39:29 +02:00
Sergio
2ee5c6b2a1
Totally skipped a typo
...
Signed-off-by: Sergio <42090377+SSUPII@users.noreply.github.com >
2022-10-18 15:38:32 +02:00
Sergio
5083772c6f
Fixed markdown errors
...
Signed-off-by: Sergio <42090377+SSUPII@users.noreply.github.com >
2022-10-18 15:37:11 +02:00
Sergio
fd51e5df47
Added build instructions for Linux
...
Added build instructions in the main repository as a temporary reference
Signed-off-by: Sergio <42090377+SSUPII@users.noreply.github.com >
2022-10-18 15:35:40 +02:00
Sefa Eyeoglu
3405fd91c6
Merge pull request #33 from DioEgizio/remove-useless-actions
2022-10-18 15:31:32 +02:00
DioEgizio
194822f11e
Merge pull request #28 from flowln/fix_copy
2022-10-18 15:27:53 +02:00
Sefa Eyeoglu
98963d4cdf
Merge pull request #29 from Scrumplex/feat-clear-metadata
2022-10-18 15:25:56 +02:00
DioEgizio
804ef36b20
Merge pull request #26 from Scrumplex/armhf
2022-10-18 15:24:33 +02:00
Sefa Eyeoglu
3c6ff8fddf
Merge pull request #36 from DioEgizio/fix-copying
2022-10-18 15:05:31 +02:00
DioEgizio
511893d535
update COPYING
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-10-18 14:47:20 +02:00
DioEgizio
e05fe77bfe
feat: remove redundant actions from instance toolbar and redundant "instance"s
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-10-18 14:43:29 +02:00
DioEgizio
2b7b9a2abb
Merge pull request #25 from PlaceholderMC/fix-data-path
...
Fix Data path
2022-10-18 14:05:22 +02:00
Sefa Eyeoglu
6db3f68ae1
refactor: use correct data path
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-18 13:58:50 +02:00
timoreo
3773f2e7a5
Merge pull request #23 from PlaceholderMC/new-cf-key
2022-10-18 13:29:36 +02:00
Sefa Eyeoglu
1f8bffc15a
fix: new CurseForge key
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-18 13:24:57 +02:00
Sefa Eyeoglu
afaef4e83b
Merge pull request #13 from PlaceholderMC/rebrand
2022-10-18 13:05:24 +02:00
Sefa Eyeoglu
b746f723cb
fix: add Prism copyright header
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-18 13:01:32 +02:00
Sefa Eyeoglu
cfaf44f57b
fix: add sparkle public key
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-18 12:49:08 +02:00
Sefa Eyeoglu
eed541201e
fix: add new MSA client id
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-18 10:37:35 +02:00
Sefa Eyeoglu
a8bcb85f7b
fix(actions): change to PrismLauncher
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-18 10:13:44 +02:00
txtsd
981e9cf290
Merge pull request #14 from leumasme/develop
2022-10-18 13:27:10 +05:30
Sefa Eyeoglu
3ac398ac49
fix: use display name in code
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-18 09:50:27 +02:00
Temm
2d0728395f
Update README.md discord vanity link
2022-10-18 09:44:50 +02:00
Sefa Eyeoglu
722194405a
refactor: initial rebrand
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-18 09:37:59 +02:00
cozyGalvinism
0868a5e534
Merge pull request #11 from AshtakaOOf/temp-readme
...
More readable README.md :)
2022-10-18 01:42:54 +02:00
Adrien
a86b9c82ce
Update README.md
...
Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com >
2022-10-18 01:38:49 +02:00
Adrien
f8642548c8
Update README.md
...
Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com >
2022-10-18 01:35:30 +02:00
Adrien
27873f7ed4
Update README.md
...
Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com >
2022-10-18 01:27:51 +02:00
cozyGalvinism
b3eda6bcbb
Merge pull request #5 from AshtakaOOf/AshtakaOOf-readme
...
Temporary README.md
2022-10-17 23:08:21 +02:00
Adrien
1c7799e292
Update README.md
...
Change some stuff temporarily
Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com >
2022-10-17 22:53:02 +02:00
flow
aecd158d3c
Merge pull request #1208 from DioEgizio/fix-unused-libs
...
Removes `classparser` and `xz-embedded`
2022-10-16 10:41:43 -03:00
DioEgizio
87d35f0d16
fix: remove some unused libs
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-10-15 20:16:15 +02:00
Sefa Eyeoglu
c089f9b59f
Merge pull request #1203 from DioEgizio/macos-legacy
2022-10-15 15:24:30 +02:00
flow
82d7f9f5a4
chore(tests): add test for FS copy with dot folders/files
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-15 09:40:00 -03:00
flow
8bc529be3d
fix: include hidden files when copying instances
...
fixes instance ccopy on linux .-.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-15 09:20:31 -03:00
Sefa Eyeoglu
924c1634d3
Merge pull request #1194 from flowln/fix_opted_out_on_any_filter
2022-10-15 13:18:35 +02:00
Sefa Eyeoglu
03d077e915
fix(nix): add ghc_filesystem dependency
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-15 13:13:56 +02:00
Sefa Eyeoglu
303628bb05
refactor: support system ghc-filesystem
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-15 13:13:38 +02:00
Sefa Eyeoglu
3b92ec8e82
chore: clang-format RuntimeContext
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-15 12:43:15 +02:00
Sefa Eyeoglu
545944cb0d
refactor: support armhf
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-15 12:41:16 +02:00
flow
c90a88b6b6
fix: correct ftb legacy too
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-14 12:18:06 -03:00
DioEgizio
89e45a61b3
fix: workaround ghc::filesystem bug
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-10-14 16:45:13 +02:00
DioEgizio
2aff7bac4a
fix: disable updater on macOS-Legacy
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-10-14 15:58:16 +02:00
flow
124097d3a5
feat!: use ghc/filesystem in place of std's one if needed
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-14 14:08:48 +02:00
flow
c520faed6d
feat: add gulrak/filesystem submodule
...
... for old macs that don't have std::filesystem in their stdlib.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-14 14:08:42 +02:00
DioEgizio
5bdb3703ed
fix: stop forcing libc++ on macOS
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-10-14 14:08:05 +02:00
DioEgizio
2901039a48
feat(actions): macOS-Legacy package
...
still no updater part though
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-10-14 14:08:05 +02:00
flow
dfa220ef02
fix: issues with aborts (again)
...
i hate it
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-13 15:10:35 -03:00
flow
f26be00571
fix: abort search if we're already trying to download a pack
...
Meaning we don't have to wait for the searches to finish in the
background to finally start the modpack download, when we have already
selected it -_-
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-13 13:49:06 -03:00
flow
83654a193e
refactor+fix: Make FTB install task similar to other install tasks
...
In particular, this changes the order so that the instance gets created
before downloading the mods (like other install tasks), and the mod download
directly puts the files in the staging folder (like the others), instead
of that weird makeCached and copy stuff.
This fixes some issues with modpack downloads from FTB, like creating an
instance with no mods in it.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-13 13:27:52 -03:00
flow
b2a5d8daf4
fix: don't include opted out versions with the 'Any' filter on the MD
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-12 10:26:14 -03:00
flow
19ee736e1d
Merge pull request #1190 from TayouVR/merged-launch-button1
2022-10-11 16:21:41 -03:00
flow
fda3f1352e
feat: add image support for the news reader :^)
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-11 16:11:08 -03:00
flow
d194b02e28
fix: prevent images overriding content when changing pages
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-11 15:51:54 -03:00
Tayou
aaba99dc10
Update launcher/ui/MainWindow.cpp
...
make " Offline" string for profilers translatable
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com >
2022-10-11 14:58:34 +02:00
Tayou
93a2e0f777
Merge Launch Buttons
...
Signed-off-by: Tayou <tayou@gmx.net >
2022-10-10 23:23:06 +02:00
Sefa Eyeoglu
71f3c6b461
feat: add clear metadata action
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-10 12:48:25 +02:00
Sefa Eyeoglu
aabcca5059
Merge pull request #1175 from Ozynt/patch-1
2022-10-09 20:20:05 +02:00
Ozynt
7e67fd8c79
Update LaunchController.cpp
...
Signed-off-by: Ozynt <104643560+Ozynt@users.noreply.github.com >
2022-10-09 13:20:50 +02:00
Ozynt
fecf1ffcb9
Update LaunchController.cpp
...
Signed-off-by: Ozynt <104643560+Ozynt@users.noreply.github.com >
2022-10-09 13:19:38 +02:00
Sefa Eyeoglu
fafc9cf9ca
Merge pull request #1033 from Scrumplex/multi-arch-support
2022-10-08 20:12:40 +02:00
Sefa Eyeoglu
3111e6a721
chore: add missing license headers
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-08 20:12:07 +02:00
flow
e436f471a0
Merge pull request #1177 from DioEgizio/codeql
...
bye LGTM 👋
2022-10-08 15:04:23 -03:00
flow
28f84902f6
Merge pull request #1185 from DioEgizio/fix-tooltip
...
Fix outdated 'Disable mod metadata' button's warning message.
2022-10-08 14:34:59 -03:00
Trisave
ebee50eedc
Improve default light and dark themes ( #1174 )
2022-10-08 14:33:24 -03:00
flow
e0ef09dfe1
Merge pull request #1183 from Scrumplex/fix-capabilities-first-run
2022-10-08 14:29:14 -03:00
flow
d7992ab29d
feat: add image support for FTB packs
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-08 14:12:05 -03:00
flow
60f19f305e
feat: add image support for modrinth modpack pages
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-08 14:12:03 -03:00
flow
d99976f5d7
fix: make mod and modpack caches separate for Modrinth
...
This makes it similar to CF mods / modpacks. The mods cache is
maintained with the same name because it most likely has more data it
in, so this commit will affect existing caches as minimally as possible.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-08 14:11:20 -03:00
flow
db158a5735
feat: add image support for mod pages
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-08 14:11:20 -03:00
flow
ea3be17220
feat: add widget for a text browser with image support
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-08 14:11:20 -03:00
DioEgizio
f26049009e
fix: mod updating isn't upcoming anymore :p
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-10-08 16:20:46 +02:00
Sefa Eyeoglu
787234a53a
Merge pull request #1163 from flowln/fix_list_icons
2022-10-08 12:12:38 +02:00
Sefa Eyeoglu
fc3a64056c
Merge pull request #1154 from Scrumplex/epic-formatting-codes
2022-10-08 12:12:26 +02:00
Sefa Eyeoglu
6ebc9abb80
fix: update capabilities before first-run wizard
...
On first run, the condition for the wizard would return, before running
updateCapabilities(). This moves that call up, as its only dependency is
the settings system.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-06 14:46:13 +02:00
DioEgizio
80e9eed35a
fix: remove old unused lgtm.yml, exclude cpp/fixme-comment
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-10-04 16:17:57 +02:00
DioEgizio
23b3990f99
feat(code scanning): enable security-and-quality query
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-10-04 16:17:57 +02:00
DioEgizio
41276403df
feat(actions): add codeql code scanning
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-10-04 16:17:57 +02:00
Sefa Eyeoglu
e3e9e39498
Merge pull request #1171 from vedantmgoyal2009/patch-1
2022-10-02 15:08:59 +02:00
txtsd
f315025a8d
Merge pull request #1167 from Scrumplex/epic-commandline
2022-10-02 00:41:34 +05:30
stoltsvensk
8e43d97133
Microsoft account only
...
Signed-off-by: stoltsvensk <104643560+stoltsvensk@users.noreply.github.com >
2022-10-01 16:47:23 +02:00
flow
c97a47dc62
Merge pull request #1172 from Scrumplex/fix-includes
2022-09-30 18:08:45 -03:00
Sefa Eyeoglu
7ccafdc993
fix: add missing includes to fix Qt 6.4 build
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-30 19:56:01 +02:00
Sefa Eyeoglu
0dca9cb6b8
Merge pull request #1162 from Trial97/feature/Replace-toml-library
2022-09-30 19:44:45 +02:00
Vedant
be3d780720
Update winget.yml
...
Signed-off-by: Vedant <83997633+vedantmgoyal2009@users.noreply.github.com >
2022-09-30 22:51:47 +05:30
Sefa Eyeoglu
0f59a1dde1
fix(nix): add tomlplusplus
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-26 15:42:45 +02:00
Sefa Eyeoglu
7c6bb80cee
fix: move toml++ find call
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-26 13:46:01 +02:00
Sefa Eyeoglu
62841c5b23
fix: pin tomlplusplus to latest release
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-26 13:44:28 +02:00
Sefa Eyeoglu
aad4f8d1f7
fix: update Git modules
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-26 13:44:28 +02:00
Sefa Eyeoglu
11c44c676c
fix: remove unused MACOS_HINT
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-26 13:28:46 +02:00
flow
370c3aa598
Merge pull request #894 from flowln/update_from_external_source
...
epic PR
2022-09-26 08:25:12 -03:00
Sefa Eyeoglu
1cdadafdf8
refactor: use QCommandLineParser instead
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-26 13:21:27 +02:00
timoreo
dd6f670dec
fix: Fixed memory leak
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-09-26 11:50:55 +02:00
timoreo
9ff364b0d3
huge nit: added const refs, everywhere
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-09-26 11:50:31 +02:00
Sefa Eyeoglu
58a5331f7b
Merge pull request #1164 from Scrumplex/fix-sort-languages
2022-09-25 19:50:55 +02:00
Alexandru Ionut Tripon
ed261f0af9
Update launcher/minecraft/mod/tasks/LocalModParseTask.cpp
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2022-09-25 20:38:55 +03:00
flow
c01b475cbf
Merge pull request #1165 from ErogigGit/develop
2022-09-25 09:33:29 -03:00
ErogigGit
3d4feeec8d
DCO Remediation Commit for ErogigGit <eric.hagerstrand@gmail.com>
...
I, ErogigGit <eric.hagerstrand@gmail.com >, hereby add my Signed-off-by to this commit: 8a4f1c66f8
Signed-off-by: ErogigGit <eric.hagerstrand@gmail.com >
2022-09-24 23:31:30 +02:00
Trial97
a1800ec23f
Prefer the system tomlplusplus
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2022-09-25 00:20:01 +03:00
ErogigGit
8a4f1c66f8
Allow double clicking to mark for dowload
...
Signed-off-by: Erogig <erogigabyte@gmail.com >
2022-09-24 22:37:51 +02:00
Sefa Eyeoglu
b187231b0e
fix: sort languages by their name instead of key
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-24 11:53:41 +02:00
Sefa Eyeoglu
60b38de69f
fix: fallback for languages without a native name
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-24 11:48:33 +02:00
Trial97
600c49f7f0
Replaced tomlc99 with tomlplusplus
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2022-09-24 00:10:27 +03:00
flow
e7380e70a3
fix: use placeholder icon when the project has no icon in MR
...
Projects with no icon return a null icon URL in Modrinth's API.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-23 18:05:58 -03:00
flow
3df8594f19
feat: change project item delegate for modrinth modpacks
...
more info! \ ^-^/
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-23 16:59:40 -03:00
flow
ee4a829293
fix: remove manual icon resize in ModModel
...
THis fixes a FIXME, now that we fixed the issue :o
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-23 16:59:40 -03:00
flow
1862f3c124
fix: set icon sizes correctly in ProjectItemDelegate
...
no more dumb hacks with icons!!
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-23 16:59:40 -03:00
Sefa Eyeoglu
777ab3416f
feat: also format resource/texture pack names
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-21 15:00:28 +02:00
Sefa Eyeoglu
ecf5ab75e7
feat: support more formatting codes
...
also fix some crashes
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-21 14:59:01 +02:00
flow
4f6d964217
fix: don't change groups when updating an instance
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:10 -03:00
flow
06019f01e3
feat: add dialog to ask whether to chaneg instance's name
...
This prevents custom names from being lost when updating, by only
changing the name if the old instance name constains the old version,
so that we can update it if the user whishes to.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:10 -03:00
flow
ddde885084
fix: show warning in case there's no old index when updating
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:10 -03:00
flow
be8c6f218c
refactor: setAbortStatus -> setAbortable
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:10 -03:00
flow
9eb35ea7c8
fix: don't load specific settings for managed pack info
...
This avoids loading all settings for all instances when searching for
one with a specific managed pack name.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:10 -03:00
flow
d2fdbec41d
fix: move file deletion to the end of the instance update
...
This makes it harder for problems in the updating process to affect the
current instance. Network issues, for instance, will no longer put the
instance in an invalid state.
Still, a possible improvement to this would be passing that logic to
InstanceStaging instead, to be handled with the instance commiting
directly. However, as it is now, the code would become very spaguetti-y,
and given that the override operation in the commiting could also put
the instance into an invalid state, it seems to me that, in order to
fully error-proof this, we would need to do a copy operation on the
whole instance, in order to modify the copy, and only in the end
override everything an once with a rename. That also has the possibility
of corrupting the instance if done without super care, however, so I
think we may need to instead create an automatic backup system, with an
undo command of sorts, or something like that. This doesn't seem very
trivial though, so it'll probably need to wait until another PR. In the
meantime, the user is advised to always backup their instances before
doing this kind of action, as always.
What a long commit message o.O
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:09 -03:00
flow
2dd372600c
fix: some abort-related issues
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:09 -03:00
flow
eda6cf11ef
feat(ui): improve info dialog before updating an instance
...
Adds a 'Cancel' option, and add a note about doing a backup before
updating.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:09 -03:00
flow
68facd6b93
fix(ui): hook up abort status signal in ProgressDialog
...
Now we have a visual indication on when tasks are abortable!
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:09 -03:00
flow
87002fb8f8
fix: hook up setAbortStatus in instance import tasks
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:09 -03:00
flow
6a50fa35ec
feat: add canAbort() status change in Task
...
By now, it's a recurring pattern of wanting to restrict aborting in
certain situations. This avoids further code duplication, and adds a
signal that external users can hook up to to respond to such change.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:09 -03:00
flow
6541570969
fix: simplify abort handling and add missing emits
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:09 -03:00
flow
4b0ceea894
fix: correctly set managed pack fields in CF pack
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:09 -03:00
flow
8c0816c166
feat: add override awareness to CF modpack updating
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:08 -03:00
flow
be769d07f1
fix: correctly set all managed pack fields in Modrinth pack
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:08 -03:00
flow
3a9d58e31c
feat: add override handling in modrinth pack update
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:08 -03:00
flow
7024acac06
feat: add override helper functions
...
These help us keep track of relevant metadata information about
overrides, so that we know what they are when we update a pack.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:08 -03:00
flow
6131346e2f
refactor: change the way instance names are handled
...
While working on pack updating, instance naming always gets in the way,
since we need both way of respecting the user's name choice, and a
standarized way of getting the original pack name / version.
This tries to circunvent such problems by abstracting away the naming
schema into it's own struct, holding both the original name / version,
and the user-defined name, so that everyone can be happy and world peace
can be achieved! (at least that's what i'd hope :c).
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:08 -03:00
flow
eed73c9078
refactor: clean up InstanceImportTask a bit
...
Also removes a divide by two in the download progress
(why was it there???)
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:08 -03:00
flow
795d6f35ee
feat: add curseforge modpack updating
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:08 -03:00
flow
ebd46705d5
refactor: move creation of CF file download task to a separate function
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:08 -03:00
flow
72d2ca234e
refactor: move flame modpack import to separate file
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:07 -03:00
flow
2246c3359b
refactor: add throw_on_blocked arg to Flame file parse
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:07 -03:00
flow
242fb156a2
feat: add 'getFiles' by fileIds route in Flame API
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:07 -03:00
flow
208ed73e59
feat: add early modrinth pack updating
...
Still some FIXMEs and TODOs to consider, but the general thing is here!
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:36:06 -03:00
flow
4441b37338
refactor: move modrinth modpack import to separate file
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:32:36 -03:00
flow
941d75824a
refactor: add instance creation abstraction and move vanilla
...
This is so that 1. Code is more cleanly separated, and 2. Allows to more
easily add instance updating :)
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:32:36 -03:00
flow
ec9ddc4f22
chore: add helper function for copying managed pack data between insts.
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-20 18:32:36 -03:00
Sefa Eyeoglu
98b6f90172
fix: add more legacy architectures
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-20 16:01:08 +02:00
Sefa Eyeoglu
7e280de361
refactor: drop 64-bit check
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-20 16:01:08 +02:00
Sefa Eyeoglu
7bd8bd13fe
feat: support multiarch system classifiers
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-20 16:01:06 +02:00
Sefa Eyeoglu
09e85e948c
refactor: introduce RuntimeContext
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-20 15:59:43 +02:00
Sefa Eyeoglu
9ec1c00887
fix: register JavaRealArchitecture for MinecraftInstance
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-20 15:58:56 +02:00
Sefa Eyeoglu
c6bcb6228b
Merge pull request #1108 from Scrumplex/better_texture_packs
2022-09-20 13:28:33 +02:00
Sefa Eyeoglu
a24d589845
fix: ensure all resource folders exist
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-20 10:39:05 +02:00
Sefa Eyeoglu
ebbcc9f6da
fix: actually render color codes for texture packs
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-20 10:26:15 +02:00
Sefa Eyeoglu
23fc453fae
fix: comments and naming of texture pack stuff
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-20 10:26:15 +02:00
Sefa Eyeoglu
aad6f74db6
fix: tests
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-20 10:26:15 +02:00
Sefa Eyeoglu
07dcefabcb
feat: add texture pack parsing
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-20 10:26:15 +02:00
txtsd
40c68595d7
Merge pull request #1150 from flowln/fix_crash_on_game_quit
2022-09-20 09:41:59 +05:30
txtsd
fe9a4fece4
Merge pull request #1142 from flowln/better_fs
2022-09-20 09:00:19 +05:30
Sefa Eyeoglu
098327f128
Merge pull request #903 from jopejoe1/demo-launch
2022-09-18 14:41:25 +02:00
flow
0873b8d304
fix: prevent container detaching in ResourceFolderModel
...
and use const accessors whenever we can!
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-16 20:12:31 -03:00
flow
c9eb584ac8
fix: prevent deletes by shared pointer accidental creation
...
This fixes the launcher crashing when opening the game :iea:
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-16 20:12:30 -03:00
flow
10493bd44a
fix: move newly allocated resources to the main thread
...
This avoids them getting deleted when the worker thread exits, due to
thread affinity on the created thread.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-16 20:12:30 -03:00
flow
9e35230467
fix: memory leak when getting mods from the mods folder
...
friendly reminder to always delete your news.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-16 20:12:30 -03:00
flow
81e326571b
fix: enable demo launch only on supported instances
...
e.g. >= 1.3.1 instances
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-15 19:27:42 -03:00
flow
1b2a7de4e2
fix: show 'demo' instead of 'offline' in log when in demo mode
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-15 18:44:18 -03:00
flow
11216d200c
change: move demo action to "Play offline" menu
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-15 18:44:18 -03:00
jopejoe1
777be6a48d
Add 'Ctrl+Alt+O' Shortcut to launch demo instance.
...
Signed-off-by: jopejoe1 <johannes@joens.email >
2022-09-15 18:44:18 -03:00
flow
5765a1fdf1
fix: allow demo for older versions
...
We were not propagating the '--demo' flag in the legacy launcher,
unconditionally setting the 'demo' parameter to false.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-15 18:44:18 -03:00
jopejoe1
29dcb9d274
Added Launch Demo button.
...
Signed-off-by: jopejoe1 <johannes@joens.email >
2022-09-15 18:44:18 -03:00
flow
8674ac4f68
Merge pull request #1146 from Scrumplex/fix-launch-rd
2022-09-15 17:55:08 -03:00
Sefa Eyeoglu
684b8f24f3
fix: allow starting rd- versions
...
Using `Collections.emptyList()` doesn't allow us to later append stuff
into that list. Use an empty `ArrayList` instead.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-15 09:29:48 +02:00
Sefa Eyeoglu
1ca2be0039
Merge pull request #982 from DavidoTek/windarkmode2
2022-09-14 13:17:17 +02:00
flow
8c41ff68f7
chore(actions)!: bump macOS required version to 10.15
...
This is needed for std::filesystem support in macOS's libc.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-12 18:41:13 -03:00
flow
931d6c280a
chore(tests): add test for copy operation with blacklist
...
I almost 💀 because no tests used this x.x
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-12 13:12:55 -03:00
flow
ee0fb2d0e0
fix: use std::wstring for Windows filenames
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-12 13:07:24 -03:00
flow
c496ad1237
chore: make DirNameFromString add normal duplicate identifier
...
Wrap the number in parenthesis to be similar to other software.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-12 13:07:24 -03:00
flow
277fa21f5f
refactor: remove Win32 'crap' in FileSystem
...
We should use std::filesystem symlink and hardlink functions instead.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-12 13:07:23 -03:00
flow
1cf949226e
refactor: use std::filesystem for overrides
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-12 13:07:23 -03:00
flow
be3fae6511
refactor: use std::filesystem for path deletion
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-12 13:07:23 -03:00
flow
5932f36285
refactor: use std::filesystem for file copy
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-12 13:07:23 -03:00
flow
30abb65368
Merge pull request #1133 from Scrumplex/refactor-tests
...
Move tests to a separate folder, to fix issues and improve maintenance
2022-09-12 12:57:55 -03:00
txtsd
64a06b5ed6
Merge pull request #1123 from flowln/fix_abort_inst
2022-09-12 17:11:19 +05:30
DioEgizio
69d18f17a5
fix(actions, win): only copy openssl libs on qt5 builds ( #1130 )
2022-09-12 07:57:18 -03:00
Sefa Eyeoglu
4c7d3a103c
refactor: restructure tests
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-11 22:29:01 +02:00
flow
10320bdeb4
Merge pull request #1129 from dada513/metainfo_fix
...
Fixes FlatHub's image metadata for the 1.4.2 release
2022-09-11 09:39:21 -03:00
dada513
4261dcff39
fix meta
...
Signed-off-by: dada513 <dada513@protonmail.com >
2022-09-11 10:45:42 +02:00
flow
a091245793
fix: emit signals when aborting NetJob
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-10 09:10:16 -03:00
timoreo
ca282f9fb3
Merge pull request #1117 from flowln/fix_updater
...
Fix the mod updater not working as intended
2022-09-08 09:28:05 +02:00
flow
7cf2c3be0f
fix: start at least one task in ConcurrentTask
...
This allows us to emit all the necessary stuff when we're finished in
the case of starting a task with no subtasks. In particular, this caused
the mod updater to not work properly :)
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-07 12:11:42 -03:00
flow
f65d506f26
Merge pull request #997 from flowln/fix_major_version_filter
2022-09-07 10:34:50 -03:00
flow
333dbca01e
Merge pull request #1105 from flowln/better_resource_packs
...
Add basic resource pack parsing and fix issues
2022-09-07 08:30:36 -03:00
flow
42eb265624
refactor: create mod pages and filter widget by factory methods
...
This takes most expensive operations out of the constructors.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-07 08:29:58 -03:00
flow
8a65726e9d
fix: use more robust method of finding matches for major version
...
This uses the proper version list to find all MC versions matching the
major number (_don't say anything about SemVer_ 🔫 ).
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-07 08:27:53 -03:00
flow
1b0ca47682
Merge pull request #939 from flowln/mod_downloader_improve
...
Some more UI / UX improvements to the mod downloader!
2022-09-07 08:27:11 -03:00
flow
8e3f5c3305
Merge pull request #966 from flowln/refactor_tasks
...
Reduce code duplication in tasks, fix some bugs and add some tests
2022-09-07 08:26:28 -03:00
flow
3c0a6987cd
Merge pull request #1113 from timoreo22/develop
...
Fix compilation warning due to uninitiated variables.
2022-09-06 18:50:46 -03:00
txtsd
e37f70b9f7
Merge pull request #1114 from DioEgizio/bump-installqtaction-v3
2022-09-06 20:36:35 +05:30
DioEgizio
03c148ce50
chore: update install-qt-action to v3
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-09-06 15:41:32 +02:00
timoreo
4817f0312d
Fixed up a warning
...
Signed-off-by: timoreo <contact@timoreo.fr >
2022-09-06 14:32:19 +02:00
Sefa Eyeoglu
b70a82c609
Merge pull request #1111 from PolyMC/revert-1067-classpath-epicness
2022-09-05 20:06:33 +02:00
Sefa Eyeoglu
25d1e0c4e6
Merge pull request #1107 from DioEgizio/smaller-about
2022-09-05 17:52:16 +02:00
Sefa Eyeoglu
8e3356f11a
Merge pull request #1034 from Scrumplex/detect-performance-features
2022-09-05 17:45:17 +02:00
Sefa Eyeoglu
1b559c7776
Revert "Move classpath definition into NewLaunch itself"
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-05 17:37:10 +02:00
DioEgizio
d5583f0f02
make the about dialog smaller
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-09-04 14:32:33 +02:00
flow
bedd3c50b6
fix: improve handling of unrecognized pack formats
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 15:05:23 -03:00
flow
43a7af3f44
fix: removing mods with their metadata as well
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:23 -03:00
flow
9db27c6acc
fix: crash when adding resource packs directly in the folder
...
This fixes an issue in which, when adding a new resource pack externally
to PolyMC, when the resource pack view was open, would crash poly.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:22 -03:00
flow
42c81395b3
fix: race condition on ResourceFolderModel tests
...
This (hopefully) fixes the race contiditions that sometimes got
triggered in tests.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:22 -03:00
flow
3b13e692d2
feat: move resource pack images to QPixmapCache
...
This takes care of evicting entries when the cache gets too big for us,
so we can add new entries without much worries.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:22 -03:00
flow
0331f5a1eb
feat(tests): add tests for resource pack parsing
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:22 -03:00
flow
8a7e117f6b
refactor: move resource pack file parsing utilities to separate namespace
...
This makes it easier to use that logic in other contexts.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:22 -03:00
flow
9b984cedac
feat: add image from pack.png to resource packs
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:22 -03:00
flow
dd9e30b24a
feat: add resource icon to InfoFrame
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:21 -03:00
flow
6a93688b2e
fix: filtering in regex search in resource packs
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:21 -03:00
flow
3ab17a97a8
fix: sorting by pack format
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:21 -03:00
flow
f21ae66265
feat: add basic resource pack parsing of pack.mcmeta
...
This parses the pack format ID and the description from the local file,
from both a ZIP and a folder, and hooks it into the model.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:21 -03:00
flow
afa1a5e932
feat: modify InfoFrame and ResourcePackPage to show ResourcePack info
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:21 -03:00
flow
050768c266
feat: add more resource pack info
...
Adds pack format id and description to ResourcePack, that'll be parsed
from pack.mcmeta.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:21 -03:00
flow
cda2bfc240
feat: allow specifying factory for resources in BasicFolderLoadTask
...
This allows us to hook our own resource type, that possibly has more
content than the base Resource, to it.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:20 -03:00
Sefa Eyeoglu
2f167b1512
Merge pull request #1095 from flowln/ensure_file_path_in_override
2022-09-01 09:54:22 +02:00
flow
ba3ac85356
Merge pull request #1067 from Scrumplex/classpath-epicness
...
Move classpath definition into NewLaunch itself
2022-08-31 18:28:29 -03:00
flow
ec29cedeb7
Merge pull request #1080 from flowln/eternal_cache
...
Never invalidate libraries cache entries by time elapsed
2022-08-31 18:28:07 -03:00
flow
064ae49d2b
fix: make MultipleOptionsTask inherit directly from SequentialTask
...
It's not a good idea to have multiple concurrent tasks running on a
sequential thing like this one.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-28 16:29:02 -03:00
flow
247f99ce2f
feat(test): add more tests to Tasks
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-28 16:29:01 -03:00
flow
7b6d269904
refactor: make NetJob inherit from ConcurrentTask as well!
...
Avoids lots of code duplication
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-28 16:29:01 -03:00
flow
87a0482b8b
refactor: make MultipleOptionsTask inherit from ConcurrentTask too
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-28 16:29:01 -03:00
flow
e899699918
refactor: make SequentialTask inherit from ConcurrentTask
...
In a way, sequential tasks are just concurrent tasks with only a single
task running concurrently, so we can remove LOTS of duplicated logic :)
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-28 16:29:01 -03:00
flow
bdf464e792
fix: abort logic running subsequent tasks anyways some times
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-28 16:29:01 -03:00
flow
c410bb4ecb
fix: 'succeeded while not running' spam in ConcurrentTask
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-28 16:29:01 -03:00
flow
a720bcc637
fix: bogus progress update when the total step progress was zero
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-28 16:29:01 -03:00
flow
369a8cdc74
fix: only try to start tasks that are really there
...
This fixes an annoying issue where concurrent tasks would try to start
multiple tasks even when there was not that many tasks to run in the
first place, causing some amount of log spam.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-28 16:29:00 -03:00
flow
3f4e55be4f
fix: ensure destination file paths exist when overriding folders
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-28 16:28:23 -03:00
flow
9171f471ab
Merge pull request #1094 from flowln/fix_the_thing
...
Fix build due to merge without rebase messing things up :p
2022-08-28 16:27:41 -03:00
flow
2186b134a4
fix: Mod type enum -> Resource type enum
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-28 14:47:52 -03:00
Sefa Eyeoglu
f371ec210c
Merge pull request #1052 from flowln/resource_model
2022-08-28 16:52:53 +02:00
Sefa Eyeoglu
afcd669d2f
Merge pull request #965 from flowln/fat_files_in_memory
...
Refactor a bit EnsureMetadataTask and calculate hashes in a incremental manner
2022-08-28 11:03:12 +02:00
flow
fbf542d205
Merge pull request #1087 from DioEgizio/fix-ftblegacy-url
...
fix: fix urls on ftb legacy
2022-08-24 20:37:07 -03:00
DioEgizio
13184eb8e9
fix: fix urls on ftb legacy
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-08-24 12:31:38 +02:00
flow
ddf1e1ccee
fix: make FML libraries cache eternal
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-21 13:47:49 -03:00
flow
5ac4e73697
fix: make libraries cache eternal
...
This restores the behavior prior to PR #920 .
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-21 13:47:49 -03:00
flow
6be59b53f1
feat: add eternal cache entries
...
Those are entries that don't get stale over time, so we don't invalidate
them if they 'expire'.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-21 13:47:49 -03:00
flow
bb54fec907
Merge pull request #1073 from DioEgizio/update-copying
...
fix(COPYING): fix COPYING.md by adding some missing copyright notices
2022-08-21 13:09:30 -03:00
flow
0b81b283bf
fix: LGTM warnings
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-20 10:49:56 -03:00
flow
e2ab2aea32
change: add enable/disable to resources
...
TIL that zip resource packs, when disabled, actually have the effect of
not showing up in the game at all. Since this can be useful to someone,
I moved the logic for it to the resources.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-20 10:49:54 -03:00
flow
c3ceefbafb
refactor+fix: add new tests for Resource models and fix issues
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-20 10:49:23 -03:00
flow
e7cf9932a9
refactor: simplify Mod structure
...
No need to keep track of pointers left and right. A single one already
gives enough headaches!
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-20 10:48:51 -03:00
flow
0c9d03f5df
fix(tests): add timeout on ModFolderModel's tests
...
If the update never ends, the signal is not emitted and we become stuck
in the event loop forever. So a very lenient timer is added to prevent
that.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-20 10:48:01 -03:00
flow
92aa24ae34
fix: don't give shared pointer to obj. external to the model
...
It causes some weird problems and adds refcounting overhead.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-20 10:48:00 -03:00
flow
97a74d5c1f
refactor: adapt rest of the codebase to the new resource model
...
In order to access the ModFolderModel from the ModFolderPage, i created
a new m_model for the correct type, shadowing the m_model of type
ResourceFolderModel. This creates two shared_ptr references to the same object,
but since they will have the same lifetime, it doesn't generate a memory
leak.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-20 10:47:58 -03:00
flow
256f8094f5
refactor: make Resource Pack model inherit from ResourceFolderModel
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-20 10:47:11 -03:00
flow
1e2f0ab308
refactor: move more tied logic to model and move logic to the resources
...
This moves the QSortFilterProxyModel to the resource model files,
acessible via a factory method, and moves the sorting and filtering to
the objects themselves, decoupling the code a bit.
This also adds a basic implementation of methods in the
ResourceFolderModel, simplifying the process of constructing a new model
from it.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-20 10:47:08 -03:00
flow
af2cf2734d
refactor: move things around in the mod model
...
Makes the method order in the cpp file the same as in the header file.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-20 10:46:33 -03:00
flow
ec62d8e973
refactor: move general code from mod model to its own model
...
This aims to continue decoupling other types of resources (e.g. resource
packs, shader packs, etc) from mods, so that we don't have to
continuously watch our backs for changes to one of them affecting the
others.
To do so, this creates a more general list model for resources, based on
the mods one, that allows you to extend it with functionality for other
resources.
I had to do some template and preprocessor stuff to get around the
QObject limitation of not allowing templated classes, so that's sadge :c
On the other hand, I tried cleaning up most general-purpose code in the
mod model, and added some documentation, because it looks nice :D
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-20 10:45:01 -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
flow
2d63c86022
feat: make Task a QRunnable
...
This makes it possible to run a task in another thread.
I added a variable to toggle debug prints because they seem to trigger
an assertion on Qt internals when the task in on another thread. Of
course, this isn't awesome, but can wait until we improve our logging.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-20 10:41:59 -03:00
flow
2dcff83be7
Merge pull request #1035 from Scrumplex/fix-coremods
...
Make Coremods / Mods seperation more clear
2022-08-20 10:15:50 -03:00
Sefa Eyeoglu
afb9ebcd99
fix: distinguish Coremods
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-08-20 12:53:13 +02:00
Sefa Eyeoglu
92d7e44525
Merge pull request #878 from flowln/lazy_settings
2022-08-20 12:50:56 +02:00
Sefa Eyeoglu
a517f442ea
Merge pull request #1023 from flowln/better_shared_ptr
2022-08-20 12:50:50 +02:00
Sefa Eyeoglu
311758233b
Merge pull request #1044 from flowln/better_orphan_fix
2022-08-20 12:50:43 +02:00
Sefa Eyeoglu
6e086eb808
Merge pull request #992 from Scrumplex/refactor-version
2022-08-20 12:50:25 +02:00
Sefa Eyeoglu
7e8644430c
Merge pull request #1007 from Gingeh/disable-update-button
2022-08-20 12:50:19 +02:00
Sefa Eyeoglu
70a8f6743a
Merge pull request #919 from kumquat-ir/download-all-blocked
2022-08-20 12:50:01 +02:00
dada513
69eafd0e11
Merge pull request #1058 from DioEgizio/fix-update-org.polymc.PolyMC.metainfo.xml.in
2022-08-19 20:34:11 +02:00
DioEgizio
6b6a095b91
fix(COPYING): fix COPYING.md by adding some missing copyright notices
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-08-19 18:42:26 +02:00
Sefa Eyeoglu
d5a2185030
Merge pull request #1068 from TayouVR/improvedWindowsJavaCheck
2022-08-19 14:26:36 +02:00
Tayou
26f31e9288
use qEnvironmentVariable instead of qgetenv in JavaUtils
...
Signed-off-by: Tayou <tayou@gmx.net >
2022-08-18 23:59:35 +02:00
Sefa Eyeoglu
e654e66839
Merge pull request #1049 from flowln/waiting_for_news_-_-
2022-08-18 22:53:41 +02:00
Tayou
bb4861cf0d
check for java installs in PATH on windows
...
this should find java installs from scoop as well as any other installer, that registers java in the PATH environment variable.
Signed-off-by: Tayou <tayou@gmx.net >
2022-08-18 18:24:32 +02:00
Sefa Eyeoglu
01505910f4
refactor: move classpath definition into NewLaunch itself
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-08-18 18:14:01 +02:00
Sefa Eyeoglu
ab766a0598
Merge pull request #968 from magneticflux-/utf8-logging
...
Decode process lines as UTF-8
2022-08-18 10:44:01 +02:00
DioEgizio
51c664a678
fix: update org.polymc.PolyMC.metainfo.xml.in to not make flatpak break next release
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-08-15 20:34:56 +02:00
Mitchell Skaggs
3c4b45c9e7
Use C locale codec for decoding
...
This should correctly decode multi-byte non-UTF-8 text, such as Windows-936 (Simplified Chinese)
Signed-off-by: Mitchell Skaggs <skaggsm333@gmail.com >
2022-08-13 10:39:05 -05:00
flow
93507a263b
fix: hide 'More news...' button if the news aren't loaded yet
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-12 17:41:11 -03:00
Sefa Eyeoglu
1175461030
refactor: switch to new versioning scheme
...
The new versioning system is based on the versioning system used by the
GNOME Foundation for the GNOME desktop.
We are dropping the "major version" as defined by SemVer and move to a
version number with a most and least significant number.
The most significant number must be incremented, if there are new
features or significant changes since last major release.
Otherwise, the least significant number must be incremented, if there
are only minor changes since the last release. New features or
significant changes mustn't be introduced by a bump of the least
significant number.
If a minor change would introduce small user-facing changes (like a
message-box or slight UI changes), it could still be classified as a
minor change.
At the end of the day, a human shall decide, if a change is minor or
significant, as there is no clear line that would separate a "minor" and
a "significant" change in a GUI-application.
Definitions:
feature: New user-facing functionality
significant change: Something that changes user-facing behavior
minor change: Something that fixes unexpected behavior
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-08-12 14:22:24 +02:00
flow
2f5e55bea0
fix: only remove orphaned metadata on first opening
...
This avoids deleting the metadata while one is updating their mods.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-11 13:11:56 -03:00
timoreo
c375e7b4df
Merge pull request #897 from jamierocks/atl-updating-initial
2022-08-11 08:50:05 +02:00
timoreo
5d188c69ed
Merge pull request #1039 from budak7273/fix-world-safety-nag-title-text
2022-08-11 07:33:13 +02:00
timoreo
6bff7751d0
Merge pull request #909 from txtsd/markdownlint
2022-08-11 07:33:04 +02:00
timoreo
1a5986abe0
Merge pull request #920 from flowln/metacache_fix
2022-08-11 07:32:43 +02:00
Robb
cebac3c10e
Make new title strings translatable
...
Signed-off-by: Robb <computerguy440+gh@gmail.com >
2022-08-10 12:07:24 -05:00
timoreo
a5da3db966
Merge pull request #1018 from Scrumplex/fix-infinite-auth-loop
2022-08-10 18:14:26 +02:00
Robb
cd30f75173
fix: Make world safety nag title text match the action being performed instead of always saying 'Copy World'
...
Signed-off-by: Robb <computerguy440+gh@gmail.com >
2022-08-09 16:01:21 -05:00
Mitchell Skaggs
94df4ceb36
Fix use of Qt 5.14 enum
...
Signed-off-by: Mitchell Skaggs <skaggsm333@gmail.com >
2022-08-09 00:17:53 -05:00
Mitchell Skaggs
a14476c5fb
Replace local 8-bit decoding with UTF-8 decoding
...
Handles incomplete byte sequences using `QTextDecoder`
Signed-off-by: Mitchell Skaggs <skaggsm333@gmail.com >
2022-08-08 23:54:01 -05:00
Sefa Eyeoglu
d82bb29919
fix: don't apply GameMode/MangoHud, if they aren't supported
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-08-08 21:19:46 +02:00
Sefa Eyeoglu
33af0c6a7c
refactor: don't include mangohud's library path
...
This could cause issues on some environments. Users should just put
MangoHud libs into global LD_LIBRARY_PATH, just like with any other
library
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-08-08 21:16:37 +02:00
Sefa Eyeoglu
68f3f98bc3
feat: detect GameMode and MangoHud's presence
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-08-08 21:16:37 +02:00
Sefa Eyeoglu
f873cd5b1a
refactor: store current capabilities
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-08-08 21:16:37 +02:00
txtsd
fa8df286d9
chore(ci): Add markdownlint config to ignored paths
...
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com >
2022-08-06 13:00:57 +05:30
txtsd
76aa0c434a
feat(markdown): Add markdownlint config
...
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com >
2022-08-06 13:00:57 +05:30
txtsd
78dc0cfdf3
chore(markdown): MD001 Heading levels should only increment by one level at a time
...
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com >
2022-08-06 13:00:57 +05:30
txtsd
9654728bfb
chore(markdown): Align inline HTML correctly
...
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com >
2022-08-06 13:00:57 +05:30
txtsd
123d1864f4
chore(markdown): MD037 Spaces inside emphasis markers
...
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com >
2022-08-06 13:00:57 +05:30
txtsd
96a91e988d
chore(markdown): MD010 Hard tabs
...
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com >
2022-08-06 13:00:56 +05:30
txtsd
19ecb1701e
chore(markdown): MD031 Fenced code blocks should be surrounded by blank lines
...
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com >
2022-08-06 13:00:56 +05:30
txtsd
8085b2728d
chore(markdown): MD032 Lists should be surrounded by blank lines
...
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com >
2022-08-06 13:00:56 +05:30
txtsd
56cad31a36
chore(markdown): MD034 Bare URL used
...
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com >
2022-08-06 13:00:46 +05:30
txtsd
3275bc4e93
chore(markdown): MD009 Trailing spaces
...
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com >
2022-08-06 12:57:30 +05:30
txtsd
8963378039
chore(markdown): MD007 Unordered list indentation
...
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com >
2022-08-06 12:57:30 +05:30
txtsd
c7d435bb7a
chore(markdown): MD025 Multiple top-level headings in the same document
...
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com >
2022-08-06 12:57:11 +05:30
txtsd
06cc7e4ea0
chore(markdown): MD046 Code block style
...
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com >
2022-08-06 12:55:11 +05:30
txtsd
fba20e2cfb
chore(markdown): MD040 Fenced code blocks should have a language specified
...
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com >
2022-08-06 12:55:11 +05:30
txtsd
358f080c76
chore(markdown): MD012 Multiple consecutive blank lines
...
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com >
2022-08-06 12:55:11 +05:30
txtsd
8cea57ff0f
chore(markdown): MD022 Headings should be surrounded by blank lines
...
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com >
2022-08-06 12:53:50 +05:30
flow
7b27f200b1
fix: don't mutate QHash while iterating over it
...
Even though it was using a QMutableHashIterator, sometimes it didn't
work quite well, so this is a bit better.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-05 16:30:12 -03:00
flow
f4b207220c
fix: add some more nullptr checks / protection
...
die sigsegv 🔫
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-05 15:10:44 -03:00
flow
d835e1d14e
refactor: simplify smart pointers more
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-05 11:38:46 -03:00
flow
75f92de8f8
Merge pull request #1017 from flowln/kill_orphan_metadata
...
Remove orphaned metadata to avoid problems with auto-updating instances
2022-08-04 12:57:20 -07:00
flow
293c1deee5
Merge pull request #1014 from DioEgizio/downgrade-qt-macos
...
chore: downgrade to Qt 6.3.0 on macos
2022-08-04 12:56:55 -07:00
flow
4dee05a967
Merge pull request #1006 from DioEgizio/appimage-ubuntu-moment
...
fix: work around ubuntu 22.04 openssl appimage issues by copying openssl libs
2022-08-04 12:56:38 -07:00
Sefa Eyeoglu
8d6414d74a
Merge pull request #1019 from Scrumplex/fix-openbsd-root
...
Add root path detection on OpenBSD
2022-08-04 21:47:35 +02:00
flow
362ecdb583
refactor+fix: use QSharedPointer for shared_qobject_ptr
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-04 15:33:51 -03:00
LennyMcLennington
058b9f9272
Merge pull request #994 from Scrumplex/fix-winget-releaser
...
Fix WinGet releaser
2022-08-04 16:20:23 +01:00
Sefa Eyeoglu
355762aa30
fix: emit abort in LaunchController
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-08-04 10:07:36 +02:00
Sefa Eyeoglu
be4fb65470
fix: Add root path detection on OpenBSD
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-08-03 21:14:32 +02:00
Sefa Eyeoglu
4ed296bad4
fix: allow user to interrupt launch after 3 tries
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-08-03 20:38:40 +02:00
Gingeh
a8aa862919
Move large condition into a new lambda
...
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com >
2022-08-03 16:39:30 +10:00
flow
31ba1de53b
fix: remove orphaned metadata to avoid problems with auto-updating insts
...
Just as my master has taught me. 🔫
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-02 16:15:39 -03:00
DioEgizio
bca1fef2b2
chore: downgrade to Qt 6.3.0 on macos
...
seems to fix some emoji-related issues
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-08-02 10:59:54 +02:00
Gingeh
f33b31e048
Check for running instance when re-opening the mod folder page and when selecting mods
...
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com >
2022-08-02 14:14:45 +10:00
Gingeh
0d10ebb7ca
Update launcher/ui/pages/instance/ModFolderPage.h
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com >
2022-08-02 12:50:25 +10:00
flow
4a8abc948e
fix: prevent segfault due to callbacks into deleted objects
...
Since network requests are, for the most part, asynchronous, there's a
chance a request only comes through after the request sender has already
been deleted.
This adds a global (read static) hash table relating models for the mod
downloader to their status (true = alive, false = destroyed). It is a
bit of a hack, but I couldn't come up with a better way of doing this.
To reproduce the issue before this commit: scroll really quickly through
CF mods, to trigger network requests for their versions and description.
Then, in the middle of it close the mod downloader. Sometimes this will
create a crash.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-01 18:34:15 -03:00
Sefa Eyeoglu
6fd3672618
Merge pull request #1012 from DioEgizio/patch-10
...
fix: remove iconfix from libraries/README.MD
2022-08-01 20:31:11 +02:00
DioEgizio
abd090bd48
fix: remove iconfix from libraries/README.MD
...
someone forgor (💀 ) to remove it
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-08-01 20:21:19 +02:00
Sefa Eyeoglu
bd9140f1f3
Merge pull request #1008 from DioEgizio/qt-version-issue-template
...
chore: update issue template to ask about Qt version
2022-08-01 18:40:11 +02:00
DioEgizio
9d78b2d259
Update .github/ISSUE_TEMPLATE/bug_report.yml
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
Co-authored-by: flow <flowlnlnln@gmail.com >
2022-08-01 14:51:19 +02:00
DioEgizio
9c9528838a
chore: update issue template to ask about Qt version
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-08-01 14:40:55 +02:00
Gingeh
77b640b76b
Disable "Check for Updates" and "Download Mods" while the game is running
...
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com >
2022-08-01 20:56:05 +10:00
Gingeh
a8dfe98b1a
Disable "Check for Updates" if all mods are removed
...
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com >
2022-08-01 20:56:05 +10:00
flow
cee41b87f7
fix(ui): force redraw of mod list when (de)selecting a mod
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-01 07:33:31 -03:00
flow
7a95314e42
feat(ui): remember mod download dialog's geometry
...
Makes it consistent with other modal dialogs.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-01 07:33:31 -03:00
flow
6aaf1f4f21
feat: lazy-load CF mod descriptions
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-01 07:33:30 -03:00
flow
368a0ddd44
feat: add mod descriptions to CF mods
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-01 07:33:30 -03:00
flow
0808a10b7b
feat: cache mod versions
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-01 07:33:30 -03:00
flow
6f052baa94
refactor: use function cb instead of class cb in getVersions
...
I've discovered even more functional programming! :^)
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-01 07:33:30 -03:00
flow
5bc67d3f6b
feat: cache extra mod info (like links and body)
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-01 07:33:30 -03:00
flow
74c6c5cfbc
refactor: use function cb instead of class cb in getModInfo
...
I've discovered functional programming :^)
This makes this route more fit for general use.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-01 07:33:30 -03:00
flow
158b7fd166
feat+refactor: clean up ProgressWidget and add progress indicatior to
...
mod downloader
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-01 07:33:30 -03:00
flow
c3f647dc96
feat: add (semi) instant searching in mod downloader
...
It has a delay of 350ms from the last typed character to search, in
order to cache small changes while typing.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-01 07:33:30 -03:00
flow
5936c7b65c
change: preserve search term across different mod providers
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-01 07:33:29 -03:00
flow
a8bcd85c93
feat+refactor: add shortcuts to mod downloader and clean up
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-01 07:33:29 -03:00
flow
127b558f95
change: change button names to be more user-friendly
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-01 07:33:29 -03:00
flow
6e9a27f40f
feat: display the 'body' of a MR mod on the mod downloader
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-01 07:33:29 -03:00
flow
4a13dbe3bb
feat: create delegate for project item views
...
This allows us to define custom painting for list view items. In
particular, this is applied to the mod downloader, in order to allow
displaying both the mod name and mod description, and settings their
effects (like bold or underline) independent of each other.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-01 07:33:29 -03:00
flow
0f61f5ba03
fix(ui): missing tr() in mod download dialog's title
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-01 07:33:29 -03:00
DioEgizio
5f1efbeb67
fix: work around ubuntu 22.04 openssl appimage issues by copying openssl libs
...
terrible hack but it works™️
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-08-01 09:57:14 +02:00
kumquat-ir
9c105914f0
use BlockedModsDialog for ftb packs as well
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2022-07-31 15:05:47 -04:00
kumquat-ir
579582740e
Merge remote-tracking branch 'origin/develop' into download-all-blocked
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2022-07-31 14:54:50 -04:00
Ryan Cao
b15544c163
Trash instances instead of deleting (when possible) ( #549 )
...
Squashed because of :pofat: commit history
2022-07-30 14:42:33 -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
LennyMcLennington
842b7e6c39
use c11 instead
...
c17 dont work properly with lgtm's build system and c11 is already almost identical to c17 at least in gcc
2022-07-30 15:35:48 +01:00
Sefa Eyeoglu
22f5011451
fix(winget): strictly match non-Legacy setup
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-29 16:25:12 +02:00
timoreo
74120fe1f3
Merge pull request #699 from Scrumplex/resolve-ftb-mods-cf
2022-07-28 09:43:39 +02:00
DavidoTek
b4e8abd0ad
feat: win32 enable dark titlebar for dark theme
...
Signed-off-by: DavidoTek <54072917+DavidoTek@users.noreply.github.com >
2022-07-26 23:25:17 +02:00
flow
336f1f4f50
Merge pull request #974 from flowln/accounts_qt6
...
Fix adding multiple accounts in Qt6
2022-07-26 16:08:05 -03:00
txtsd
1c256d8876
Merge pull request #958 from jopejoe1/readme
2022-07-27 00:16:35 +05:30
flow
1ce0f0e7a5
fix: progress dialog going away even if the task was not aborted
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-26 20:33:33 +02:00
flow
fbf1901d86
refactor: shuffle some things around to improve readability
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-26 20:33:33 +02:00
flow
0382f33c46
fix(ui): pump events to show "Copying modpack files..." text
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-26 20:33:33 +02:00
flow
13372f3f99
chore: clean up FTBPackInstallTask a bit and connect missing signals
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-26 20:33:33 +02:00
flow
e741cb7f0a
fix: add abort handlign in Flame's FileResolvingTask
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-26 20:33:33 +02:00
Sefa Eyeoglu
fb289c6b17
chore: add license headers
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-26 20:33:29 +02:00
Sefa Eyeoglu
75a7ea55d4
feat: implement mod resolving for FTB
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-26 20:33:10 +02:00
Sefa Eyeoglu
86573a5ccd
Merge pull request #961 from flowln/fix_resource_filter
2022-07-26 20:14:18 +02:00
flow
6fe55a79f1
fix: use const qualifier for operator==() and allow other comparisons
...
This fixes an implicit behavior changed by C++17.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-26 15:11:56 -03:00
flow
1a6cb9ee99
chore: add some debugging prints in AccountList
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-26 15:11:56 -03:00
txtsd
a495d9eca5
chore: Normalize sentence in readme
...
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com >
2022-07-26 22:00:40 +05:30
LennyMcLennington
65a945f968
Merge pull request #956 from flowln/jar_mods_aa
...
Fix segmentation fault when using jar mods
2022-07-25 06:57:40 +01:00
flow
a9e8ed5087
fix: pump events and do a queued start for concurrent tasks
...
Heavy workloads can consume a ton of time doing their stuff, and starve
the event loop out of events. This adds an event processing call after
every concurrent task has been completed, to decrease the event loop
stravation on such loads.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-24 17:46:54 -03:00
flow
00520b6a0e
feat: add hashing tasks to the sequential task in ModUpdateDialog
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-24 17:46:54 -03:00
flow
e6f2a3893a
refactor+feat: improve code separation in ensure metadata
...
... and avoid calculating the same hash multiple times
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-24 17:46:54 -03:00
flow
24c034ff6a
change(libs): use a 4MiB buffer by default in murmur2 hashing
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-24 17:46:54 -03:00
flow
631a93bcd8
refactor: add a HashUtils place for hashing stuff
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-24 17:46:54 -03:00
flow
b1763353ea
feat: do incremental calculation of CF's hash
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-24 17:46:53 -03:00
flow
f95bcf45ad
feat(libs): add incremental version of murmurhash2 calculation
...
This does two passes for a given file, which is kinda slow, but I don't
know how else to get the size excluding the filtered ones :<
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-24 17:46:53 -03:00
flow
15ec1abb6a
feat: use QIODevice for calcuating the JAR hash on Modrinth
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-24 17:46:53 -03:00
flow
cfda8dbb2b
refactor: use QIODevice instead of a whole QByteArray for hash calc.
...
This allows Qt to do its thing and optimize the data gathering from the
JAR.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-24 17:46:53 -03:00
flow
3aa2003951
fix: filter in external resource pages not working
...
For some reason, using setFilterFixedString() doesn't seem to update the
QRegularExpression object with a new value, instead leaving it empty. It
updates QRegExp just fine, so maybe that's an Qt bug? o.O
Anyway, using regex in the filter is kinda cool actually :D
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-23 23:50:56 -03:00
flow
0e473f4570
Merge pull request #951 from flowln/performace_tab_fix
...
Hide the entire performance tab on the instance settings in non-Linux OSes
2022-07-23 18:31:04 -03:00
jopejoe1
bfa824ee71
Fix broken url in readme
...
Signed-off-by: jopejoe1 <johannes@joens.email >
2022-07-23 23:22:39 +02: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
LennyMcLennington
4596e78df0
Merge pull request #952 from Scrumplex/fix-pre-post-launch
...
Fix variable substitution in pre launch/post exit hooks
2022-07-23 18:06:12 +01:00
flow
813dfbd2d3
fix: hide the entire performance tab on instance settings in non-Linux
...
"just woke up after a major release has just been made" coding style
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-23 13:29:39 -03:00
Sefa Eyeoglu
ba7dfb360c
fix: actually substitute variables in pre/post launch
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-23 17:51:58 +02:00
timoreo
6aad750fe0
Merge pull request #893 from Scrumplex/refactor-env-handling
2022-07-23 14:08:10 +02:00
Sefa Eyeoglu
5e443ae347
fix(nix): change license to gpl3Only
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-23 14:00:11 +02:00
Sefa Eyeoglu
c65f5f7728
Merge pull request #877 from Scrumplex/refactor-offline-accounts
2022-07-23 13:54:36 +02:00
timoreo
74b62727af
Merge pull request #947 from flowln/unicode_uhh
2022-07-23 13:38:48 +02:00
Sefa Eyeoglu
2e94562f79
fix: treat accounts as offline, if auth servers are down
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-23 12:38:01 +02:00
txtsd
061ea5648e
Merge pull request #922 from DioEgizio/qt6-tarballs
...
feat(actions): package and deliver qt6 tarballs
2022-07-23 14:18:00 +05:30
flow
439e7bbf4e
change: unicode chars for folders and disabled mods in mod list
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-22 17:45:27 -03:00
Sefa Eyeoglu
0f1d51f866
Update .github/workflows/build.yml
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-22 22:11:53 +02:00
txtsd
75cfaf0672
Merge pull request #938 from Scrumplex/fix-i18n3
2022-07-22 22:45:53 +05:30
txtsd
ceaa732e5f
Merge pull request #932 from Scrumplex/fix-nix
2022-07-22 22:43:57 +05:30
txtsd
deb2a2bd14
Merge pull request #930 from TheOPtimal/develop
2022-07-22 22:43:00 +05:30
flow
33853b6107
fix: use single-space unicode char for checkmark in mod list
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-22 11:48:08 -03:00
flow
ab6e1b112b
change(cache): use cache-specific http headers for their lifetime
...
This uses the 'Age', 'Cache-Control' and 'Expires' HTTP headers to more
accurately set up the cache lifetime, falling back to a static 1-week
time if they're not present in the response.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-21 19:19:24 -03:00
Jacob Gogichaishvili
220e823c8d
DCO Remediation Commit for Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com>
...
I, Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com >, hereby add my Signed-off-by to this commit: 3746a2566d
Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com >
2022-07-20 23:27:07 +04: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
Sefa Eyeoglu
9cc1773fa7
fix: move HTML code outside of translation
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-20 10:15:21 +02:00
Sefa Eyeoglu
e78c7af715
Merge pull request #936 from Scrumplex/fix-windows-crap-2
2022-07-20 10:07:10 +02:00
Sefa Eyeoglu
b96e76134a
fix(nix): switch to LD_LIBRARY_PATH
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-19 18:09:48 +02:00
Sefa Eyeoglu
fd2b206997
fix: support LD_* for OpenBSD
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-19 18:07:58 +02:00
Sefa Eyeoglu
2d53c7c5b2
refactor: filter values in environment variables
...
Before this change, you had to specify custom LD_* variables using the
prefix GAME_LD_*. Now instead of dropping all LD_* variables by default,
we should just filter them and remove the values we *know* are from our
start script.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-19 18:07:58 +02:00
Sefa Eyeoglu
28ae5d710e
fix: fix translations for mod updater
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-19 18:03:45 +02:00
DioEgizio
7a13412ec7
feat(actions): package and deliver qt6 tarballs
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-07-19 17:07:34 +02:00
flow
c86610b917
Merge pull request #934 from virchau13/fix-non-nixos-libraries
...
fix(nix): only load stdenv.cc.cc.lib on NixOS
2022-07-19 11:28:08 -03:00
Sefa Eyeoglu
502750492c
Merge pull request #929 from flowln/dark_theme_dark_font
2022-07-19 11:17:40 +02:00
Sefa Eyeoglu
8fc1653b0c
fix: fix Java Checker on Windows, again
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-19 11:12:11 +02:00
Vir Chaudhury
6841ebc31d
fix(nix): only load stdenv.cc.cc.lib on NixOS
...
On non-NixOS, launching any external process from Minecraft (e.g.
clicking on links) will fail due to a conflict between the system
libraries and the Nix stdenv.cc.cc.lib. This works around that issue by
only loading stdenv.cc.cc.lib on NixOS.
Signed-off-by: Vir Chaudhury <virchau13@hexular.net >
2022-07-19 09:03:54 +08:00
Sefa Eyeoglu
8757281467
fix(nix): switch to PolyMC libnbtplusplus
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-18 20:34:36 +02:00
kumquat-ir
20b1723e78
merge origin/develop
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2022-07-18 14:05:23 -04:00
kumquat-ir
be78afeee5
qtcreator moment
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2022-07-18 14:03:06 -04:00
Jacob Gogichaishvili
3746a2566d
Add more Nix meta information
2022-07-18 21:47:26 +04:00
flow
0cb47cf7d7
fix: dark placeholder text in dark background on dark theme
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-18 14:25:00 -03:00
flow
dec81c4f27
Merge pull request #588 from flowln/mod_update
...
Implement mod updater (😎 )
2022-07-18 12:40:25 -03:00
flow
54b335711a
fix: raw-pointers and leaks in ModFolderLoadTask
...
Co-authored-by: timoreo <contact@timoreo.fr >
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:56:23 -03:00
flow
6bb8332b4b
fix: bogus returns in EnsureMetadataTask
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:43:12 -03:00
flow
de9e304236
fix: std::list -> QList
...
Qt6 removed Qlist::toStdList() 😭
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:45 -03:00
flow
650af5eb64
change: use ModStatus as a simple member instead of a pointer
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:44 -03:00
flow
47bdcb6050
feat: make second metadata pass concurrent
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:44 -03:00
flow
58dc3e93d3
fix: clean up execWithTask in Progress Dialog
...
This prevents weird problems, such as dialogs being non-modal when they
should be!
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:44 -03:00
flow
79b0a16f7a
fix: try finding a good height for short changelogs
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:44 -03:00
flow
2b65ee433f
fix: changelogs with too much space between lines
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:44 -03:00
flow
001bbef9ee
fix: don't use shared_ptr for a background task T_T
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:44 -03: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
flow
fac63541a4
fix: work around HoeDown bug(?) in changelog line breaks
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:44 -03:00
flow
dfd6cb29be
feat: improve changelog and sort updatable mods
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:44 -03:00
flow
5f75e531e6
fix: handling around disabled mods
...
Don't update disabled mods to prevent mod duplication. Also, chop
filename in the metadata with a '.disabled'.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:43 -03:00
flow
a7648d60ce
fix: don't require non-essential items in mod index
...
Also adds slug field.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:43 -03:00
flow
52c45c2d32
feat: add some mod api calls
...
- Get Project: Already existed but required a specific caller type. This
is more general.
- Get Projects: A single call to multiple of the above
Both providers support these calls.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:43 -03:00
flow
fd6755c93f
change: mod metadata improvements
...
- Use slug instead of name
- Keep temporary status before having local details
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:43 -03:00
flow
a53ee2e35c
fix: mod parsing of 'String-fied' version (i.e. OpenBlocks)
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:43 -03:00
flow
4e6978ff6f
feat: improve metadata gen. networking and performance
...
This makes the metadata generation code a lot messier and harder to use,
but there's not really much else that can be done about it while
preserving all it's capabilities :(
At least we now have speed
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:43 -03:00
flow
91a5c4bdcb
feat: add metadata get/delete via mod id
...
This is, in many cases, more reliable than name comparisons, so it's
useful specially in cases where a mod changes name between versions
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:43 -03:00
flow
9a07ede615
fix: filter out opted-out mods in mod downloader
...
Maintains Pre-Updater behaviour
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:43 -03:00
flow
dfab55112b
feat: remove existing mod when updating/redownloading it
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:42 -03:00
flow
1709b47bb7
fix: don't double add mods in mod downloader/updater
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:42 -03:00
flow
2d10c246a8
feat: add update mods to the ui / mod model
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:42 -03:00
flow
6e2869834f
feat: add mod update dialog
...
This subclasses the Review mods dialog to make a "Update review" one.
Also, all the necessary components built until now are put together in a
coherent unity that checks and generates metadata on-the-fly and checks for
mod updates, while giving and receiving feedback to the user.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:42 -03:00
flow
b8b71c7dd2
feat: add mod update check tasks
...
Those tasks take a list of mods and check on the mod providers for
updates. They assume that the mods have metadata already.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:42 -03:00
flow
c3f6c3dd82
feat: add changelog to mod providers
...
The Modrinth changelog is fairly straight-forward, as it's given to us
directly with the API call we already did. Flame, on the other hand,
requires us to do another call to get the changelog, so it can introduce
quite a heavy performance impact. This way, we make it optional to get
such changelog.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:42 -03:00
flow
844b245776
feat: add EnsureMetadataTask
...
This task is responsible for checking if the mod has metadata for a
specific provider, and create it if it doesn't.
In the context of the mod updater, this is not the best architecture,
since we do a single task for each mod. However, this way of structuring
it allows us to use it later on in more diverse scenarios.
This way we decouple this task from the mod updater, trading off some performance
(though that will be mitigated when we have a way of running arbitrary tasks
concurrently).
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:42 -03:00
flow
4bcf8e6975
feat: add api call to flame
...
Call added:
- Get Fingerprints Matches
- Get Mod File Changelog
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:42 -03:00
flow
0e52112016
feat: add some api calls to modrinth
...
Calls added:
- Get version from hash
- Get versions from hashes
- Latest version of a project from a hash, loader(s), and game version(s)
- Latest versions of multiple project from hashes, loader(s), and game version(s)
Some of those are not used yet, but may be of use later on, so we have
it if we need it :)
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:41 -03:00
flow
32a9545360
libs: add murmur2 library
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:41 -03:00
flow
9a44c92211
feat: add MultipleOptionsTask
...
This is a variation of a Sequential Task, in which a subtask failing
will prompt the next one to execute, and a subtask being successful will
stop the task.
This way, this can be used for easily managing fallbacks with tasks. :D
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:41 -03:00
flow
dd6aabf9ab
feat: add ChooseProviderDialog
...
Allows you to prompt the user for choosing a (mod) provider. This should
be fairly independent of the mod updater logic, so it can be used for
other ends later down the road :^)
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:41 -03:00
flow
91776311c7
fix: allow aborting upload tasks
...
This maintains the same behaviour as the Download task.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:41 -03:00
flow
882c82f82c
fix: always update global progress of sequential tasks
...
Previously, it would not update the global counter if the subTask didn't
update its progress, even though progress was being made.
This also prevents a segmentation fault while aborting the task.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:41 -03:00
flow
43b9db6e45
change: allow deleting mods while preserving their metadata
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:41 -03:00
flow
032ceefa1d
feat: add some helping methods to WideBar
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:41 -03:00
flow
05fa266e6b
fix: provide default value to is_indexed in ModDownloadTask
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-17 11:33:40 -03:00
Sefa Eyeoglu
56085310cb
Merge pull request #913 from Gingeh/cape-without-skin
2022-07-17 09:57:03 +02:00
kumquat-ir
6a1d611fd1
Restore ScrollMessageBox
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2022-07-17 02:40:27 -04:00
flow
c8a72c876d
fix: add missing HttpMetaCache entry for CF mods
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-16 21:25:29 -03:00
flow
ec87a8ddfc
fix: add expiration time to cache entries
...
This is to prevent problems where the cache entry would still be used
way after the remote resource got updated. The limit is hardcoded for 1
week, which I think is a reasonable time, but this could be further
tweaked.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-16 21:25:28 -03:00
kumquat-ir
33e34ebb83
Add "Open All" button to blocked mods dialog
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2022-07-16 19:14:54 -04:00
dada513
dce435c882
Merge pull request #917 from Scrumplex/fix-translations-2
2022-07-16 22:27:03 +02:00
Sefa Eyeoglu
396b3c3952
fix: add missing full-stop to message
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-16 21:26:23 +02:00
Sefa Eyeoglu
8cf42f4e15
Merge pull request #902 from Scrumplex/fix-unicode-windows
2022-07-16 21:15:55 +02:00
Sefa Eyeoglu
17ea51ce27
fix: fix memory leak on Windows
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-16 20:08:08 +02:00
txtsd
04818ca626
Merge pull request #914 from DioEgizio/cacheqt
2022-07-16 00:42:44 +05:30
txtsd
6732b77594
chore(actions): Remove superfluous whitespace
...
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com >
2022-07-15 22:40:12 +05:30
DioEgizio
3e4346e321
feat(actions): bring back qt caching
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-07-15 10:02:11 +02:00
Gingeh
4dfc01899a
Make skin upload optional
...
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com >
2022-07-15 12:23:11 +10:00
Sefa Eyeoglu
b0b8ccfd4a
Merge pull request #911 from Scrumplex/fix-release-workflow-2
2022-07-14 07:59:34 +02:00
Sefa Eyeoglu
4d35c66af3
fix(actions): fix release workflow
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-13 22:47:55 +02:00
flow
509f7bd018
fix: move time record overrides to BaseInstance
...
This is needed so that we can show time stats in the UI without having
to load all type-specific settings, which would make all the previous
changes useless :c
This is apparently done with console settings too, so I don't think
there's a problem doing this too :>
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-12 21:15:59 -03:00
txtsd
42b9b3d72a
Merge pull request #905 from DioEgizio/fix-copying
2022-07-12 19:19:09 +05:30
DioEgizio
e280f9fe3e
chore(COPYING): update COPYING.MD a bit
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-07-12 15:20:26 +02:00
flow
89493a2f1d
Merge pull request #904 from virchau13/add-stdenv-lib
...
fix(nix): add stdenv.cc.cc.lib to GAME_LIBRARY_PATH
2022-07-12 07:47:06 -03:00
flow
e259bffca6
Merge pull request #810 from Scrumplex/refactor-launcher-version
...
Hide channel from version for tagged commits
2022-07-12 07:46:46 -03:00
Vir Chaudhury
ba9164022d
fix(nix): add stdenv.cc.cc.lib to GAME_LIBRARY_PATH
...
Some mods (like DiscordRichPresence) require libstdc++.
This commit adds stdenv.cc.cc.lib to $GAME_LIBRARY_PATH so that these
mods function correctly.
Signed-off-by: Vir Chaudhury <virchau13@hexular.net >
2022-07-12 05:16:32 +08:00
Sefa Eyeoglu
a4672ba00f
fix: remove unnecessary code for Windows
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-11 19:09:20 +02:00
Sefa Eyeoglu
c0bf267bae
fix: fix unicode issue with JavaChecker on Windows
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-11 18:53:20 +02:00
timoreo
1a26a53659
Merge pull request #901 from txtsd/scdoc
2022-07-11 14:56:19 +02:00
Sefa Eyeoglu
8f4d7ac655
Merge pull request #678 from Scrumplex/improvements-around-proprietary-services
2022-07-11 14:56:09 +02:00
Sefa Eyeoglu
c5625d8d32
Merge pull request #847 from EliteTK/switch-to-scdoc
2022-07-11 14:47:44 +02:00
flow
548a2a1d64
Merge pull request #900 from DioEgizio/CI/fix
...
fix(actions): fix ccache on windows
2022-07-11 08:02:27 -03:00
txtsd
df01a58099
feat(ci): Install scdoc to build manpage
...
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com >
2022-07-11 14:30:46 +05:30
Sefa Eyeoglu
ac8ee9f981
Merge pull request #479 from kthchew/feature/sparkle-mac
2022-07-11 09:02:41 +02:00
DioEgizio
b1805b70ea
fix(actions): fix ccache on windows
...
Also removes some unnecessary dependencies for the generic Linux package
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-07-11 08:13:02 +02:00
Kenneth Chew
eae8a2914e
Remove use of obsolete method
...
Fixes Qt 6 build
Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com >
2022-07-10 19:09:58 -04:00
Kenneth Chew
03429db528
Switch to production Sparkle appcast
...
DCO Remediation Commit for Kenneth Chew <kenneth.c0@protonmail.com >
I, Kenneth Chew <kenneth.c0@protonmail.com >, hereby add my Signed-off-by to this commit: 92b913ca37
I, Kenneth Chew <kenneth.c0@protonmail.com >, hereby add my Signed-off-by to this commit: 7eb61a28be
I, Kenneth Chew <kenneth.c0@protonmail.com >, hereby add my Signed-off-by to this commit: ea4ef1655b
I, Kenneth Chew <kenneth.c0@protonmail.com >, hereby add my Signed-off-by to this commit: b5bdfa6c2e
I, Kenneth Chew <kenneth.c0@protonmail.com >, hereby add my Signed-off-by to this commit: f9f46609ee
I, Kenneth Chew <kenneth.c0@protonmail.com >, hereby add my Signed-off-by to this commit: 34adcec616
I, Kenneth Chew <kenneth.c0@protonmail.com >, hereby add my Signed-off-by to this commit: 05cd30ac06
I, Kenneth Chew <kenneth.c0@protonmail.com >, hereby add my Signed-off-by to this commit: f3c72f4f08
I, Kenneth Chew <kenneth.c0@protonmail.com >, hereby add my Signed-off-by to this commit: b1f486518e
I, Kenneth Chew <kenneth.c0@protonmail.com >, hereby add my Signed-off-by to this commit: 3bc02b9662
Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com >
2022-07-10 18:51:52 -04:00
Jamie Mansfield
10f27250ee
DCO Remediation Commit for bf560f4
...
I, Jamie Mansfield <jmansfield@cadixdev.org >, hereby add my
Signed-off-by to this commit: bf560f4594
Signed-off-by: Jamie Mansfield <jmansfield@cadixdev.org >
2022-07-10 19:14:05 +01:00
Jamie Mansfield
aed7963d11
DCO Remediation Commit for a7fc23d
...
I, Jamie Mansfield <jmansfield@cadixdev.org >, hereby add my
Signed-off-by to this commit: a7fc23dd96
Signed-off-by: Jamie Mansfield <jmansfield@cadixdev.org >
2022-07-10 19:13:34 +01:00
Jamie Mansfield
2810413112
DCO Remediation Commit for 9e69b8f
...
I, Jamie Mansfield <jmansfield@cadixdev.org >, hereby add my
Signed-off-by to this commit: 9e69b8fe1b
Signed-off-by: Jamie Mansfield <jmansfield@cadixdev.org >
2022-07-10 19:12:57 +01:00
Jamie Mansfield
31fd92e071
DCO Remediation Commit for e0ae631
...
I, Jamie Mansfield <jmansfield@cadixdev.org >, hereby add my
Signed-off-by to this commit: e0ae631d59
Signed-off-by: Jamie Mansfield <jmansfield@cadixdev.org >
2022-07-10 19:12:08 +01:00
Sefa Eyeoglu
b3b76d5d56
Merge branch 'develop' into feature/sparkle-mac
...
# Conflicts:
# .github/workflows/build.yml
2022-07-10 19:38:30 +02:00
Sefa Eyeoglu
cd948dceae
Merge pull request #575 from Scrumplex/qt6
2022-07-10 19:21:01 +02:00
Sefa Eyeoglu
eb33a87ff5
fix: remove TODOs
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-10 18:11:13 +02:00
Jamie Mansfield
bf560f4594
ATLauncher: Move the UI support implementation into it's own class
...
This will allow it to be used in multiple locations.
2022-07-10 11:27:42 +01:00
Sefa Eyeoglu
d77237ca5d
refactor(actions): rename Windows builds
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
211d596fdd
refactor(actions): switch to system QuaZip on Windows
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
f464b347b2
fix: install TLS plugins for release builds
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
203c3ec233
refactor(actions): speed up package installations for Windows
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
e2a74dfc30
feat(actions): enable Windows-i686 Qt 6 builds
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
4e99da7b62
refactor: query Qt variables using ECM
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
eb5ed50824
fix: set UNICODE and _UNICODE for Qt 5 builds
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
3b4539de79
chore: update license headers
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
3e4d1c04de
fix: include TLS plugins in bundle
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
fdf5748029
feat(actions): use Qt 6 on macOS and AppImage
...
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
3562e94650
Revert "fix: ignore deprecation again"
...
We want to see deprecation warnings now
This reverts commit 47d0da2d96bc375410f5d494ac9371d47adf33d5.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
15c5bbcf22
fix: fix slots for Qt 6
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-10 12:19:15 +02: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
Sefa Eyeoglu
e58158c3cd
feat: add Qt 6 support to CMake
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-10 12:19:14 +02:00
Sefa Eyeoglu
ff2cd50bfa
refactor: replace QRegExp with QRegularExpression
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-10 12:17:52 +02:00
Sefa Eyeoglu
984692dc62
refactor: fix deprecation up to Qt 5.15
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-10 12:17:52 +02:00
Jamie Mansfield
a7fc23dd96
ATLauncher: Reset existing directory if required
2022-07-10 11:15:48 +01:00
txtsd
c1bcbf8c63
Merge pull request #880 from Scrumplex/fix-loader-importance
...
Make loader components not important
2022-07-10 15:44:17 +05:30
Jamie Mansfield
9e69b8fe1b
ATLauncher: Parse keeps and deletes from pack manifests
2022-07-10 11:05:11 +01:00
Jamie Mansfield
e0ae631d59
ATLauncher: Add modes to install task and display appropriate message
...
This will display the update/reinstall message for the installation
method currently in use..
2022-07-10 10:55:05 +01:00
dada513
3b187b5246
Merge pull request #876 from Scrumplex/revert-updater-stuff
...
Revert "fix: remove updater if it is not used"
2022-07-10 10:50:03 +02:00
Tomasz Kramkowski
20666763f0
Rewrite polymc.6 in scdoc, build, and install it
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: Tomasz Kramkowski <tomasz@kramkow.ski >
2022-07-09 23:25:09 +01:00
Sefa Eyeoglu
f591c87665
Merge pull request #851 from russellbanks/patch-1
2022-07-09 01:16:07 +02:00
Sefa Eyeoglu
e6fe701727
Merge pull request #808 from Scrumplex/fix-lgtm-warnings
2022-07-09 01:10:59 +02:00
flow
35a698ef72
Merge pull request #884 from jopejoe1/ftbuifixed
...
Updated FTB Classic layout
2022-07-08 16:19:14 -03:00
flow
998271414e
Merge pull request #890 from Scrumplex/fix-technic-forge
...
Fix Technic instances using Forge
2022-07-08 16:18:59 -03:00
Sefa Eyeoglu
1749f25420
Merge pull request #881 from gytis-ivaskevicius/develop
2022-07-08 17:29:12 +02:00
Sefa Eyeoglu
4ab0e70a9a
fix(technic): map loader libraries to components properly
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-08 17:28:06 +02:00
Sefa Eyeoglu
08989bde5e
Merge pull request #839 from flowln/modrinth_packs_bug_hunt
2022-07-08 16:25:35 +02:00
Sefa Eyeoglu
87cbff391c
fix: disable MSA login if it is NOT supported
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
962923bbce
chore: add missing license headers
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
311b081e60
feat: add validation for Flame key and MSA client ID
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
4103948132
feat: track capabilities of application
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
906f26698b
fix: spelling of CF
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
8a1a583afe
refactor: rename references to CurseForge to Flame
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-08 16:25:03 +02:00
jopejoe1
9e19b73ce6
Updated FTB Classic layout
...
Signed-off-by: jopejoe1 <johannes@joens.email >
2022-07-07 23:18:13 +02:00
Gytis Ivaskevicius
e11706d99d
Cleanup flake.nix
...
Signed-off-by: Gytis Ivaskevicius <me@gytis.io >
2022-07-07 19:25:14 +03:00
Sefa Eyeoglu
301b811310
fix: make loader components not important
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-07 09:58:03 +02:00
flow
273cf3d565
feat: lazy-load MinecraftInstance settings
...
Makes the startup go fast!
vrum
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-06 17:17:54 -03:00
flow
f432cfd73a
change: put settings initialization in a separate function
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-06 16:18:09 -03:00
Sefa Eyeoglu
ffa756ccee
fix: remove tests for updater
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-06 18:13:51 +02:00
Sefa Eyeoglu
e210a4b244
Revert "fix: remove updater if it is not used"
...
This reverts commit 2ff0aa09e3 .
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-06 18:13:51 +02:00
Sefa Eyeoglu
f1902a4471
Merge pull request #794 from Scrumplex/resolve-jars-dynamically
2022-07-06 17:40:09 +02:00
Sefa Eyeoglu
04b865adae
Merge pull request #707 from Jan200101/PR/gamemode
...
Add Performance related settings
2022-07-06 17:11:43 +02:00
txtsd
00df092a99
chore(readme): Reword and place entry in alphabetical order
...
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com >
2022-07-06 09:34:17 +02:00
Jan200101
cad581388f
Add Performance related settings
...
Integrates support for Feral Gamemode, discrete GPU support for Mesa and the proprietary Nvidia driver and MangoHud support
Signed-off-by: Jan200101 <sentrycraft123@gmail.com >
2022-07-06 09:34:14 +02:00
timoreo
e7ed3abb79
Merge pull request #871 from Scrumplex/configure-dco
2022-07-03 18:16:25 +02:00
flow
e5f6dc1b14
fix: aborts when using a Qt build with assertions enabled
...
Preventing undefined behaviour hooray! :D
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-03 12:44:19 -03:00
flow
145da82cd8
fix: show invalid version even when there's none
...
Having a blank instead of _anything_ is bad UX. Instead, even when
there's not a valid version (most likely disabled redistribution), we
show a message in the UI, to differentiate from the loading state.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-03 12:43:05 -03:00
flow
64776d6bac
feat+fix: cache Flame modpack versions
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-03 12:43:05 -03:00
flow
64d123f524
fix: use better naming for Modrinth pack versions
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-03 12:43:04 -03:00
flow
0ec4ade683
feat+fix: cache versions and extra info in Modrinth packs
...
When you change a copy thinking you're changing the original data smh
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-03 12:43:04 -03:00
flow
4bfc445cf8
fix: add progress indicator on Flame mod resolution dialog
...
This code is super :pofat: omg
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-03 12:43:04 -03:00
flow
4232b1cedb
fix: don't use uniform sizes in Modrinth modpack viewer
...
Apparently, when Qt sees an icon with the height smaller than the rest,
with this option set, it will change the height of all other items to be
that one, causing #828 .
While we do lose some performance changing this option, the issue is
gone, so :|
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-03 12:43:00 -03:00
Sefa Eyeoglu
474d77ac57
feat: resolve JARs dynamically
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-03 17:31:01 +02:00
Sefa Eyeoglu
3c40355d7c
chore(DCO): allow remediation
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-03 17:28:01 +02:00
Sefa Eyeoglu
cbc1aad58d
fix: don't assume stable channel, if tag is unset
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-03 17:23:13 +02:00
Sefa Eyeoglu
89a30a47c5
fix: use semver format for build tag
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-03 17:23:13 +02:00
Sefa Eyeoglu
881a5603dc
feat: hide channel if git tag is set
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-03 17:23:13 +02:00
Sefa Eyeoglu
68c48b2c8a
feat: store git tag in buildconfig
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-03 17:23:13 +02:00
Sefa Eyeoglu
0f9260869b
chore: update Git CMake module
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-03 17:23:13 +02:00
Ezekiel Smith
412fdb0f7b
Merge pull request #870 from Scrumplex/fix-release-build
...
Fix release builds
2022-07-04 00:25:03 +10:00
flow
81d52b6169
Merge pull request #869 from DarkKirb/nix-ecm
...
fix: Add extra-cmake-modules to the nix build
2022-07-03 11:07:11 -03:00
Sefa Eyeoglu
278d2169da
fix: initialize accountIsOnline to fix build
...
CMAKE_BUILD_TYPE=Release makes the build fail otherwise.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-07-03 14:32:31 +02:00
Sefa Eyeoglu
5599b5a337
Merge pull request #855 from Gingeh/account-list
2022-07-03 12:55:36 +02:00
Charlotte 🦝 Delenk
471d6d6031
fix: Add extra-cmake-modules to the nix build
...
Signed-off-by: Charlotte 🦝 Delenk <lotte@chir.rs >
2022-07-03 10:30:45 +01:00
Ezekiel Smith
b90d6b0f26
Merge pull request #857 from Scrumplex/dco
...
Add Developer's Certificate of Origin (DCO)
2022-07-03 16:23:25 +10:00
flow
cd22da9c62
Merge pull request #864 from ivanpu/uncensored-offline
...
Don't censor "offline" word when that's the access token
2022-07-02 17:56:04 -03:00
flow
fb75c23f4e
Merge pull request #784 from Scrumplex/refactor-cmake
...
Refactor tests
2022-07-02 17:50:08 -03:00
Ezekiel Smith
7f22994f68
Merge pull request #831 from flowln/abort_connections
...
Add missing connections to the abort signal in some tasks
2022-07-03 01:50:36 +10:00
Ezekiel Smith
7aba7b6064
Merge pull request #818 from flowln/tiny_mod_icons
...
Always scale mod icons to the right size
2022-07-03 01:49:09 +10:00
Ezekiel Smith
e32030f364
Merge pull request #860 from kthchew/fix/status-version
...
Show MC version of instance in status bar
2022-07-03 01:47:27 +10:00
Ivan Puntiy
b40619bcbd
don't censor offline access token
2022-07-02 18:05:33 +03:00
timoreo
fe2e1d931f
Merge pull request #786 from flowln/concurrent_tasks_slimmed
2022-07-01 20:09:18 +02:00
timoreo
2e17e78052
Merge pull request #845 from flowln/news_in_launcher
2022-07-01 20:04:06 +02:00
Sefa Eyeoglu
f2fa82fd3c
Merge pull request #863 from Scrumplex/fix-braindead-moment
...
update NewLaunch package name
2022-07-01 19:55:01 +02:00
Sefa Eyeoglu
8cec4b60a6
fix: update NewLaunch package name
2022-07-01 19:50:41 +02:00
flow
bf9888099c
Merge pull request #800 from Scrumplex/refactor-newlaunch-package
...
Rename NewLaunch package
2022-07-01 10:05:07 -03:00
flow
02201631e7
feat: use ConcurrentTask for mod downloads
...
Way faster :)
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-01 08:34:17 -03:00
flow
8e80b4bfc1
feat: add ConcurrentTask
...
This tasks (or rather, meta-task) has the ability to run several other
sub tasks concurrently.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-07-01 08:34:10 -03:00
Sefa Eyeoglu
63dfc0633f
Merge pull request #652 from flowln/mod_page
2022-07-01 10:00:36 +02:00
Sefa Eyeoglu
50f1847904
Merge pull request #785 from icelimetea/reformat-javacheck
2022-07-01 10:00:08 +02:00
Kenneth Chew
79840f0fca
Remove redundant type name from status bar
...
The type name is always "Minecraft", so it showed "Minecraft X.X.X (Minecraft)"
2022-06-30 23:02:56 -04:00
Kenneth Chew
06bf7b0f31
Fix Minecraft version not appearing in status bar
2022-06-30 23:02:56 -04:00
Gingeh
dbb63b97bd
Merge branch 'PolyMC:develop' into account-list
2022-07-01 10:43:41 +10:00
Sefa Eyeoglu
3039cb5c02
chore: add DCO requirement
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-06-30 16:37:13 +02:00
Gingeh
b5d2570fe2
Change Online status to Ready
2022-06-30 22:17:15 +10:00
flow
5f951e8f21
change: better regex for removing 'The' when sorting mods
...
Teh :|
Co-authored-by: timoreo22 <timo.oreo34@gmail.com >
2022-06-30 07:04:47 -03:00
Sefa Eyeoglu
286f82cc99
Merge pull request #826 from kthchew/fix/kill-menubar
2022-06-30 11:50:43 +02:00
timoreo22
ed5415aeb8
Merge pull request #837 from DioEgizio/fix-sort-mr
2022-06-30 08:24:51 +02:00
Gingeh
bef79df6bb
Disable the refresh button for offline accounts
2022-06-30 09:08:53 +10:00
Gingeh
2edabe0f99
Merge remote-tracking branch 'origin/account-list' into account-list
...
# Conflicts:
# launcher/minecraft/auth/AccountData.cpp
2022-06-30 09:00:21 +10:00
Gingeh
91b5f0228d
add tr() to offline account name
...
Co-authored-by: flow <flowlnlnln@gmail.com >
2022-06-30 08:59:41 +10:00
Gingeh
d639da741b
add tr() to offline account name
...
Co-authored-by: flow <flowlnlnln@gmail.com >
2022-06-30 08:49:40 +10:00
Gingeh
84bd5ace6c
Move account checkboxes to the profile column (oops)
2022-06-29 19:58:41 +10:00
Gingeh
63589d2ba9
Rename profile column to username and update the tooltip
2022-06-29 18:49:06 +10:00
Gingeh
d6f4ff26b5
Disable skin buttons for offline accounts
2022-06-29 18:46:39 +10:00
Gingeh
b606a2e040
Make the profile and account name columns use all available space
2022-06-29 18:45:36 +10:00
Gingeh
f685139d89
Move the profile name column to the left
2022-06-29 18:43:29 +10:00
Gingeh
68d6ce60a9
Don't show account name for offline accounts
2022-06-29 18:42:01 +10:00
Russell Banks
2bba64fe3a
Create winget.yml
2022-06-28 12:11:52 +01:00
Ezekiel Smith
774ed044fc
Merge pull request #827 from kthchew/fix/menubar-separator
...
Workaround Qt bug to fix menu bar separators on macOS
2022-06-27 01:14:15 +10:00
Ezekiel Smith
9cc235cde0
Merge pull request #811 from jn64/fix/window-title
...
Fix duplicate name in window title
2022-06-27 01:13:58 +10:00
Ezekiel Smith
91375e4c6d
Merge pull request #834 from DioEgizio/reword-flame-warning
...
chore(flame): reword warning
2022-06-27 01:12:18 +10:00
flow
0ef8da64e0
Merge pull request #724 from Zetvue/patch-1
...
* Resize PolyMC logo
Co-authored-by: Tatsuya Noda <topia@clovery.jp >
2022-06-26 08:31:18 -03:00
flow
9ef38171e2
fix: use clicked instead of pressed signal for button clicks
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-06-26 08:10:52 -03:00
flow
455e4de6f3
feat: add news reader dialog
...
Makes it easier to read about new blog posts! Yay :D
2022-06-25 20:15:16 -03:00
flow
4e319254dd
fix: use right name for the content of a News entry
2022-06-25 20:14:27 -03:00
DioEgizio
04e8780dd0
fix(modrinth): fix sorting
2022-06-24 10:47:02 +02:00
DioEgizio
0fe4384067
Update launcher/ui/pages/modplatform/flame/FlamePage.ui
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-06-23 17:58:54 +02:00
DioEgizio
bdfcd0b99e
chore(flame): reword warning
2022-06-23 17:06:49 +02:00
flow
5da87d1904
fix: add missing connections to the abort signal
...
Beginning with efa3fbff39 , we separated
the failing and the aborting signals, as they can mean different
things in certain contexts. Still, some places are not yet changed to
reflect this modification. This can cause aborting of progress dialogs
to not work, instead making the application hang in an unusable satte.
This goes through some places where it's not hooked up yet, fixing their
behaviour in those kinds of situation.
2022-06-22 20:20:39 -03:00
flow
821edf0f51
Merge pull request #830 from Scrumplex/fix-launchermeta
...
Replace old reference to launchermeta
2022-06-22 18:12:20 -03:00
Sefa Eyeoglu
04e822acfb
fix: remove old reference to launchermeta
2022-06-22 20:47:47 +02:00
Kenneth Chew
c31fce3621
Workaround Qt bug to fix menu bar separators on macOS
2022-06-22 00:34:04 -04:00
Kenneth Chew
5c05cf2206
Disable launch actions in menu bar when last instance is deleted
...
This caused a crash when the action was selected!
2022-06-21 19:19:55 -04:00
Kenneth Chew
d4e544c62c
Separate the kill and launch instance actions
2022-06-21 19:19:55 -04:00
Ezekiel Smith
d232248268
Merge pull request #807 from Scrumplex/lgtm-config
...
Add LGTM config
2022-06-22 01:14:08 +10:00
Ezekiel Smith
90025ed45d
Merge pull request #812 from jn64/fix/about-labels
...
Make version labels in About dialog selectable
2022-06-22 01:13:43 +10:00
Ezekiel Smith
964151d9c7
Merge pull request #817 from flowln/zip_ensure_path
...
Don't create unnecessary folders when extracting ZIPs
2022-06-22 01:13:23 +10:00
Ezekiel Smith
409c9bf9d2
Merge pull request #778 from Scrumplex/track-real-architecture
...
Track real CPU architecture for instances
2022-06-22 01:13:10 +10:00
flow
a135c06bcf
fix: scale mod icons to the right size
2022-06-21 06:41:56 -03:00
Sefa Eyeoglu
efb1f4abf2
Merge pull request #797 from kthchew/fix/update-shortcut
2022-06-21 11:29:15 +02:00
Sefa Eyeoglu
036a826b3a
Merge pull request #788 from kthchew/fix/win-install-version
2022-06-21 11:29:06 +02:00
Sefa Eyeoglu
8d2b66a0fd
Merge pull request #715 from Heath123/patch-1
2022-06-21 11:18:37 +02:00
Ezekiel Smith
31d6278b31
Merge pull request #729 from OldWorldOrdr/develop
...
Update bug_report.yml to use latest version as the version suggestion
2022-06-21 01:12:04 +10:00
OldWorldOrdr
5558d7eef8
Update bug_report.yml
2022-06-20 11:03:22 -04:00
OldWorldOrdr
6103d86a47
Merge branch 'PolyMC:develop' into develop
2022-06-20 11:02:40 -04:00
flow
b8899a534d
Merge pull request #633 from Scrumplex/chore-remove-unused-workflows
...
Remove unused GH Workflows
2022-06-20 11:42:53 -03:00
jn64
fa6829a6a1
Set beam cursor on selectable labels
2022-06-20 14:28:38 +08:00
jn64
5335540c33
Rename main window
2022-06-20 13:45:36 +08:00
flow
7f62de3854
fix: don't create unnecessary folders when extracting ZIPs
2022-06-19 22:03:02 -03:00
jn64
0afa2e92d5
Make GitHub link focusable by keyboard
2022-06-18 22:20:38 +08:00
jn64
6d1b166ad7
Make labels selectable
...
User can copy version/build info easily.
2022-06-18 22:19:23 +08:00
jn64
4b6ddfb89b
Add version to Qt applicationDisplayName
2022-06-18 20:00:28 +08:00
Sefa Eyeoglu
9ec260619b
fix: fix warnings reported by LGTM.com
2022-06-17 16:34:32 +02:00
Sefa Eyeoglu
4c6ac9e4fe
chore: add LGTM config
2022-06-17 16:24:06 +02:00
Sefa Eyeoglu
08fc3ea2e0
fix: add classpath exception to launcher library
...
Signed-off-by: icelimetea <fr3shtea@outlook.com >
2022-06-16 17:58:38 +02:00
flow
03e454b71d
Merge pull request #694 from Technous285/develop-1
...
Add OpenBSD support
2022-06-15 06:32:14 -03:00
flow
c527ea83fb
Merge pull request #799 from DioEgizio/fix-oopsie
...
fix websiteurl in cf modpacks (part 2)
2022-06-15 06:28:09 -03:00
Sefa Eyeoglu
8b9ac63657
chore: update COPYING.md
2022-06-15 10:15:35 +02:00
Sefa Eyeoglu
0ba02f0830
refactor: rename NewLaunch package
2022-06-15 10:05:35 +02:00
DioEgizio
1f6cef6f8a
fix https://github.com/PolyMC/PolyMC/issues/798
2022-06-15 09:11:23 +02:00
Kenneth Chew
251942323e
Deselect desktop shortcut by default
...
Follows the guidelines at https://docs.microsoft.com/en-us/windows/win32/uxguide/winenv-desktop
2022-06-15 00:46:34 -04:00
Kenneth Chew
8e3efec40f
Unselect shortcut installation by default if PolyMC is already installed
...
This is the same behavior as the `/NoShortcuts` switch.
2022-06-15 00:41:52 -04:00
Sefa Eyeoglu
3d0740f80e
fix(cmake): allow disabling tests
2022-06-14 21:42:44 +02:00
txtsd
707a68cb4f
Merge pull request #787 from DioEgizio/macos-12-gha
...
update macos runner to macos 12
2022-06-14 23:30:41 +05:30
Ezekiel Smith
e6b1a1fa76
Merge pull request #716 from flowln/mod_perma_2
...
Hide index folder on Windows
2022-06-14 23:58:35 +10:00
Ezekiel Smith
3e8d450741
Merge pull request #665 from jamierocks/h-managed-packs
...
PackPlatforms: Record where packs come from
2022-06-14 23:54:44 +10:00
Ezekiel Smith
d0881b7420
Merge pull request #731 from Scrumplex/update-readme-macstadium
...
Add sponsors to README
2022-06-14 23:52:38 +10:00
Ezekiel Smith
27239b2dde
Merge pull request #634 from flowln/donate_links
...
More links for CF / Modrinth mods / modpacks
2022-06-14 23:52:00 +10:00
Sefa Eyeoglu
3fbbaddece
fix(actions): install extra-cmake-modules
2022-06-14 14:44:49 +02:00
Sefa Eyeoglu
effe46db86
refactor: move away from UnitTest.cmake
2022-06-14 14:44:49 +02:00
Sefa Eyeoglu
ba939c92ec
feat(actions): test before packaging
2022-06-14 14:44:49 +02:00
Sefa Eyeoglu
e25cdd9d12
refector: move download action to ExternalResourcesPage
2022-06-14 07:04:31 -03:00
flow
d394235ee0
refactor: Create a more clear hierarchy for some instance pages
...
Previously, the Shaders, Texture packs and Resource packs tabs had as
parent the ModFolderPage, making it so that making changes only to the
Mods page would require checking the id of the page for the correct one.
This was hackish and error-prone.
Now, those pages all inherit from a single class, ExternalResourcesPage,
that handles the basic behaviour of all of them, while allowing for
individual modification in code.
This is still not a clear separation, since internally, all those
resources are derived from Mods, so for now there's still some awkward
common code :/
2022-06-14 07:04:31 -03:00
Sefa Eyeoglu
349fc4143d
Merge pull request #714 from Scrumplex/fix-tests
...
Fix mod metadata tests
2022-06-13 23:10:35 +02:00
Sefa Eyeoglu
4be9e6a0bc
refactor: make is_indexed false by default
...
Co-authored-by: flow <flowlnlnln@gmail.com >
2022-06-13 22:07:42 +02:00
Sefa Eyeoglu
cb258146c4
Merge pull request #782 from Scrumplex/chore-bump-1.4.0
2022-06-13 22:05:40 +02:00
Kenneth Chew
9f039cef72
Set correct installer properties and uninstall registry keys
2022-06-12 14:21:56 -04:00
Sefa Eyeoglu
d08815bbc1
Merge pull request #759 from flowln/mod_perma_3
2022-06-12 19:17:08 +02:00
DioEgizio
c04e38d011
update macos runner to macos 12
2022-06-12 19:13:19 +02:00
flow
794022d399
Merge pull request #783 from Scrumplex/fix-avoid-settings-register-warnings
...
Avoid re-registering InstanceType
2022-06-12 13:46:46 -03:00
icelimetea
8e43190984
Compile JavaCheck for Java 7
2022-06-12 17:46:40 +01:00
Sefa Eyeoglu
2212a6e40f
Merge pull request #679 from kthchew/fix/win-install-version
2022-06-12 18:12:42 +02:00
icelimetea
63b69c0b0c
Change formatting of JavaCheck
2022-06-12 16:29:39 +01:00
Sefa Eyeoglu
278219b1d8
fix(installer): use Windows version number format
2022-06-12 16:24:05 +02:00
Sefa Eyeoglu
2ce4ce9064
fix(installer): add version info to installer
2022-06-12 14:52:54 +02:00
flow
4448418b63
fix: segfault when the same mod is present enabled and disabled at once
...
This maintains the previous behaviour
2022-06-12 09:44:03 -03:00
flow
9f1f37e780
fix: correctly handle disabled mods with metadata
...
im stupid
2022-06-12 09:25:25 -03:00
flow
40ccd1a469
fix: handling of incomplete mods
...
(i.e. mods without ModDetails that may have metadata)
2022-06-12 09:25:21 -03:00
Sefa Eyeoglu
a4ef0940ed
chore: add license headers
2022-06-12 13:50:58 +02:00
Sefa Eyeoglu
2ff0aa09e3
fix: remove updater if it is not used
2022-06-12 13:39:47 +02:00
Sefa Eyeoglu
32217a774f
fix(tests): wait until ModFolderModel has updated
2022-06-12 13:33:17 +02:00
Sefa Eyeoglu
8856c8cd62
refactor(test): fix loading mod metadata setting
2022-06-12 13:33:17 +02:00
flow
e843b8e188
fix(test): fix packwiz test
2022-06-12 13:33:17 +02:00
Sefa Eyeoglu
c4f2e3a955
Merge pull request #771 from flowln/modrinth_multiple_downloads
2022-06-12 10:50:57 +02:00
Sefa Eyeoglu
91301ec7fe
Merge pull request #632 from ryanccn/macos-app-heuristic
2022-06-12 10:46:49 +02:00
Ryan Cao
13b03e7e50
Update Application.cpp
2022-06-12 11:44:04 +08:00
Sefa Eyeoglu
8a0aa5a0c8
fix: avoid re-registering InstanceType
2022-06-11 23:06:42 +02:00
dada513
2bd8e7dca4
Merge pull request #780 from flowln/guo_ext_2
2022-06-11 19:45:51 +02:00
dada513
d75571ffa1
Merge pull request #773 from vancez/fix-launch-button
2022-06-11 19:41:02 +02:00
Sefa Eyeoglu
8683d529fc
chore: bump version
2022-06-11 19:35:40 +02:00
dada513
2ee4b6768d
Merge pull request #770 from flowln/technic_links
2022-06-11 19:34:59 +02:00
dada513
a9f0a85590
Merge pull request #764 from Scrumplex/fix-compile-flags
2022-06-11 19:34:01 +02:00
flow
37160f973f
fix: account for the dequeued url when checking the number of urls
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-06-11 14:31:50 -03:00
dada513
9bbf50e864
Merge pull request #720 from icelimetea/fix-legacy-issues
2022-06-11 19:29:59 +02:00
Sefa Eyeoglu
51258ab28c
Merge pull request #709 from Scrumplex/fix-instancetypes
...
Always store InstanceType
2022-06-11 19:29:46 +02:00
flow
29e5a213a5
fix: dequeue first added file in mrpack import
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-06-11 14:19:51 -03:00
Sefa Eyeoglu
2d261607df
Merge pull request #732 from MrMelon54/develop
2022-06-11 19:14:26 +02:00
flow
54144154f9
fix: apply client overrides in mrpacks
...
another oopsie x.x
2022-06-11 13:44:31 -03:00
Sefa Eyeoglu
81daffe68e
fix: remove file filter from translation
2022-06-11 14:10:42 +02:00
flow
2ea20a8b29
fix: allow discovering mrpacks in languages without dot
2022-06-11 07:12:59 -03:00
Sefa Eyeoglu
2257c875f5
Merge pull request #708 from ryanccn/custom-user-agent
2022-06-11 10:53:58 +02:00
Sefa Eyeoglu
8a2e8ad953
feat: track real CPU architecture for instances
2022-06-11 10:48:58 +02:00
Vance
fa5b1d9978
change slot name
2022-06-10 15:48:18 +08:00
Ryan Cao
529fb07b42
I changed my mind
2022-06-10 15:18:47 +08:00
Vance
4a261cac1a
fix: update toolbar when instance state changes
2022-06-10 10:25:13 +08:00
flow
b3c8f9d508
revert: don't check modrinth whitelisted hosts
...
people didn't seem to like it, and its not required
2022-06-09 19:57:51 -03:00
flow
1b878030aa
fix: enable using more than one download url in mrpacks
...
Kinda, it's ugly and hackish, since we don't have the facilities to
do this properly (yet!)
2022-06-09 19:54:50 -03:00
flow
46e403b20b
fix: properly parse mrpacks without the 'env' field
...
It's optional, so some files may not have it (like most of FO).
2022-06-09 19:53:29 -03:00
flow
1b1f728c58
fix: allow opening external links in technic modpack page
2022-06-09 18:46:19 -03:00
txtsd
309013efb3
Merge pull request #762 from muscaln/flake
...
Bump flake lock
2022-06-09 05:58:42 +05:30
txtsd
705cf6499e
Merge pull request #734 from babbaj/extra-jdks
...
nix: add package argument for extra jdks
2022-06-09 05:57:23 +05:30
Zetvue
f2ed4a92e2
Update README.md
...
Co-authored-by: Tatsuya Noda <topia@clovery.jp >
2022-06-08 15:55:28 -04:00
Sefa Eyeoglu
0c8ca1b3c0
fix: remove debug CXX flags
2022-06-08 21:04:27 +02:00
Mustafa Çalışkan
6ee5ee496e
flake.lock: Update
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/41cc1d5d9584103be4108c1815c350e07c807036' (2022-05-23)
→ 'github:nixos/nixpkgs/43ecbe7840d155fa933ee8a500fb00dbbc651fc8' (2022-06-08)
2022-06-08 14:32:08 +03:00
Zetvue
7f8aa2099c
Make it responsive
2022-06-07 18:58:02 -04:00
MrMelon
1d9797660b
QString::locateAwareCompare() is better for human-like sorting
2022-06-07 15:27:57 +01:00
Sefa Eyeoglu
cd0d8a76c5
chore: add sponsors to README
2022-06-07 10:33:09 +02:00
Babbaj
3f1251e78b
nix: add package argument for extra jdks
2022-06-06 22:13:10 -04:00
MrMelon
89d4405563
Simplify sorting logic to a single std::sort call
2022-06-06 22:18:19 +01:00
flow
8966364648
Merge pull request #685 from kthchew/fix/technic-quilt
...
Add Quilt support for Technic modpacks
2022-06-06 18:03:05 -03:00
MrMelon
1c60e9b4fc
Add initial sorting function
2022-06-06 21:51:08 +01:00
OldWorldOrdr
843c860d98
Update bug_report.yml
2022-06-06 13:52:50 -04:00
Zetvue
6587e39992
Resize PolyMC logo
2022-06-05 18:05:09 -04:00
Ryan Cao
757fa1410c
Update launcher/Application.cpp
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-06-05 23:52:21 +08:00
icelimetea
dd6d8e0002
Make Launcher class to look more like original
2022-06-05 02:43:14 +01:00
icelimetea
cd49406bfe
Fix launching process for some legacy Forge versions
2022-06-05 01:18:59 +01:00
Sefa Eyeoglu
7a3acc3249
refactor(ui): use tabs for APIPage
2022-06-04 22:04:36 +02:00
Sefa Eyeoglu
db1c804812
Merge pull request #718 from DioEgizio/revert-unfunny-pr
2022-06-04 21:49:15 +02:00
flow
493d58f358
Merge pull request #719 from RaptaG/patch-1
...
Capitalization fix in the README
2022-06-04 16:16:15 -03:00
RaptaG
fcd56dddc2
Capitalization fix
2022-06-04 22:08:35 +03:00
DioEgizio
91b85f9919
Revert "Merge pull request #315 from txtsd/display_scaling"
...
This reverts commit fcf728f3b5 .
2022-06-04 17:09:11 +02:00
Ryan Cao
4cecba8787
make $LAUNCHER_VER actually work
2022-06-04 22:59:57 +08:00
Ryan Cao
5930acc418
change UI to scroll
...
let me just say, this does not look right
2022-06-04 22:54:05 +08:00
circuit10
61d36c1723
Clarify the forking policy a bit more
2022-06-04 15:20:49 +01:00
flow
c2a43c6f40
fix: hide .index folder on Windows
2022-06-04 11:02:59 -03:00
Sefa Eyeoglu
1ab00ca8b2
Merge pull request #426 from flowln/mod_perma
...
Add on-disk mod metadata information
2022-06-04 13:23:38 +02:00
Sefa Eyeoglu
778baa6dbe
fix: always store InstanceType
2022-06-04 11:59:12 +02:00
Ryan Cao
25ab121e42
feat: custom user-agent
2022-06-04 15:33:17 +08:00
TheOPtimal
cf4949b4f5
Prepare for Nix 2.7 ( #286 )
...
* Prepare for Nix 2.7
* Fix embarassing oopsie
2022-06-03 22:26:46 -03:00
Sefa Eyeoglu
4ca634d229
Merge pull request #701 from jn64/patch-1
...
Add "mc" keyword to desktop file
2022-06-03 09:30:36 +02:00
jn64
ca21b31696
Add "mc" keyword to desktop file
...
Certain launchers (e.g. GNOME) only search from word boundaries, so typing "mc" doesn't currently match to "PolyMC".
2022-06-03 09:58:57 +08:00
Technous285
38ff76d2b8
Add OpenBSD support
...
Adds OpenBSD support.
2022-06-02 02:02:42 +10:00
Sefa Eyeoglu
147bde5294
Merge pull request #692 from glowiak/patch-6
2022-06-01 17:46:12 +02:00
glowiak
1a004f0c4d
Update MCEditTool.cpp
2022-06-01 15:50:43 +02:00
glowiak
7d21bf15e8
Update UpdateController.cpp
2022-06-01 15:50:02 +02:00
Sefa Eyeoglu
a88ad8025b
Merge pull request #682 from istudyatuni/fix-add-account-behaviour
2022-06-01 10:13:35 +02:00
Ryan Cao
e06bf17d13
Merge branch 'PolyMC:develop' into macos-app-heuristic
2022-06-01 00:12:14 +08:00
Sefa Eyeoglu
04a3669fc4
Merge pull request #687 from PolyMC/LennyMcLennington-patch-1
...
Change forking policy a bit
2022-05-31 08:22:33 +02:00
LennyMcLennington
795075f90d
Update README.md
2022-05-30 23:59:48 +01:00
LennyMcLennington
2727df704f
change the wording a bit
2022-05-30 23:52:12 +01:00
LennyMcLennington
8ce8aadd9b
fix typo
2022-05-30 23:50:35 +01:00
LennyMcLennington
2999e69f0f
Change forking policy a bit
...
Ask people forking PolyMC to make it clear that their fork is not endorsed by us.
2022-05-30 23:05:29 +01:00
Kenneth Chew
7ac16ed073
Use QStringList instead of QSet<QString>
...
Co-authored-by: flow <flowlnlnln@gmail.com >
2022-05-30 14:40:20 -04:00
Kenneth Chew
3585e4764b
Add Quilt support for Technic modpacks
2022-05-30 14:14:03 -04:00
Kenneth Chew
065e38c6aa
Move Windows installer configure to program_info
2022-05-30 12:56:29 -04:00
Sefa Eyeoglu
9054ee18a1
Merge pull request #505 from flowln/improve_download_ux
2022-05-30 13:41:02 +02:00
Ilia
9d8b95107d
fix: do not show the "profile select" dialog if the user refused to add an account
2022-05-30 13:33:07 +03:00
Kenneth Chew
8731c86d0d
Use CMake for Windows installer branding
...
As a side effect, fixes an issue where the installer wrote the incorrect version to the registry.
2022-05-29 19:50:44 -04:00
Sefa Eyeoglu
d7fad4bd04
Merge pull request #677 from timoreo22/fix-modrinth-link
...
Fix modrinth search filters
2022-05-29 18:36:03 +02:00
timoreo
2746251dcd
Fix modrinth search filters
2022-05-29 18:23:34 +02:00
Sefa Eyeoglu
73e46e569f
Merge pull request #662 from Scrumplex/chore-bump-1.3.1
2022-05-29 17:05:02 +02:00
flow
4f0f74d201
Merge pull request #675 from muscaln/nix
...
Nix updates
2022-05-29 11:21:47 -03:00
Sefa Eyeoglu
adf1e1982a
fix: remove unnecessary translation ( #674 )
2022-05-29 16:14:01 +02:00
Sefa Eyeoglu
f5405e835e
Merge pull request #624 from ryanccn/global-jvm-args
...
Make global JVM arguments multi-line
2022-05-29 16:10:55 +02:00
Sefa Eyeoglu
85ee7fb3a4
Merge pull request #672 from Scrumplex/fix-ftblegacy-pack-version
...
fix: add version to Legacy FTB packs
2022-05-29 16:10:43 +02:00
Mustafa Çalışkan
ee00a5d8ee
nix: make LTO optional
2022-05-29 17:07:12 +03:00
Sefa Eyeoglu
65d23fc9b9
Merge pull request #671 from Scrumplex/fix-importing-flame-mmc-packs
2022-05-29 15:15:18 +02:00
txtsd
3448d7cb70
Merge pull request #659 from Scrumplex/fix-apikey-tos
...
Clarify terms and conditions for API keys
2022-05-29 18:44:32 +05:30
Sefa Eyeoglu
db1abb02d6
Merge pull request #661 from flowln/wow_curseforge_is_being_uncompetitive_im_so_surprised
2022-05-29 14:42:49 +02:00
Ezekiel Smith
36d78577e2
Merge pull request #669 from Scrumplex/fix-binary-version-windows
...
Set version for Windows binaries
2022-05-29 22:37:23 +10:00
Ryan Cao
20832682ef
Update launcher/ui/pages/global/JavaPage.cpp
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-05-29 20:35:57 +08:00
Sefa Eyeoglu
8e6c592ad9
fix: add version to Legacy FTB packs
2022-05-29 14:28:54 +02:00
Sefa Eyeoglu
0b3115997a
fix: fix importing Flame/MMC packs
2022-05-29 14:16:13 +02:00
Sefa Eyeoglu
b07c5982e1
fix: set version for Windows binaries
2022-05-29 13:09:13 +02:00
Sefa Eyeoglu
4a0b0d8735
Merge pull request #653 from muscaln/nix
2022-05-29 13:08:56 +02:00
Sefa Eyeoglu
7b9f67f4b4
Merge pull request #667 from DioEgizio/patch-7
2022-05-29 13:07:25 +02:00
DioEgizio
577f17c916
remove vista support from the manifest
...
we don't support qt <5.12 anymore anyways
2022-05-29 09:45:20 +02:00
Ryan Cao
d4c1d62781
Update launcher/ui/pages/global/JavaPage.cpp
...
Co-authored-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com >
2022-05-29 12:15:20 +08:00
Jamie Mansfield
80da1f1bb9
ATLauncher: Use ATLauncher rather than FTB in error messages
2022-05-29 00:04:28 +01:00
Jamie Mansfield
febdb85f96
ModpacksCH: Use ModpacksCH rather than FTB in error messages
2022-05-29 00:04:28 +01:00
Jamie Mansfield
96b76c8f5c
ModpacksCH: Make packs managed when installing
2022-05-29 00:04:27 +01:00
Jamie Mansfield
411bf3be03
ATLauncher: Make packs managed when installing
2022-05-29 00:04:27 +01:00
Jamie Mansfield
a98b6663e1
ATLauncher: Pass the full pack name through to the install task
2022-05-29 00:04:27 +01:00
Jamie Mansfield
e7f35e6ca3
API: Add settings to support managed packs
...
Managed packs means an installation of a modpack through a modpack
provider. Managed packs track their origins (pack platform, name, id),
so that in future features can exist around this - such as updating, and
reinstalling.
2022-05-29 00:04:26 +01:00
flow
f0ec165d42
feat: add warning of non-whitelisted URLs instead of a hard fail
...
Based on people's votes on Discord :^)
2022-05-28 18:04:16 -03:00
Lenny McLennington
abd240468e
clean up validateDownloadUrl
2022-05-28 17:11:55 -03:00
flow
b5e00027d1
change: add 'gitlab.com' to whitelisted Modrinth modpack urls
2022-05-28 17:01:58 -03:00
flow
1698554024
debug: add non-translated debug logging for 'non-whitelisted url' fails
2022-05-28 17:01:57 -03:00
flow
f4604bbf79
change: update whitelisted hosts in Modrinth modpacks
2022-05-28 17:01:52 -03:00
timoreo22
699ad316f0
Rework curseforge download ( #611 )
...
* Use the bulk endpoint on mod resolution for faster download
* Search on modrinth for api blocked mods
* Display a dialog for manually downloading blocked mods
2022-05-28 21:53:12 +02:00
timoreo22
fcbe233fdb
Merge pull request #651 from Scrumplex/fix-mnemonic-apipage
...
Fix mnemonics in APIPage
2022-05-28 15:46:38 +02:00
timoreo22
4af8a9ed2d
Merge pull request #650 from flowln/modrinth_icons
...
Fix modpack icon importing with non-standard icon paths
2022-05-28 15:45:26 +02:00
Sefa Eyeoglu
80627b4f89
chore: bump version
2022-05-28 15:42:54 +02:00
timoreo22
83078cd49a
Merge pull request #657 from JJL772/fix/misc-fixes
...
Fix crash when aborting instance import
2022-05-28 15:38:36 +02:00
timoreo22
53e0d13142
Merge pull request #625 from ryanccn/light-macos-icon
...
Use light background macOS icon
2022-05-28 15:36:26 +02:00
timoreo22
85901082a2
Merge pull request #639 from Scrumplex/fix-prio-modpack-formats
...
Prefer stricter modpack formats during import
2022-05-28 15:36:18 +02:00
timoreo22
f19e27e875
Merge pull request #629 from kthchew/feature/desktop-shortcut
...
Add desktop shortcut to Windows installer
2022-05-28 15:36:12 +02:00
timoreo22
c864046cee
Merge pull request #623 from ryanccn/clang-format
...
Add a .clang-format
2022-05-28 15:36:01 +02:00
Ryan Cao
2d68235e55
Merge branch 'develop' into global-jvm-args
2022-05-28 21:15:19 +08:00
Ryan Cao
2be8100e7c
Merge branch 'develop' into global-jvm-args
2022-05-28 21:15:00 +08:00
Sefa Eyeoglu
ab3e2562db
fix: clarify terms and conditions for API keys
2022-05-28 13:52:22 +02:00
Mustafa Çalışkan
123d6c72e4
nix: fix nix-build
2022-05-28 11:32:16 +03:00
Mustafa Çalışkan
0ea2135aa5
nix: initial support for qt6
2022-05-28 11:32:13 +03:00
Jeremy Lorelli
48e20cb5f7
Fix crash when aborting instance import
...
Also turned a loop var into a reference to avoid copies on each iteration
2022-05-27 16:41:57 -07:00
Mustafa Çalışkan
0ffe0b6894
nix: move files to nix/
2022-05-27 22:56:42 +03:00
Mustafa Çalışkan
338156500b
nix: override msa id via cmake flag
2022-05-27 22:56:42 +03:00
Mustafa Çalışkan
bfd9bd43c9
flake.lock: update
...
• Updated input 'flake-compat':
'github:edolstra/flake-compat/64a525ee38886ab9028e6f61790de0832aa3ef03' (2022-03-25)
→ 'github:edolstra/flake-compat/b4a34015c698c7793d592d66adbab377907a2be8' (2022-04-19)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/30d3d79b7d3607d56546dd2a6b49e156ba0ec634' (2022-03-25)
→ 'github:nixos/nixpkgs/41cc1d5d9584103be4108c1815c350e07c807036' (2022-05-23)
• Removed input 'quazip'
2022-05-27 22:56:42 +03:00
Mustafa Çalışkan
283e50e670
nix: use nixpkgs's quazip
2022-05-27 22:56:40 +03:00
Sefa Eyeoglu
6fb5bb6a5e
fix: fix mnemonics in APIPage
2022-05-27 14:50:06 +02:00
flow
5d3bef32ca
fix: use absolute path when installing icons
2022-05-27 09:15:32 -03:00
flow
3ff26d5cfe
Merge pull request #642 from ryanccn/metaserver-show-default
...
Show default metaserver in settings
2022-05-26 20:09:07 -03:00
flow
88c1e504b0
Merge pull request #618 from DioEgizio/patch-6
...
fix appimage not having imageformats
2022-05-26 20:03:03 -03:00
Sefa Eyeoglu
0263677e1f
fix: prefer stricter modpack formats during import
...
Flame modpacks use "manifest.json" as their only characteristic for
identification. Some modpacks might have other files called
"manifest.json", which is why we should prefer modpack formats that have
a stricter structure.
2022-05-26 22:41:20 +02:00
Sefa Eyeoglu
940455f81c
Merge pull request #645 from PolyMC/revert-609-feature/fix-blocked-modpacks
2022-05-26 19:20:39 +02:00
Ryan Cao
f541ea659c
better new icon
2022-05-26 18:16:32 +08:00
Sefa Eyeoglu
938cae1130
revert: remove CurseForge workaround for packs too
...
Partial revert. Handles missing download URLs.
2022-05-25 23:14:13 +02:00
Sefa Eyeoglu
7f73e57c67
Merge pull request #630 from jamierocks/h-atl-depends
2022-05-25 14:52:34 +02:00
Ryan Cao
e50ec31351
fix
2022-05-25 14:44:47 +08:00
Ryan Cao
a28fa219d7
fix indent width
2022-05-25 14:21:09 +08:00
Ryan Cao
8a1ba03bcb
show default metaserver
2022-05-25 11:46:15 +08:00
flow
f8e7fb3d48
fix: better handle corner case
2022-05-24 20:27:25 -03:00
Sefa Eyeoglu
e8b7e70ec9
Merge pull request #637 from byquanton/patch-1
2022-05-24 20:53:19 +02:00
byquanton
67c5aa0be9
Update org.polymc.PolyMC.metainfo.xml.in
...
Should fix Flatpak/Flathub build
2022-05-24 17:44:23 +02:00
flow
e644380160
feat: add links to curseforge modpacks
2022-05-24 12:27:32 -03:00
flow
c5eb6fe6fb
feat: add links for curseforge mods
...
NOT DOWNLOAD LINKS! (someone would ask it i'm sure :p)
2022-05-24 12:14:08 -03:00
flow
ae2ef324f2
feat: add remaining links to modrinth mods
2022-05-24 11:58:11 -03:00
flow
d0337da8ea
feat: add remaining links to modrinth modpacks
2022-05-24 11:52:27 -03:00
Ryan Cao
17b30b2ae2
clean up .clang-format
2022-05-24 22:37:00 +08:00
flow
5e17d53c7f
fix: missing tr() and update donate message
2022-05-24 11:11:40 -03:00
flow
22e0527502
feat: add donate info to modrinth modpacks
2022-05-24 09:46:58 -03:00
flow
ca3c6c5e8a
feat: add donate links for modrinth mods
2022-05-24 09:38:48 -03:00
Sefa Eyeoglu
4bd30f5e72
chore: remove unused GH Workflows
2022-05-24 14:17:44 +02:00
Sefa Eyeoglu
3cc26b15a1
Merge pull request #631 from kthchew/fix/quazip-warn
2022-05-24 10:25:04 +02:00
Ryan Cao
9673dac22b
add more #ifdefs
2022-05-24 16:18:02 +08:00
Ryan Cao
0426149580
standard macOS app behavior
2022-05-24 13:35:01 +08:00
Kenneth Chew
fce5c57548
Silence CMake QuaZip not found warnings
...
These are expected most of the time, and thus just noise.
2022-05-23 17:27:35 -04:00
Jamie Mansfield
4ee5264e24
ATLauncher: Delete files from configs if they conflict with a mod
2022-05-23 21:44:01 +01:00
Jamie Mansfield
101ca60b2b
ATLauncher: Handle extra arguments depends
2022-05-23 20:57:15 +01:00
Jamie Mansfield
f28a0aa666
ATLauncher: Handle main class depends
2022-05-23 20:57:14 +01:00
Kenneth Chew
997bf91442
Add desktop shortcut to Windows installer
2022-05-23 14:15:49 -04:00
flow
5a1de15332
fix: use a more robust method of finding metadata indexes
...
Often times, mods can have their name in different forms, changing one
letter to caps or the other way (e.g. JourneyMaps -> Journeymaps).
This makes it possible to find those as well, which is not perfect by
any means, but should suffice for the majority of cases.
2022-05-23 14:58:15 -03:00
flow
42f8ec5b14
fix: do modrinth changes on flame too
...
Also fix a dumb moment
2022-05-23 14:58:14 -03:00
flow
2fc1b99911
chore: add license headers
...
Prevents a massive inload of Scrumplex ditto's :)
I didn't add it to every file modified in this PR because the other
changes are pretty minor, and would explode the diff of the PR. I hope
that's not a problem O_O
2022-05-23 14:58:14 -03:00
flow
3a923060ce
fix: use correct hash_type when creating metadata
...
also fix: wrong parameter name in LocalModUpdateTask's constructor
also fix: correct hash_format in CF
2022-05-23 14:58:14 -03:00
flow
0985adfd74
change: support newest changes with packwiz regarding CF
2022-05-23 14:58:08 -03:00
flow
59d628208b
feat: allow trying to use multiple hash types
2022-05-23 14:43:31 -03:00
flow
5c5699bba5
refactor: move individual pack version parsing to its own function
2022-05-23 14:43:31 -03:00
flow
67e0214fa5
fix: don't try to delete mods multiple times
...
Shows a more helpful message if there's a parsing error when reading the
index file.
Also fixes a clazy warning with using the `.data()` method in a
temporary QByteArray object.
2022-05-23 14:43:10 -03:00
flow
e17b6804a7
fix: implement PR suggestions
...
Some stylistic changes, and get hashes from the mod providers when
building the metadata.
2022-05-23 14:43:09 -03:00
flow
96e36f0604
refactor: make mod metadata presence (or lack of) easier to find out
2022-05-23 14:43:09 -03:00
flow
a99858c64d
refactor: move code out of ModIndex.h
...
Now it's in ModIndex.cpp
2022-05-23 14:43:07 -03:00
flow
ba50765c30
tidy: apply clang-tidy to some files
...
Mostly the ones created in this PR + Mod.h / Mod.cpp / ModDetails.h
2022-05-23 14:42:28 -03:00
flow
d7f6b36990
test+fix: add basic tests and fix issues with it
2022-05-23 14:42:28 -03:00
flow
4439666e67
feat: allow disabling mod metadata usage
2022-05-23 14:42:28 -03:00
flow
23febc6d94
feat: cache metadata in ModDetails
...
Allows for more easy access to the metadata by outside entities
2022-05-23 14:42:28 -03:00
flow
fab4a7a602
refactor: abstract metadata handling and clarify names
2022-05-23 14:42:28 -03:00
flow
092d2f8917
feat: add support for converting builtin -> packwiz mod formats
...
Also adds more documentation.
2022-05-23 14:42:28 -03:00
flow
e9fb566c07
refactor: remove unused mod info and organize some stuff
2022-05-23 14:42:27 -03:00
flow
5a34e8fd7c
refactor: move mod tasks to their own subfolder
...
Makes the launcher/minecraft/mod/ folder a little more organized.
2022-05-23 14:42:27 -03:00
flow
fcfb2cfc3d
feat: use mod metadata for getting mod information
...
For now this doesn't mean much, but it will help when we need data
exclusive from the metadata, such as addon id and mod provider.
Also removes the metadata when the mod is deleted, and make the Mod.h
file a little more pleasing to look at :)
2022-05-23 14:42:27 -03:00
flow
e93b9560b5
feat: add method to delete mod metadata
...
Also moves indexDir setting from LocalModUpdateTask -> ModFolderModel
2022-05-23 14:42:27 -03:00
flow
8e4438b375
feat: add parser for current impl of packwiz mod.toml
...
This reads a local mod.toml file and extract information from it. Using
C libs in C++ is kind of a pain tho :(
2022-05-23 14:42:27 -03:00
flow
eaa5ce4467
feat(ui): adapt SequentialTask to nested SequentialTasks
2022-05-23 14:42:27 -03:00
flow
c86c719e1a
feat: add mod index updating to ModDownloadTask
...
This makes ModDownloadTask into a SequentialTask with 2 subtasks:
Downloading the mod files and updating the index with the new
information.
The index updating is done first so that, in the future, we
can prompt the user before download if, for instance, we discover
there's another version already installed.
2022-05-23 14:42:27 -03:00
flow
b30b88716e
feat: add very early mod.toml packwiz support
...
Also use it as a on-disk format for storing mod metadata. This will be
used later on to make better mod managment.
2022-05-23 14:42:22 -03:00
Ryan Cao
c3e6b1aa8a
use light bigsur icon
2022-05-23 18:40:46 +08:00
Ryan Cao
6d0ea13f97
make JVM args PlainTextEdit
2022-05-23 16:52:12 +08:00
Sefa Eyeoglu
dca4ea5cea
Merge pull request #621 from Scrumplex/remove-curseforge-workarounds
2022-05-23 10:47:30 +02:00
txtsd
be1e2c07ec
Merge pull request #622 from Scrumplex/chore-bump-1.3.0
...
Bump version to 1.3.0
2022-05-23 08:44:56 +05:30
Ryan Cao
2a0018e730
add a .clang-format
2022-05-23 08:29:30 +08:00
flow
ac4497a1f2
Merge pull request #605 from jamierocks/h-atl-improv
...
ATLauncher: Various work to improve the platform support
2022-05-22 20:09:13 -03:00
Sefa Eyeoglu
d72c75db23
chore: bump version
2022-05-22 22:56:52 +02:00
Sefa Eyeoglu
6821a45b7f
Merge pull request #620 from Scrumplex/update-cxxflags
2022-05-22 22:55:04 +02:00
Sefa Eyeoglu
f24cdd6564
Merge pull request #425 from dada513/dynamic_meta
2022-05-22 22:47:00 +02:00
Sefa Eyeoglu
cb69869836
revert: remove CurseForge workaround
...
We have been asked by CurseForge to remove this workaround as it
violates their terms of service. This is just a partial revert, as the
UI changes were otherwise unrelated.
This reverts commit 92e8aaf36f , reversing
changes made to 88a93945d4 .
2022-05-22 22:07:03 +02:00
Sefa Eyeoglu
0b85051a23
fix: more generous optimizations for debug builds
2022-05-22 21:41:41 +02:00
Sefa Eyeoglu
f2e2053134
feat: add trailing slash to meta URL if it is missing
2022-05-22 21:36:31 +02:00
Sefa Eyeoglu
b181f4bc30
fix: improve spacing in APIPage
2022-05-22 21:36:30 +02:00
dada513
f00dbdc215
Make Metaserver changable in settings
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Co-authored-by: flow <flowlnlnln@gmail.com >
2022-05-22 21:35:20 +02:00
Sefa Eyeoglu
309dcc82ca
Revert "fix: temporarily ignore stringop-overflow warning"
...
This reverts commit 90007e2d9d .
2022-05-22 20:57:52 +02:00
Sefa Eyeoglu
0922a7f410
refactor: use -O2 for release and -O1 for debug builds
2022-05-22 20:50:37 +02:00
Sefa Eyeoglu
7d91db607f
Merge pull request #554 from PolyMC/more_paste_services
2022-05-22 20:49:11 +02:00
DioEgizio
2be583ad4d
Merge branch 'PolyMC:develop' into patch-6
2022-05-22 20:03:10 +02:00
timoreo22
efcba698ac
Merge pull request #616 from Scrumplex/fix-windows-crap
...
fix: temporarily ignore stringop-overflow warning
2022-05-22 18:43:31 +02:00
Sefa Eyeoglu
b191291737
Merge pull request #577 from PolyMC/fix/toolbar_ 🦀 _fix
2022-05-22 18:11:00 +02:00
DioEgizio
c988b4d213
fix appimage not having imageformats
...
fixes stuff like the iris icon
2022-05-22 17:26:27 +02:00
Sefa Eyeoglu
90007e2d9d
fix: temporarily ignore stringop-overflow warning
2022-05-22 16:13:30 +02:00
Sefa Eyeoglu
29ef1e2c4b
Merge pull request #597 from Scrumplex/refactor-modloader-modapi
2022-05-22 13:17:53 +02:00
txtsd
fbe84f9e47
Merge pull request #614 from txtsd/ccache_release_fix
...
Avoid invoking ccache on Release builds
2022-05-22 16:16:14 +05:30
timoreo22
b036d95bab
Merge pull request #576 from kthchew/feature/win-installer
...
Create Windows installer
2022-05-22 12:26:43 +02:00
txtsd
bfffcb3910
fix(workflow): Avoid invoking ccache on Release builds
2022-05-22 13:42:33 +05:30
Kenneth Chew
3bc02b9662
Fix Sparkle signing step
2022-05-21 13:23:02 -04:00
Ezekiel Smith
bc450e4cee
Merge pull request #612 from DioEgizio/update-cf-logo-real
...
change cf icon to a more fancy one
2022-05-21 09:53:31 -07:00
LennyMcLennington
de02deac98
Make if statement condition more readable
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-05-21 17:30:54 +01:00
Lenny McLennington
e2ad3b0183
Add migration wizard, fix migration from custom paste instance
...
- Very basic wizard just to allow the user to choose whether to keep
their old paste settings or use the new default settings.
- People who used custom 0x0 instances would just be kept on those
settings and won't see the wizard.
2022-05-21 17:30:19 +01:00
Lenny McLennington
caf6d02728
Change paste settings and add copyright headers
...
- There's now a notice reminding people to change the base URL if they
had a custom base URL and change the paste type (that was something I
personally had problems with when I was testing, so a reminder was
helpful for me).
- Broke down some of the long lines on APIPage.cpp to be more readable.
- Added copyright headers where they were missing.
- Changed the paste service display names to the names they are more
commonly known by.
- Changed the default hastebin base URL to https://hst.sh due to the
acquisition of https://hastebin.com by Toptal.
2022-05-21 17:30:09 +01:00
Lenny McLennington
35f71f5793
Support paste.gg, hastebin, and mclo.gs
2022-05-21 17:28:22 +01:00
DioEgizio
b2a89ee4b9
change cf icon to a more fancy one
...
taken from QuiltMC/art in the emoji folder, so it's licensed under CC0
2022-05-21 17:49:52 +02:00
Jamie Mansfield
b84d52be3d
ATLauncher: Display warnings when selecting optional mods
2022-05-21 15:20:38 +01:00
Jamie Mansfield
305973c0e7
ATLauncher: Display install messages if applicable
2022-05-21 15:19:55 +01:00
Jamie Mansfield
7c251efc47
ATLauncher: Display mod colours in optional mod dialog
2022-05-21 15:18:50 +01:00
flow
166f872712
fix: various issues with ProgressDialog and SequentialTasks
...
- Fix aborting sequential tasks
- Fix displaying wrong number of tasks concluded
- Fix text cutting when the URL is too big
2022-05-21 08:36:36 -03:00
flow
8f2c485c92
feat(ui): make selected mods in downloader bold with underline
...
Makes it easier to find which mods are selected in case you want to
change those.
2022-05-21 08:04:26 -03:00
flow
613f2fc447
feat: allow deselecting mods from the mod confirmation dialog
...
This adds a checkbox to each mod on the dialog that shows up when
confirming the mods to download, so you can deselect some of those if
you want to.
2022-05-21 08:02:27 -03:00
dada513
9a0d6124f3
Merge pull request #609 from timoreo22/feature/fix-blocked-modpacks
2022-05-21 12:22:45 +02:00
Sefa Eyeoglu
2646ae29f0
Merge pull request #520 from icelimetea/refactor-java-launcher-v2
2022-05-21 12:06:45 +02:00
Sefa Eyeoglu
b4707f46ad
Merge pull request #500 from flowln/net_refactor
...
Refactor a little the code in `launcher/net/` files
2022-05-21 12:06:34 +02:00
Sefa Eyeoglu
482e049ac7
Merge pull request #606 from jamierocks/h-launch-version
2022-05-21 11:43:19 +02:00
timoreo
c04adf7452
Do the url trick on initial modpack download too
2022-05-21 08:31:07 +02:00
timoreo22
92e8aaf36f
Merge pull request #608 from timoreo22/feature/curseforge-fix
...
Very Temporary Fix for curseforge
2022-05-21 06:34:43 +02:00
Kenneth Chew
b1f486518e
Use GitHub Actions to get signature for Sparkle
...
Requires a secret called `SPARKLE_ED25519_KEY`, in the format of a private key file
2022-05-21 00:32:14 -04:00
Kenneth Chew
3cab0e69f1
Fix default install location
2022-05-20 17:23:11 -04:00
Kenneth Chew
1ec7878c07
Add /NoShortcuts parameter for Windows installer
2022-05-20 17:22:30 -04:00
Kenneth Chew
cdd83c279c
Remove portable option in Windows installer
2022-05-20 17:12:08 -04:00
Kenneth Chew
12cadf3af0
Add /NoUninstaller parameter for Windows installer
2022-05-20 17:09:42 -04:00
Kenneth Chew
2bc6da038d
Add installer to release workflow
2022-05-20 17:09:26 -04:00
Sefa Eyeoglu
3b4b34b369
fix(ui): make CF and MR modpack dialogs more consistent
2022-05-20 22:48:42 +02:00
timoreo
6542f5f15a
Apply suggestions
2022-05-20 22:06:36 +02:00
timoreo
30b56dbcbd
Port temp fix to mods too
2022-05-20 22:00:38 +02:00
Kenneth Chew
cbc8c1aed6
Use consistent naming scheme
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-05-20 15:56:13 -04:00
timoreo
6afe59e76b
Very Temporary Fix for curseforge
2022-05-20 21:19:19 +02:00
dada513
88a93945d4
Merge pull request #607 from dada513/curse_set
2022-05-20 20:41:42 +02:00
dada513
2847cefff7
Add cursefrog key override
2022-05-20 19:56:27 +02:00
Jamie Mansfield
96f16069a9
Launch: Apply the Minecraft version correctly
...
It was previously using a deprecated field.
2022-05-20 18:47:11 +01:00
Jamie Mansfield
188c5aaa35
Launch: Match Vanilla launcher version string behaviour
...
This removes a means of profiling users.
2022-05-20 18:43:47 +01:00
Jamie Mansfield
f5f59203a2
ATLauncher: Reduce boilerplate code for fetching versions
2022-05-20 18:05:58 +01:00
Jamie Mansfield
c329730de8
ATLauncher: Install LiteLoader as a component where possible
2022-05-20 18:03:32 +01:00
Jamie Mansfield
97a83c9b7a
ATLauncher: Avoid downloading Forge twice for older packs
...
This resolves a quirk where Forge would still be downloaded for use as
a jarmod, even when we detected Forge as a component.
2022-05-20 17:58:00 +01:00
timoreo22
1e6df7eec0
Merge pull request #592 from flowln/technic
...
Use empty string when version is null in the Technic pack manifest
2022-05-20 10:56:42 +02:00
Kenneth Chew
f3c72f4f08
Actually install the full Sparkle.framework
...
CMake's `fixup_bundle` did not copy everything in the framework, which caused the app to crash when updating. Oops.
2022-05-19 20:22:45 -04:00
Kenneth Chew
05cd30ac06
Refactor code, create abstract class ExternalUpdater
...
(Hopefully) this makes implementing updaters using external libraries easier on other platforms. To implement an updater on a new platform, create a new class that implements the pure virtual methods from `ExternalUpdater` and add code in the `UpdateChecker` initializer to initialize the new class.
2022-05-19 15:16:37 -04:00
Kenneth Chew
34adcec616
Add functionality to (Sparkle) updater settings on macOS
...
Also remove a debug line I accidentally left in
2022-05-19 15:16:37 -04:00
Kenneth Chew
f9f46609ee
Use my public key and appcast URL for testing purposes
...
This is for testing the PR only. If merged, this must be removed.
2022-05-19 15:16:37 -04:00
Kenneth Chew
b5bdfa6c2e
Implement automatic and manual updates on macOS
2022-05-19 15:16:37 -04:00
Kenneth Chew
ea4ef1655b
Create SparkleUpdater class for access from Qt/C++
...
To actually get automatic updates going, all that needs to happen is that `SparkleUpdater` needs to be initialized.
The rest of the functions can be connected to elements in the UI.
2022-05-19 15:16:37 -04:00
Kenneth Chew
7eb61a28be
Add build options for Sparkle updater
...
Two new build options are added:
`MAC_SPARKLE_PUB_KEY`: the public key used to verify the signatures of the appcast
`MAC_SPARKLE_APPCAST_URL`: the URL where the `appcast.xml` is located
If the updater should be disabled on macOS, set either of these to an empty string.
2022-05-19 15:16:37 -04:00
Kenneth Chew
92b913ca37
Add Sparkle Updater framework to macOS build
2022-05-19 15:16:37 -04:00
Sefa Eyeoglu
3806f23b02
Merge pull request #594 from Scrumplex/fix-support-split-natives
...
Support Mojang's new split natives
2022-05-19 17:42:17 +02:00
Sefa Eyeoglu
36045a8b0a
chore: improve readability
...
Co-authored-by: flow <thiagodonato300@gmail.com >
2022-05-19 12:37:20 +02:00
Sefa Eyeoglu
943090db98
refactor: allow tracking multiple mod loaders
2022-05-19 08:49:27 +02:00
Sefa Eyeoglu
77caaca50d
fix: only consider enabled mod loaders
2022-05-19 08:09:37 +02:00
Sefa Eyeoglu
f66e0fa0e8
fix: support split natives
...
Mojang introduced a new structure for natives, notably for LWJGL.
Now instead of using the `natives` structure of the version format, Mojang
chose to create a seperate library entry for each platform, which uses
the `rules` structure to specify the platform. These new split natives
carry the same groupId and artifactId, as the main library, but have an
additional classifier, like `natives-linux`.
When comparing GradleSpecifiers we don't look at the classifier, so when
the launcher sees an artifact called `org.lwjgl:lwjgl:3.3.1` and right
after that an artifact called `org.lwjgl:lwjgl:3.3.1:natives-linux`, it
will treat it as "already added" and forget it.
This change will include the classifier in that comparison.
2022-05-18 22:51:15 +02:00
flow
441075f610
fix: version field in technic pack manifest being null
...
Sometimes, the version field, that is supposed to be a string, was a
null instead. Inspecting other entries, seems like the default for not
having a version should be "", so I made it like that in case the
version was null.
I hope this fixes the issue :^)
2022-05-18 17:17:16 -03:00
timoreo22
b2878dca1d
Merge pull request #590 from DioEgizio/fix-qmj-over-fmj
...
fix(quilt) always prefer qmj over fmj
2022-05-18 19:18:18 +02:00
Sefa Eyeoglu
b883ce5c51
Merge pull request #127 from Scrumplex/refactor-bump-qt5.12
2022-05-18 15:47:17 +02:00
DioEgizio
127dfadc6c
fix(quilt) always prefer qmj over fmj
...
this fixes Quilt-only mods like ok zoomer showing wrong metadata
2022-05-18 14:33:58 +02:00
flow
ff9f3cb31f
fix conflicts with develop
2022-05-17 18:25:08 -03:00
Sefa Eyeoglu
a21bd41580
fix: ignore deprecation again
2022-05-17 22:25:50 +02:00
Sefa Eyeoglu
8e9f1bcf18
fix: remove unnecessary Qt version checks
2022-05-17 22:25:50 +02:00
Sefa Eyeoglu
4b06fc5323
chore!: drop support for Qt <5.12
...
BREAKING CHANGE: If there are references to stuff that's deprecated as
of Qt 5.12, the compilation will fail. This means that support for
versions below 5.12 is hereby dropped
2022-05-17 22:25:50 +02:00
Sefa Eyeoglu
cc27bb3231
fix(updater): remove Windows version check
...
Qt 5.12 doesn't support anything older than Windows 7 anyway, so we
can't really check if we are on an older platform.
2022-05-17 22:25:50 +02:00
Sefa Eyeoglu
c1700054f4
fix: replace deprecated stuff as of Qt 5.12
2022-05-17 22:25:50 +02:00
Sefa Eyeoglu
cc13310083
Merge pull request #565 from Scrumplex/modrinth-packs
...
Initial Modrinth modpack support
2022-05-17 16:09:22 +02:00
Sefa Eyeoglu
1012912272
Merge pull request #567 from Scrumplex/quilt-metadata
...
Support `quilt.mod.json` metadata
2022-05-17 16:08:59 +02:00
Sefa Eyeoglu
edbd90a4e6
fix: update links for Quilt metadata format
2022-05-17 15:17:20 +02:00
Sefa Eyeoglu
ddc3b5eb0b
Update launcher/ui/pages/modplatform/modrinth/ModrinthPage.ui
...
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-05-17 15:14:53 +02:00
flow
17bbfe8d89
fix: virtual signal in Task.h
2022-05-17 06:47:00 -03:00
flow
96deb5b09d
chore: remove copyright from files i didnt mess with
...
This is what happens when you auto-pilot stuff xdd
2022-05-17 06:36:30 -03:00
txtsd
9b387d73e5
Merge pull request #529 from flowln/vertical_toolbar
...
Set right orientation for instance toolbar when moving it around
2022-05-17 12:14:34 +05:30
txtsd
c02a6780b0
Merge pull request #540 from kthchew/fix/executable-screenshot
...
Show "executable" screenshots in the screenshot manager
2022-05-17 10:59:55 +05:30
Kenneth Chew
85ec9d95a4
Support installer languages other than English
2022-05-16 19:28:04 -04:00
Lenny McLennington
6dfec4db40
Fix toolbar disappearing in a certain circumstance.
2022-05-17 00:21:57 +01:00
flow
2e9d7f5c3d
fix: mod skipping between pages and remove dead code
2022-05-16 19:17:37 -03:00
flow
696a711e39
fix: missed change to metacache entry lookup
2022-05-16 19:10:31 -03:00
flow
887246a66b
fix: typo and useless code
2022-05-16 17:09:14 -03:00
Kenneth Chew
2993318d19
Remove admin requirement (no multi-user install option)
2022-05-16 15:29:37 -04:00
Kenneth Chew
2b52cf01f5
Build Windows installer
2022-05-16 15:23:32 -04:00
Sefa Eyeoglu
cd9e0e0cc0
fix: use own metacache base for modrinth icons
2022-05-16 20:17:19 +02:00
Sefa Eyeoglu
f66598db8a
Merge pull request #564 from flowln/cf_icon
2022-05-16 20:06:59 +02:00
Sefa Eyeoglu
cf5c752dda
Merge pull request #568 from kthchew/fix/mac-steam-overlay
2022-05-16 20:06:34 +02:00
flow
a6d2c5e181
fix: better hack for icons that cant be natively scaled to 48x48
2022-05-16 14:35:01 -03:00
flow
82760f4b91
fix: import modrinth packs with weird overrides structure
...
Probably because of Packwiz limitations, or an space optimizer that did
this :)
2022-05-16 12:11:50 -03:00
flow
62e099ace5
feat: better handling of optional mods
...
This disables the optional mods by default and tell the user about it.
Pretty hackish, but a better solution would involve the modrinth
metadata to have the mod names...
Also sorry for the diffs, my clangd went rogue x.x
2022-05-15 22:16:52 -03:00
flow
e92b7bd25e
change: switch to modrinth production servers
2022-05-15 21:50:42 -03:00
flow
e7bb3b2776
fix: macos compilation
...
i forgor macos is cringe with static arrays 💀
edit: WHY DONT MAC LET ME USE STD::ARRAY ;----;
2022-05-15 21:18:29 -03:00
flow
ec3c882a44
change: add alpha note to modrinth page
2022-05-15 20:52:57 -03:00
flow
66ce5a4a2d
fix: pack sorting and other search parameters
2022-05-15 20:45:27 -03:00
Sefa Eyeoglu
a110d445ac
feat: support quilt.mod.json metadata
2022-05-15 23:00:09 +02:00
flow
a67f3131e7
Merge pull request #560 from kthchew/feature/close-pmc-override
...
Add instance overrides for miscellaneous settings
2022-05-15 17:40:53 -03:00
Kenneth Chew
7f305aad1b
Add Allow DYLD Environment Variables Entitlement to macOS build
...
This allows the Steam overlay to be injected into Minecraft.
2022-05-15 16:34:53 -04:00
Kenneth Chew
80908efdcb
Fix indentation of macOS resources
2022-05-15 16:33:52 -04:00
Sefa Eyeoglu
e5d0097116
Merge pull request #531 from Ozynt/patch-1
...
Remove reference to legacy Minecraft accounts
2022-05-15 22:18:34 +02:00
flow
6d78ea5a45
Merge pull request #539 from kthchew/fix/translation-switch
...
Fix untranslated strings after changing language
2022-05-15 17:11:21 -03:00
dada513
550d6a6a9b
Merge pull request #547 from kthchew/feature/hidden-temp
2022-05-15 21:54:46 +02:00
dada513
9be8160bf2
Merge pull request #546 from kthchew/feature/scrollable-accounts
2022-05-15 21:43:34 +02:00
dada513
3070565fa3
Merge pull request #545 from DioEgizio/patch-4
2022-05-15 21:42:51 +02:00
flow
7194bb1b81
fix: validate whitelisted download urls
2022-05-15 16:06:49 -03:00
Sefa Eyeoglu
78cf0c73c8
fix: always show project url, if available
2022-05-15 20:38:27 +02:00
flow
4adc61bda9
change: update modrinth icon
...
Updates to the version at https://github.com/modrinth/docs/blob/master/static/img/logo.svg
2022-05-15 11:26:15 -03:00
flow
93e0041d0e
change: use modrinth icon as default on modrinth packs
2022-05-15 11:09:45 -03:00
Sefa Eyeoglu
682a7fb6ba
feat: add version of Modrinth modpack to instance name
2022-05-15 13:36:55 +02:00
flow
5f2398fe59
chore: license headers 2
2022-05-15 08:26:34 -03:00
Sefa Eyeoglu
3abf466632
chore: add/update license headers
2022-05-15 13:20:05 +02:00
flow
4bb429a0fb
change: use build variables for the modrinth API URLs
...
Make it more consistent with the others
2022-05-15 07:43:02 -03:00
flow
4a0e4fdb85
fix: add author page url
2022-05-15 07:15:56 -03:00
Sefa Eyeoglu
a43f882d48
feat: add support for Quilt Loader in Modrinth packs
2022-05-15 12:06:01 +02:00
Sefa Eyeoglu
9731e06728
fix: fix build on Qt 5.12
2022-05-15 11:49:27 +02:00
Sefa Eyeoglu
8e764fc8fb
Merge pull request #4 from flowln/modrinth_pack
2022-05-15 11:48:09 +02:00
flow
4745ed2818
fix: choose valid download url even if it's not the primary one
...
It seems to be possible to have modpack versions that have to primary
file. In those cases, we pick a valid one "at random".
2022-05-14 22:50:04 -03:00
flow
49de5d9b07
change: list what file types can be entered in the importer
2022-05-14 22:04:40 -03:00
flow
365cc198ba
refactor: some random improvements
2022-05-14 21:50:54 -03:00
flow
9899a0e098
fix: Have the URL be the project URL itself
...
(I think, doesn't seem to work for the waffle though, probably because
of the staging API :/)
2022-05-14 21:47:35 -03:00
flow
5ea8cec16f
fix: make all modrinth modpacks have the same icon size
2022-05-14 21:29:48 -03:00
flow
9dd70ca9ae
fix: download icon as well when importing modrinth modpacks
2022-05-14 20:26:20 -03:00
flow
4fda35b466
feat: add modrinth pack downloading
...
Things that don't work / work poorly (there's more for sure but those
are the evident ones):
- Icons are broken in the import dialog
- No way to search for private packs
- Icons are not downloaded when downloading a mod
- No support for multiple download URLs
- Probably a lot more...
2022-05-14 20:19:26 -03:00
Sefa Eyeoglu
31988f0529
fix: adapt upstream Modrinth code to our codebase
2022-05-14 20:27:45 +02:00
kb1000
db03846358
Add support for importing Modrinth packs from files
2022-05-14 20:01:09 +02:00
Sefa Eyeoglu
c6b3eccbdf
refactor: rename Modrinth classes to ModrinthMod
2022-05-14 20:00:54 +02:00
icelimetea
3f259eb97a
Refactor script parsing
2022-05-14 16:48:14 +01:00
icelimetea
fac0b027b3
Fix the license header
2022-05-14 16:46:57 +01:00
flow
84b962f256
fix: Handle icons with a dot in their names
...
E.g. some FTB modpacks.
Also fixes an issue with the name viewing on the Icon Chooser dialog
when the name was too big.
2022-05-13 17:21:35 -03:00
timoreo22
123ed5bd2e
Merge pull request #519 from Scrumplex/cleanup-cmake
...
Remove in-tree CMake modules where possible
2022-05-13 22:05:04 +02:00
icelimetea
c3336251e0
Add the license header to EntryPoint
2022-05-13 18:10:11 +01:00
icelimetea
c054d0f329
Add the license header to LauncherFactory
2022-05-13 17:21:35 +01:00
Sefa Eyeoglu
8dd68580a6
Merge pull request #528 from flowln/guo_ext
2022-05-13 18:17:40 +02:00
icelimetea
067484a6a8
Fix formatting
2022-05-13 16:59:00 +01:00
timoreo22
c83e16aba4
Merge pull request #553 from DioEgizio/add-version-PolyMC
...
chore: add version of polymc area in bug report template
2022-05-13 14:42:26 +02:00
Sefa Eyeoglu
d85fc456a9
Merge pull request #557 from PolyMC/ZekeSmith-cf-api
2022-05-13 13:36:36 +02:00
flow
dd2b324d8f
chore: add license header to remaining files
...
Also remove some unused imports
2022-05-12 18:11:55 -03:00
flow
0bce08d30f
chore: add polymc license headers to launcher/net files
2022-05-12 18:11:55 -03:00
flow
57d65177c8
fix: abort and fail logic in tasks
...
Also sets up correctly the status connections
2022-05-12 18:11:55 -03:00
flow
040ee919e5
refactor: more net cleanup
...
This runs clang-tidy on some other files in launcher/net/.
This also makes use of some JSON wrappers in HttpMetaCache, instead of
using the Qt stuff directly.
Lastly, this removes useless null checks (crashes don't occur because of
this, but because of concurrent usage / free of the QByteArray pointer),
and fix a fixme in Download.h
2022-05-12 18:11:55 -03:00
flow
efa3fbff39
refactor: remove some superfluous signals
...
Since now we're inheriting from Task, some signals can be reused.
2022-05-12 18:11:55 -03:00
flow
8c8eabf7ac
refactor: organize a little more the code in launcher/net/
...
This also reduces some code duplication by using some Task logic in
NetAction.
2022-05-12 18:11:49 -03:00
Kenneth Chew
3aea639fe4
Add UI for miscellaneous instance setting overrides
2022-05-12 17:11:06 -04:00
Kenneth Chew
046f1e6e58
Add instance overrides for miscellaneous settings
2022-05-12 17:08:06 -04:00
Ezekiel Smith
37e8f495b4
CurseForge API Key update to PolyMC key
...
Use the key CurseForge provided me to use for PolyMC
*pr done on mobile if someone could test that would be great*
2022-05-12 23:39:48 +10:00
DioEgizio
512d7b07d0
chore: add version of polymc area in bug report template
2022-05-11 15:18:07 +02:00
Kenneth Chew
527fa7ba9c
Hide temporary directory in instances folder
2022-05-09 18:34:47 -04:00
Kenneth Chew
288e7bc9c5
Make profile menu scrollable
2022-05-09 15:37:56 -04:00
timoreo22
649b8ac7c6
Merge pull request #537 from PolyMC/stable
...
Merge stable into develop
2022-05-09 18:06:56 +02:00
DioEgizio
96b2758169
fix websiteurl in curseforge modpacks
2022-05-09 17:42:17 +02:00
Kenneth Chew
40e0252d7d
Show "executable" screenshots in the screenshot manager
...
Since the readable/writable filter was removed to do this, extra code was added to enable/disable certain buttons based on whether the screenshot is readable or writable.
2022-05-09 00:54:47 -04:00
Kenneth Chew
5171d99fe5
Retranslate playtime text immediately when language is changed
2022-05-08 23:42:37 -04:00
Kenneth Chew
ea9d61c21c
Retranslate account actions after switching language
2022-05-08 23:19:23 -04:00
Sefa Eyeoglu
da25f3b84e
Merge pull request #533 from DioEgizio/patch-5
2022-05-08 21:43:18 +02:00
Sefa Eyeoglu
1e34de98ab
Merge pull request #534 from DioEgizio/stable
2022-05-08 21:43:06 +02:00
Sefa Eyeoglu
7b46f50cf1
Merge pull request #530 from ryanccn/cfcore-backport
2022-05-08 21:42:40 +02:00
timoreo22
cab40026f2
Merge pull request #475 from Scrumplex/fix-hide-all-tokens
...
Hide all tokens for non-Debug builds for log and logfiles
2022-05-08 16:56:26 +02:00
Sefa Eyeoglu
ac66bddeda
Merge pull request #482 from TheCodex6824/mojang-auth-fix
2022-05-08 16:52:31 +02:00
Sefa Eyeoglu
f4237be9bd
Merge pull request #492 from DioEgizio/appimage-fix
2022-05-08 16:52:14 +02:00
DioEgizio
dd11ccb3fd
bump to 1.2.2
2022-05-08 16:30:12 +02:00
Sefa Eyeoglu
c4549a5375
Update launcher/modplatform/flame/FlameModIndex.cpp
...
Co-authored-by: flow <thiagodonato300@gmail.com >
2022-05-08 16:25:51 +02:00
Sefa Eyeoglu
e9b3140d12
Update launcher/modplatform/flame/FlameModIndex.cpp
2022-05-08 16:25:45 +02:00
Ozynt
bdd2d57808
This makes more sense
2022-05-08 11:19:53 +02:00
Ryan Cao
22f5128e39
adopt changes from #497 remapped
2022-05-08 15:22:50 +08:00
Ryan Cao
ae1aa6f63e
gitignore stuff
2022-05-08 15:02:21 +08:00
flow
29a53d7e95
fix: always have the instance toolbar be vertical
...
This overrides the orientation set automatically by Qt when we start
moving the toolbar around.
2022-05-07 20:44:44 -03:00
flow
2fbb7be23b
fix: filter based on MIME type instead of plaintext suffix
...
Suffixes are unreliable in different locales, while MIME types are more
standarized.
2022-05-07 20:16:55 -03:00
Sefa Eyeoglu
f7f39854f8
Merge pull request #495 from ryanccn/big-sur-icon
2022-05-05 14:29:04 +02:00
icelimetea
113528e1f2
Make line count check more lenient
2022-05-05 07:20:33 +01:00
icelimetea
6bffa06063
Fix typo
2022-05-05 07:16:16 +01:00
icelimetea
dcc41ef885
Improve mpticket file parsing code
2022-05-05 07:14:32 +01:00
Ryan Cao
e909cc363d
add big sur-style icon
2022-05-05 08:10:36 +08:00
icelimetea
9a87ae575e
More minor fixes
2022-05-03 03:19:26 +01:00
icelimetea
860a7af679
Fix method access modifier
2022-05-03 00:53:22 +01:00
icelimetea
4fdb21b414
Compile with Java 7 in mind
2022-05-03 00:27:14 +01:00
icelimetea
eeb5297284
Use only Java 7 features (in order to deal with #515 )
2022-05-03 00:25:26 +01:00
icelimetea
8de63b60b1
Refactor some parts of NewLaunch (part 2)
2022-05-02 22:36:55 +01:00
Sefa Eyeoglu
0b38d878a1
fix: remove in-tree CMake modules where possible
2022-05-02 16:27:15 +02:00
Sefa Eyeoglu
d29720fbce
Merge pull request #518 from timoreo22/develop
...
Fix nightly.link pr comment
2022-05-02 12:23:00 +02:00
dada513
0556ae4749
Merge pull request #503 from txtsd/mnemonics_fix
...
Fix mnemonics that didn't parse
2022-05-02 11:19:30 +02:00
timoreo22
1a86f72690
Fix nightly.link pr comment
2022-05-02 11:13:46 +02:00
timoreo22
25d380f051
Merge pull request #510 from txtsd/ccache_gha
...
CI Speedup [1/3]: Use ccache to speed up CI builds
2022-05-02 10:47:28 +02:00
timoreo22
546d394868
Merge pull request #475 from Scrumplex/fix-hide-all-tokens
...
Hide all tokens for non-Debug builds for log and logfiles
2022-05-02 10:45:58 +02:00
dada513
8110040f86
Merge pull request #511 from dada513/hide_java_wizard
...
add hide java wizard toggle
2022-05-01 08:48:37 +02:00
txtsd
239e4adf29
refactor(workflow): Only use ccache on Debug builds
2022-05-01 00:34:37 +05:30
dada513
5662d41062
Update launcher/ui/pages/global/JavaPage.ui
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-04-30 16:20:05 +02:00
dada513
1e03ef484d
Update launcher/ui/pages/global/JavaPage.ui
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-04-30 16:14:48 +02:00
Sefa Eyeoglu
1d95f10090
Merge pull request #489 from kthchew/fix/old-mac-cleanup
2022-04-30 15:54:10 +02:00
dada513
6768768373
Remove symlink
2022-04-30 15:22:31 +02:00
dada513
dac801c8ac
add hide java wizard toggle
2022-04-30 15:19:57 +02:00
txtsd
ece5ca52b2
feat(workflow): Use ccache
2022-04-30 17:26:34 +05:30
Sefa Eyeoglu
3205d9e9da
Merge pull request #492 from DioEgizio/appimage-fix
2022-04-29 09:10:32 +02:00
txtsd
b931dc0f93
fix(mnemonics): Add missing buddies to labels
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-04-29 01:30:47 +05:30
DioEgizio
efe4e7df06
fix some appimage issues building with qt 5.15.2
...
some users are having weird scaling issues since we're using qt 5.12.8 for the appimage
2022-04-28 18:17:02 +02:00
Sefa Eyeoglu
b94f70ea96
Merge pull request #498 from ryanccn/polymc-instance-icon
...
Add PolyMC icon as instance icon
2022-04-28 07:18:57 +02:00
Sefa Eyeoglu
bd946c78f3
Merge pull request #486 from icelimetea/refactor-java-launcher
...
Refactor some parts of NewLaunch
2022-04-28 07:18:39 +02:00
Sefa Eyeoglu
a507907443
Merge pull request #477 from flowln/iconfix_static
...
Always build iconfix as static library
2022-04-28 07:18:22 +02:00
Ryan Cao
0507b56bed
feat: add PolyMC icon as instance icon
2022-04-27 20:30:50 +08:00
Kenneth Chew
ac405aa564
Remove old macOS data migration code
2022-04-25 19:57:47 -04:00
Sefa Eyeoglu
aad7c63282
Merge pull request #482 from TheCodex6824/mojang-auth-fix
2022-04-25 21:55:00 +02:00
TheCodex6824
1ff459d995
Use suggested error handling
2022-04-25 14:08:27 -04:00
Sefa Eyeoglu
52454ca77b
Merge pull request #480 from dschemp/develop
2022-04-25 14:26:10 +02:00
icelimetea
884f772362
Clarify exception messages
2022-04-25 11:22:56 +01:00
Sefa Eyeoglu
bc06571dba
Merge pull request #478 from Scrumplex/update-readme
2022-04-25 11:21:21 +02:00
Sefa Eyeoglu
1e8ad3d979
Merge pull request #408 from jamierocks/atl-share-codes
2022-04-25 11:21:10 +02:00
icelimetea
b0a469baab
Use java.util.logging instead of custom logging
2022-04-24 15:10:35 +01:00
icelimetea
c968c1be78
Refactor some parts of NewLaunch
2022-04-24 14:45:01 +01:00
TheCodex6824
a0bafa4952
Re-add base64 decode option for Qt versions that support it
2022-04-23 11:11:55 -04:00
TheCodex6824
e56f0db11b
Remove base64 decode option that was added in Qt 5.15
2022-04-23 10:32:52 -04:00
TheCodex6824
8bcbe07c87
Fix Mojang auth failing due to Mojang rejecting requests to the profile endpoint
2022-04-22 23:39:38 -04:00
Jamie Mansfield
ba9059c7c8
ATLauncher: Replace usage of QPushButton::pressed with ::clicked
2022-04-22 20:37:55 +01:00
Jamie Mansfield
45783c1661
ATLauncher: Support using share codes
2022-04-22 20:37:55 +01:00
Daniel Schemp
71777e7a6f
added and fixed some Mnemonics in MainWindow
2022-04-22 00:31:03 +02:00
Daniel Schemp
c86ec0bd36
added: Mnemonics for Settings/APIs
2022-04-22 00:23:36 +02:00
Daniel Schemp
08b1b2669a
added: Mnemonics for Settings/Accounts
2022-04-22 00:22:50 +02:00
Daniel Schemp
94a655b055
added: Mnemonics for Settings/External Tools
2022-04-22 00:20:54 +02:00
Daniel Schemp
717067e9eb
added: Mnemonics for Settings/Proxy
2022-04-22 00:19:54 +02:00
Daniel Schemp
5a5797d914
added: Mnemonics for Settings/Custom Commands
2022-04-22 00:18:39 +02:00
Daniel Schemp
75826aca13
added: Mnemonics for Settings/Java
2022-04-22 00:16:11 +02:00
Daniel Schemp
f52b7c030f
added: Mnemonics for Settings/Minecraft+
2022-04-22 00:14:24 +02:00
Daniel Schemp
c1386bcb04
added: Mnemonics for Settings/Launcher
2022-04-22 00:12:20 +02:00
Sefa Eyeoglu
234a9e48e9
chore: add FUNDING
2022-04-21 22:53:45 +02:00
Sefa Eyeoglu
908e6364c9
fix: update README
2022-04-21 22:52:05 +02:00
flow
3ec511010f
fix: Build iconfix as static library
...
On CI we build using the bundled Quazip, and automatically set
-DBUILD_STATIC_LIBS to true, so it build iconfix statically as well.
However, since we recently added support for using the system quazip,
this flag is not set anymore, and PolyMC fails to run because iconfix
neither is statically linked, nor it creates a .so file for dynamic
linking.
Since most other libs are built statically, we should make this one
static as well. Maybe we should consider allowing for dynamic linking of
libs now that quazip is not much of an issue anymore. :^)
2022-04-21 09:34:44 -03:00
Sefa Eyeoglu
b3e1691c01
fix: hide LauncherLoginStep tokens for non-Debug builds
2022-04-20 18:33:33 +02:00
txtsd
6961a39cd2
feat: Assign java max mem based on system RAM
...
If the system has <6GB RAM, it uses (system RAM / 1.5)
If the system has >=6GB, it uses 4GB
Signed-off-by: txtsd <code@ihavea.quest >
2022-01-23 02:12:03 +05:30