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
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
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
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
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
c902da4461
Fix image width in project description
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-04-24 22:02:55 +03: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
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
William Gray
9f4654ede9
Update JavaUtils.cpp
...
Signed-off-by: William Gray <ruwagray@gmail.com >
2024-04-21 03:35:27 -05: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
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
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
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
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
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
TheKodeToad
8056a2fa46
Replace invalid characters when extracting ZIP
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-04-05 23:31:18 +01: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
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
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
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
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