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

8516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Trial97
aab82705cd
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mac_java 2024-09-16 20:05:18 +03:00
Alexandru Ionut Tripon
914ae6ead6
Use macOS 14 in CI (#2826) 
* chore: fix mac CI build

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

* try what the error says

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

* set -DCMAKE_OSX_ARCHITECTURES=x86_64

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

---------

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 13:00:38 -04:00
Trial97
e53a5b3eca
replace TRANSLATIONS_BASE_URL with TRANSLATION_FILES_URL 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 17:51:35 +03:00
Alexandru Ionut Tripon
2e537e55de
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-09-16 17:47:58 +03:00
seth
7eac06cad9
Merge pull request #2829 from Trial97/ask_retry2 
disable retry for translation files
 2024-09-16 10:15:21 -04:00
Alexandru Ionut Tripon
8d14060ad1
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-09-16 16:46:01 +03:00
seth
8faebe320e
Merge pull request #2807 from Trial97/fix_server_launch 
fix server launch
 2024-09-16 09:42:54 -04:00
Alexandru Ionut Tripon
db3c7d01fd
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-09-16 16:36:05 +03:00
seth
160d2962e6
Merge pull request #2827 from Trial97/prefix_option 
add Launcher_ prefix to enable java option
 2024-09-16 09:30:54 -04:00
Trial97
75756b49c3
reshow login dialog in case account login fails 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 16:15:36 +03:00
Trial97
81f30f0360
disable retry for translation files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 15:53:54 +03:00
Trial97
ca6b62c773
move some URLs in cmake 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 15:51:51 +03:00
Trial97
2c2defb266
add Launcher_ prefix to enable java option 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 14:30:23 +03:00
Trial97
d2f0d1d8d5
Wrap FS::write in try catch 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 12:42:09 +03:00
Trial97
d38e7fa142
Add more null protection for skin management 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 12:41:33 +03:00
Alexandru Ionut Tripon
bee59c904a
Merge pull request #2773 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-09-15 08:49:07 +03:00
github-actions[bot]
8932a42644 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/c374d94f1536013ca8e92341b540eba4c22f9c62?narHash=sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh%2BaRKoCdaAv5fiO0%3D' (2024-08-21)
  → 'github:NixOS/nixpkgs/4f807e8940284ad7925ebd0a0993d2a1791acb2f?narHash=sha256-IiA3jfbR7K/B5%2B9byVi9BZGWTD4VSbWe8VLpp9B/iYk%3D' (2024-09-11)
 2024-09-15 00:24:43 +00:00
Alexandru Ionut Tripon
71dda06276
Merge pull request #5 from QazCetelic/java_dir_disable_alt 
Disable folder action instead of hiding it and add additional informa…
 2024-09-14 23:27:57 +03:00
QazCetelic
1c6bd74ed8 Disable folder action instead of hiding it and add additional information in the tooltip. 
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com>
 2024-09-14 22:04:18 +02:00
Trial97
0afdce8a31
Add extra step to macos java install 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-14 21:18:20 +03:00
Alexandru Ionut Tripon
6492ad7076
Merge pull request #2813 from Trial97/fix_java_autodetect 
fix java autodetect when instance settings are open
 2024-09-14 20:19:15 +03:00
Alexandru Ionut Tripon
ad786fb983
Merge pull request #2811 from Trial97/fix_java_abort 
fix download java abort being stuck
 2024-09-14 20:19:02 +03:00
Alexandru Ionut Tripon
281621cfc0
Merge pull request #2808 from Trial97/fix_java_download_crash 
fix java crash on refresh
 2024-09-14 20:18:51 +03:00