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

9236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
timoreo
1b58645c52
Merge pull request #2857 from Trial97/translation_warnings 2024-10-01 10:20:56 +02:00
Trial97
946e791d39
sync modpack search field 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-01 08:53:27 +03:00
Trial97
5ea2dece54
fix search term not remaining the same between providers on resource download 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-01 08:52:07 +03:00
Trial97
0eefa52dbc
fix some transtaions warnings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-01 08:51:06 +03:00
Trial97
b676a67b3c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_login 2024-10-01 08:49:03 +03:00
Alexandru Ionut Tripon
fa92e6bd29
Merge pull request #2859 from Trial97/packwiz_prefix 
add prefix to non-standard packwiz fields
 2024-10-01 08:23:10 +03:00
renovate[bot]
79be2fc062
chore(deps): update cachix/install-nix-action action to v29 2024-10-01 00:32:42 +00:00
seth
974c89b9c3
Merge pull request #2843 from getchoo-contrib/ci/fix-nix 
Fix Nix CI
 2024-09-30 20:32:08 -04:00
seth
38fa2e0cd4
style: format with clang-format 
Signed-off-by: seth <getchoo@tuta.io>
 2024-09-30 16:32:55 -04:00
seth
988ef32019
fix(nix): don't write to files in formatting check 
Signed-off-by: seth <getchoo@tuta.io>
 2024-09-30 16:32:50 -04:00
seth
bf432b5514
chore(nix): use cachix for binary cache 
Signed-off-by: seth <getchoo@tuta.io>
 2024-09-30 16:25:58 -04:00
seth
68bf500f7e
chore: add nix reformat to .git-blame-ignore-revs 
Signed-off-by: seth <getchoo@tuta.io>
 2024-09-30 16:25:58 -04:00
seth
5adca58337
ci: add nix job 
Signed-off-by: seth <getchoo@tuta.io>
 2024-09-30 16:25:56 -04:00
seth
2663ac5405
build(nix): add debug builds 
This will lead to build times on par with our other CI jobs, as now
we're not always building for release

Signed-off-by: seth <getchoo@tuta.io>
 2024-09-30 16:18:20 -04:00
seth
732008db20
ci: drop garnix 
Signed-off-by: seth <getchoo@tuta.io>
 2024-09-30 16:18:17 -04:00
Tayou
a63451212f
Merge pull request #2867 from turret-dev/turret/tmpdir_noexec_jvmarg_noannoy 
fix: don't annoy when java tmpdir jvmarg is set & /tmp is noexec
 2024-09-29 09:07:25 +02:00
github-actions[bot]
c899043816 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/4f807e8940284ad7925ebd0a0993d2a1791acb2f?narHash=sha256-IiA3jfbR7K/B5%2B9byVi9BZGWTD4VSbWe8VLpp9B/iYk%3D' (2024-09-11)
  → 'github:NixOS/nixpkgs/1925c603f17fc89f4c8f6bf6f631a802ad85d784?narHash=sha256-J%2BPeFKSDV%2BpHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI%3D' (2024-09-26)
 2024-09-29 00:25:33 +00:00
Rachel Powers
ed15a28eb3
fix : baking the redist into the installer breaks GPL, download at runtime instead 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-09-28 14:58:13 -07:00
Edgars Cīrulis
a897b012d9
chore: update Qt to 6.7.3 
Only bug fixes no new / breaking changes 

Signed-off-by: Edgars Cīrulis <edgarsciruliss@gmail.com>
 2024-09-28 12:11:25 +03:00
Rachel Powers
00f4221a83
reorg MSVC set(CMAKE_INSTALL_SYSTEM_RUNTIMES_LIBS_SKIP true) call 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-09-27 19:16:50 -07:00
Mason Rocha
b9c19fd3f7
fix: don't annoy when java tmpdir jvmarg is set & /tmp is noexec 
Signed-off-by: Mason Rocha <mrocha@turretllc.us>

Got annoyed, didn't want to see it anymore.

