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

169 Commits

Author SHA1 Message Date
Evan Goode
491cb1e5a2 Merge remote-tracking branch 'prismlauncher/release-9.x' into develop 2025-01-12 12:46:48 -06:00
Luna
41e90afbab Revert "Merge in Changes from Prism 9.2" 
This reverts commit b4b9051793.
 2025-01-11 14:19:46 -06:00
Luna
b4b9051793 Merge in Changes from Prism 9.2 2025-01-11 13:58:12 -06:00
Evan Goode
c15afbda4a Fix build? 2024-10-26 16:12:01 -04:00
Evan Goode
7dbaa896a6 Merge tag '9.0' into develop 
This is an intermediate/halfway commit, more refactoring is needed to
get this to build.
 2024-10-25 15:34:57 -04:00
Evan Goode
5be25307bb
Merge pull request #22 from unmojang/evan-goode/nix-sync 
nix: sync changes from nixpkgs
 2024-08-11 22:49:56 -04:00
Evan Goode
5e93cff2d0 clang-format 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2024-08-11 22:06:38 -04:00
Evan Goode
e1041ddc61 Add tests for MANIFEST.MF parser 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2024-07-27 01:00:42 -04:00
Trial97
bac678a7fc
format files outside launcher 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 12:54:37 +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
Trial97
3336f8107c
Removed AuthRequest and NetAction 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-14 00:21:45 +03:00
Sefa Eyeoglu
426deb4454
Merge pull request #1694 from Trial97/concurrent 2023-12-11 11:20:17 +01: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
Alexandru Ionut Tripon
4eb8db16f1
Merge pull request #1543 from Trial97/packwiz 
refactor packwiz file write
 2023-10-10 16:16:57 +01:00
Trial97
8dd640819d
removed processEvents from ConcurrentTask 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-09 01:50:14 +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
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
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
ee7016fa54 use clang-format 
Signed-off-by: cullvox <cullvox@outlook.com
 2023-09-13 14:28:56 -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
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
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
Trial97
311e36b5d6
added new line 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-28 11:52:26 +03:00
Trial97
07d8598638
added catpacks tests 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 23:40:32 +03:00
Sefa Eyeoglu
85c23b26de
chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-23 13:46:23 +02:00
Sefa Eyeoglu
1939e3e6ed
chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-15 09:02:15 +02: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
ea43d0f687
fix: fix more warnings 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-11 10:57:57 +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
Sefa Eyeoglu
1d468ac35a
chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-02 18:35:35 +02: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
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
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
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
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
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
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
Trial97
dffffc784e
Removed unused files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-26 22:33:10 +03: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
e0b901169a
Added new migration for special characters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 00:27:20 +03:00