CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,158 Commits 10 Branches 30 Tags 34 MiB
cc43485650
Commit Graph

6158 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sefa Eyeoglu
cc43485650
Merge pull request #1442 from PrismLauncher/backport-1434-to-release-7.x 2023-07-26 16:23:21 +02:00
seth
b92d617df0 chore(ci): remove nix job 
we're using garnix now

Signed-off-by: seth <getchoo@tuta.io>
(cherry picked from commit fbf29274e8)
 2023-07-26 13:47:58 +00:00
seth
7b971a08a8 feat(ci): init garnix.yaml 
Signed-off-by: seth <getchoo@tuta.io>
(cherry picked from commit 3c35d647b8)
 2023-07-26 13:47:58 +00:00
Sefa Eyeoglu
7cc3d34498
Merge pull request #1441 from PrismLauncher/backport-1427-to-release-7.x 2023-07-26 14:46:53 +02:00
tjw123hh
d9df60368c
Delete some incorrect notr="true" tags 
Signed-off-by: tjw123hh <tjw123hh@outlook.com>
(cherry picked from commit 280f041acb)
 2023-07-26 14:45:59 +02:00
tjw123hh
ba49afcc6a
Update org.prismlauncher.PrismLauncher.desktop.in 
Signed-off-by: tjw123hh <56749271+tjw123hh@users.noreply.github.com>
(cherry picked from commit 4ab630b832)
 2023-07-26 14:45:59 +02:00
tjw123hh
685badb8cf
DCO Remediation Commit for tjw123hh <tjw123hh@outlook.com> 
I, tjw123hh <tjw123hh@outlook.com>, hereby add my Signed-off-by to this commit: 6a01c277e8

Signed-off-by: tjw123hh <tjw123hh@outlook.com>
(cherry picked from commit a32ca43288)
 2023-07-26 14:45:50 +02:00
tjw123hh
29fde6a322
Delete some incorrect tags 
(cherry picked from commit 6a01c277e8)
 2023-07-26 14:45:42 +02:00
Sefa Eyeoglu
e65d48bf36
Merge pull request #1440 from PrismLauncher/backport-1420-to-release-7.x 2023-07-26 14:41:17 +02:00
Sefa Eyeoglu
38144b3661
Merge pull request #1439 from PrismLauncher/backport-1419-to-release-7.x 2023-07-26 14:41:08 +02:00
github-actions[bot]
3a0e30684e chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'libnbtplusplus':
    'github:PrismLauncher/libnbtplusplus/2203af7eeb48c45398139b583615134efd8d407f' (2022-04-15)
  → 'github:PrismLauncher/libnbtplusplus/a5e8fd52b8bf4ab5d5bcc042b2a247867589985f' (2023-07-22)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/46ed466081b9cad1125b11f11a2af5cc40b942c7' (2023-07-15)
  → 'github:nixos/nixpkgs/f465da166263bc0d4b39dfd4ca28b777c92d4b73' (2023-07-22)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/5e28316db471d1ac234beb70031b635437421dd6' (2023-07-14)
  → 'github:cachix/pre-commit-hooks.nix/eb433bff05b285258be76513add6f6c57b441775' (2023-07-18)

(cherry picked from commit 6f6b0b9661)
 2023-07-26 12:40:00 +00:00
PandaNinjas
0fe184251d Update libnbtplusplus submodule 
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
(cherry picked from commit 2253100ac6)
 2023-07-26 12:39:57 +00:00
Tayou
f51a66dad5
Merge pull request #1432 from TheKodeToad/revert-revert-hide-provider-column 2023-07-25 14:32:07 +02:00
TheKodeToad
071e86fe68 Revert "Revert "feat(Mods): hide 'Provider' column when no mods have providers"" 
This reverts commit 5eb71fc6a9.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-25 12:27:50 +01:00
Sefa Eyeoglu
d7a02ee456
Merge pull request #1428 from PrismLauncher/backport-1426-to-release-7.x 2023-07-24 20:42:05 +02:00
TheKodeToad
648a69594f Fix token "0" being replaced 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit f505d43fc0)
 2023-07-24 18:41:43 +00:00
Sefa Eyeoglu
70fdfd1526
Merge pull request #1416 from PrismLauncher/bump-7.2 
Bump to 7.2
 2023-07-21 23:01:04 +02:00
TheKodeToad
1e324e3e2f Bump to 7.2 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-21 21:44:51 +01:00
Sefa Eyeoglu
8bbe307a31
chore: trigger build 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-07-21 21:54:44 +02:00
Sefa Eyeoglu
c946b2c4fb
Merge pull request #1408 from PrismLauncher/backport-1372-to-release-7.x 2023-07-19 08:36:56 +02:00
github-actions[bot]
2dcfab0a19 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/267149c58a14d15f7f81b4d737308421de9d7152' (2023-07-01)
  → 'github:hercules-ci/flake-parts/8e8d955c22df93dbe24f19ea04f47a74adbdc5ec' (2023-07-04)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/cd99c2b3c9f160cd004318e0697f90bbd5960825' (2023-07-01)
  → 'github:nixos/nixpkgs/46ed466081b9cad1125b11f11a2af5cc40b942c7' (2023-07-15)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/42587d3414d1747999a5f71e92a83cf6547b62da' (2023-07-03)
  → 'github:cachix/pre-commit-hooks.nix/5e28316db471d1ac234beb70031b635437421dd6' (2023-07-14)

