CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,887 Commits 10 Branches 30 Tags
4777a4572267a604dc4fa8e1cd1f4bf2fc068929
Commit Graph

4887 Commits

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