Java tmpdir noexec warning modified to include information about
possible remedies available
 2024-09-27 16:42:59 -05:00
Rachel Powers
8fa4467a36
use /norestart with redist install 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-09-27 13:29:00 -07:00
Rachel Powers
c5daca3b01
include vc_redist in portable build 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-09-27 00:57:28 -07:00
Rachel Powers
37d3b2a4f6
prevent the unauthorised reditribution of MSVC CRT files 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-09-27 00:49:00 -07:00
Rachel Powers
2dc6f7504b
add vc_redist as a NSIS install section 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-09-27 00:18:35 -07:00
Alexandru Ionut Tripon
b9a6c13d47
Merge pull request #2861 from Cartrigger/FixStringCases 
Fix case for Java strings
 2024-09-26 20:35:14 +03:00
Cart
6475dc5786 Lots of J's for Java needed to be uppercased 2024-09-26 01:58:21 -04:00
Trial97
1b2e9b95e2
add prefix to non-standard packwiz fields 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-25 21:17:44 +03:00
seth
3e60713257
Merge pull request #2838 from Trial97/view_log 
Always display Minecraft log tab
 2024-09-24 20:00:54 -04:00
seth
48904c0d66
Merge pull request #2806 from Trial97/technic_client 
Add Technic client ID
 2024-09-24 19:55:21 -04:00
Alexandru Ionut Tripon
4a40b53e5f
Merge pull request #2845 from Trial97/typo 
fix updater typo
 2024-09-22 19:09:40 +03:00
TheKodeToad
4a5749f4d9
Merge pull request #2844 from Trial97/fix_modrith_update 
fix folder duplication for modrinth
 2024-09-22 11:28:19 +01:00
Trial97
9567d763c1
fix java archive typo 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-21 22:17:44 +03:00
Trial97
3e1cf6b2a7
fix updater typo 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-20 16:58:22 +03:00
Trial97
1243328876
fix folder duplication for modrinth 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-20 16:53:36 +03:00
Evan Goode
441d471a93
Merge pull request #33 from JinyiSa/develop 
A simple workaround for multi-profile authlib-injector servers
 2024-09-19 14:15:40 -04:00
Evan Goode
dffe14bdab clang-format 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2024-09-19 13:50:30 -04:00
Trial97
77463c6d33
display minecraft log before instance run 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-18 21:17:15 +03:00
timoreo
dc67807894
Merge pull request #2825 from Trial97/skin_fix 2024-09-17 08:50:19 +02:00
Alexandru Ionut Tripon
926a6bc72a
Merge pull request #2583 from Trial97/metadata2 
Generate updater metadata for mods added/updated using modpack updater/installer
 2024-09-17 08:45:09 +03:00
Alexandru Ionut Tripon
d06f0529a0
Merge pull request #2830 from Trial97/login_wizard_retry 
Show login dialog again if account login fails
 2024-09-17 08:44:41 +03:00
Alexandru Ionut Tripon
53c3d99bdd
Merge pull request #2828 from Trial97/cmake_fields 
Allow configuring more URLs through CMake
 2024-09-17 08:44:24 +03:00
Alexandru Ionut Tripon
c57b1d4227
Merge pull request #2820 from Trial97/mac_java 
Add extra step to macos java install
 2024-09-17 08:44:09 +03:00
Tayou
1b00d61587
Merge pull request #2819 from Trial97/java_dir 
add open java folder action
 2024-09-16 20:41:34 +02:00
Trial97
3ca67cc388
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2 2024-09-16 20:08:43 +03:00
Trial97
2fd8685894
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into java_dir 2024-09-16 20:08:20 +03:00
Trial97
0af639c20b
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_login 2024-09-16 20:07:18 +03:00
Trial97
7438c71fdd
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into login_wizard_retry 2024-09-16 20:06:50 +03:00
Trial97
b4ecb38ae5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cmake_fields 2024-09-16 20:06:18 +03:00
Trial97
f36cfaf878
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_fix 2024-09-16 20:05:44 +03:00