(cherry picked from commit 6597a5c860)
 2023-07-18 22:17:26 +00:00
TheKodeToad
b0b9b89bce
Merge pull request #1406 from PrismLauncher/backport-1397-to-release-7.x 
[Backport release-7.x] Make Launch Offline not launch online in 1.6+
 2023-07-18 22:46:05 +01:00
Josiah Glosson
862f4fb061 Make Launch Offline not launch online in 1.6+ 
Signed-off-by: Josiah Glosson <soujournme@gmail.com>
(cherry picked from commit 1fbb41f5e2)
 2023-07-18 21:40:28 +00:00
Sefa Eyeoglu
7c5d07e74d
Merge pull request #1404 from PrismLauncher/backport-1385-to-release-7.x 2023-07-18 22:46:25 +02:00
TheKodeToad
fe1ea7240e
Merge pull request #1334 from TheKodeToad/litemod-dl 
LiteMod downloading
 2023-07-18 22:43:35 +02:00
Sefa Eyeoglu
6f1d594f1c
Merge pull request #1128 from pandaninjas/fix-implicit-fallthrough 2023-07-18 22:43:35 +02:00
Dallas Strouse
7baaf83f1d Update Flatpak manifest 
Signed-off-by: Dallas Strouse <dastrouses@gmail.com>
(cherry picked from commit 2eff1de560)
 2023-07-18 20:41:33 +00:00
Sefa Eyeoglu
bab7105820
Merge pull request #1403 from PrismLauncher/backport-1362-to-release-7.x 2023-07-18 22:29:16 +02:00
Trial97
1389b74a8a fixed warning 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 440afcedb0)
 2023-07-18 20:28:46 +00:00
Trial97
5aa3aabdf9 insert header 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit b0a21c9389)
 2023-07-18 20:28:46 +00:00
Trial97
42d2c7446a format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit fc4a1ef193)
 2023-07-18 20:28:46 +00:00
TheKodeToad
71a7358287
Merge pull request #1395 from PrismLauncher/backport-1387-to-release-7.x 
[Backport release-7.x] Check if any modloader is installed
 2023-07-17 17:42:00 +01:00
Sefa Eyeoglu
eaf125c31a fix: don't take modloaders by reference 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 2be630904f)
 2023-07-17 16:41:05 +00:00
Sefa Eyeoglu
f7e018d41a fix: check if any modloader is installed 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 54a091ca59)
 2023-07-17 16:41:05 +00:00
Sefa Eyeoglu
7d6e07ea71
Merge pull request #1384 from PrismLauncher/backport-1357-to-release-7.x 
[Backport release-7.x] feat: add toggle for quilt beacon
 2023-07-17 06:43:57 +02:00
seth
cd011a097b chore: better explain quilt loader beacon 
Signed-off-by: seth <getchoo@tuta.io>
(cherry picked from commit a2a09ffe01)
 2023-07-17 04:43:06 +00:00
seth
055bcc2721 feat: add toggle for quilt beacon 
Signed-off-by: seth <getchoo@tuta.io>
(cherry picked from commit 89aaedc06c)
 2023-07-17 04:43:06 +00:00
Sefa Eyeoglu
4bc4b29d5b
Merge pull request #1380 from PrismLauncher/backport-1276-to-release-7.x 2023-07-16 23:20:05 +02:00
Sefa Eyeoglu
82a9e7d372 fix(actions): set all build platforms to official 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 40fb387185)
 2023-07-16 21:16:11 +00:00
Sefa Eyeoglu
cb81cadee3 fix: set default platform to "unknown" 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 63acf0a7b4)
 2023-07-16 21:16:11 +00:00
Sefa Eyeoglu
0d8283df97 feat: print build platform in application log 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit fce000206f)
 2023-07-16 21:16:11 +00:00
Sefa Eyeoglu
d4014534eb feat: print build platform in log 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit f5e4171df4)
 2023-07-16 21:16:11 +00:00
Sefa Eyeoglu
3c5ec5d967 chore: remove obsolete macOS warning 
We don't support that macOS version. This check also never worked, as we
never set the platform to that value.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 0aaec9ae4f)
 2023-07-16 21:16:11 +00:00
Sefa Eyeoglu
e3625cad91
Merge pull request #1369 from Trial97/autoselect 2023-07-16 20:43:16 +02:00
Tayou
bb945c5165
Merge pull request #1368 from Trial97/crash_curse_import 2023-07-16 20:43:16 +02:00
Rachel Powers
daa5fcce67
Merge pull request #1351 from Trial97/ftb_import 
fixed substatus on ftb_import
 2023-07-16 20:43:16 +02:00
seth
2bcebe2989
Merge pull request #1336 from Ryex/packaging/fix-duplicate-share-directories 
packaging: fix duplicate share directories (use only lowercase)
 2023-07-16 20:43:15 +02:00
Sefa Eyeoglu
27f6debdaf
Merge pull request #1306 from Ryex/ci/address-sanitiser_on_debug_builds 2023-07-16 20:43:15 +02:00
seth
7926170073
Merge pull request #1335 from Ryex/fix/gh-1322-old-zip-mods-in-wrong-place 
fix(flame install): don't assume .zip is a resource pack. default to mod
 2023-07-16 20:43:15 +02:00
Rachel Powers
79537f2948
Merge pull request #1352 from Trial97/crash_after_abort 
Do not reset shared pointer if it's already empty
 2023-07-16 20:43:15 +02:00