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

9223 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
BatteredBunny
1d2590b024 Clean up 
Signed-off-by: BatteredBunny <ayes2022@protonmail.com>
 2024-04-25 11:40:01 +03: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
timoreo
1daf4ad85f
Merge pull request #2339 from PrismLauncher/backport-2337-to-release-8.x 2024-04-24 18:03:43 +02:00
Trial97
c74099ec7b Fixed windows bundled java path 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 5ae98f4f90)
 2024-04-24 15:46:21 +00: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
4cd6ac5fe5
Merge pull request #2334 from PrismLauncher/backport-2333-to-release-8.x 
[Backport release-8.x] Fix Minecraft Launcher runtime detection on Windows and macOS
 2024-04-23 17:20:44 +01:00
Trial97
f06bd54d6f Removed duplicate local 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 10d1720da5)
 2024-04-23 16:19:50 +00:00
Trial97
0b535e44e1 Changed env variable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 73c3794c1b)
 2024-04-23 16:19:50 +00:00
Trial97
877de6da40 Fixed windows appdata path 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit dac7027846)
 2024-04-23 16:19:50 +00:00
Trial97
c330452e84 Fix bundled java detection on mac 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit dbfd535b38)
 2024-04-23 16:19:50 +00: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
Alexandru Ionut Tripon
3f3af4134e
Merge pull request #2330 from Trial97/appimage_backport 
Removed java from appimage backport
 2024-04-23 00:06:36 +03:00
Trial97
565c7d81b3
Removed java from appimage 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-23 00:04:51 +03:00
Tayou
5eeb3b7768
Merge pull request #2328 from Trial97/appimage 
Removed java from appimage
 2024-04-22 22:51:57 +02:00
Alexandru Ionut Tripon
a532c99aa5
Merge pull request #2329 from PrismLauncher/backport-2327-to-release-8.x 
[Backport release-8.x] Add Gradle Toolchains to java scan list
 2024-04-21 20:56:05 +03:00
William Gray
47bd02637a Update JavaUtils.cpp 
Signed-off-by: William Gray <ruwagray@gmail.com>
(cherry picked from commit 9f4654ede9)
 2024-04-21 17:45:15 +00: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
Alexandru Ionut Tripon
64797b8bff
Merge pull request #2322 from PrismLauncher/backport-2319-to-release-8.x 
[Backport release-8.x] Support mod info for NeoForge 20.5
 2024-04-20 12:04:47 +03:00
TheKodeToad
7960282e07 Support neoforge.mods.toml 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 252406ba3e)
 2024-04-20 07:50:01 +00: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
cb0fe08bed
Merge pull request #2314 from PrismLauncher/backport-2294-to-release-8.x 
[Backport release-8.x] Fixed application close on open file dialog
 2024-04-19 00:13:36 +03:00
Trial97
160c8cb70d Fixed application close on open file dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9f48694eb2)
 2024-04-18 21:13:03 +00: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
TheKodeToad
13afbd5699
Merge pull request #2286 from DioEgizio/updates-backport 
Update to Qt 6.6.3
 2024-04-15 11:23:34 +01:00