ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
8,045 Commits 4 Branches 5 Tags 40 MiB
2f88da9de2
Commit Graph

8045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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