Trial97
|
254444470f
|
renamed enum type
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-20 16:40:58 +03:00 |
|
TheKodeToad
|
0aaea9bf5d
|
Merge pull request #1547 from Scrumplex/revert-quilt-beacon
Remove Quilt Beacon toggle
|
2023-08-20 12:43:49 +01:00 |
|
Sefa Eyeoglu
|
5b4dcae7d9
|
Revert "feat: add toggle for quilt beacon"
This reverts commit 89aaedc06c.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-20 13:23:11 +02:00 |
|
Sefa Eyeoglu
|
963627fe98
|
Revert "chore: better explain quilt loader beacon"
This reverts commit a2a09ffe01.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-20 13:23:08 +02:00 |
|
Sefa Eyeoglu
|
232bb568da
|
Merge pull request #1544 from PrismLauncher/update_flake_lock_action
|
2023-08-20 12:01:37 +02:00 |
|
github-actions[bot]
|
d3c7850f53
|
chore(nix): update lockfile
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/f0451844bbdf545f696f029d1448de4906c7f753' (2023-08-12)
→ 'github:nixos/nixpkgs/ca3c9ac9f4cdd4bea19f592b32bb59b74ab7d783' (2023-08-19)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/c5ac3aa3324bd8aebe8622a3fc92eeb3975d317a' (2023-08-11)
→ 'github:cachix/pre-commit-hooks.nix/7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa' (2023-08-17)
|
2023-08-20 00:16:56 +00:00 |
|
TheKodeToad
|
ebbc8838a8
|
Merge pull request #1541 from Trial97/neoforge_search
feat:neoforge can download forge mods
|
2023-08-19 23:10:56 +01:00 |
|
Trial97
|
d25e89a4c1
|
refactor packwiz file write
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-20 00:48:46 +03:00 |
|
TheKodeToad
|
f99b04bd16
|
Merge pull request #1320 from TheKodeToad/better-launch
Combine launch buttons in instance window, persist profiler
|
2023-08-19 11:08:02 +01:00 |
|
Sefa Eyeoglu
|
acf586ef82
|
chore: add fixme about UI code in Minecraftinstance
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-19 10:21:46 +02:00 |
|
Trial97
|
0138cd65cb
|
feat:neoforge can download forge mods
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-19 09:00:59 +03:00 |
|
Trial97
|
ab6301d5a1
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
|
2023-08-19 00:38:40 +03:00 |
|
Sefa Eyeoglu
|
3098aecf97
|
Merge pull request #1498 from Scrumplex/neoforge
|
2023-08-18 22:56:55 +02:00 |
|
Trial97
|
05094b7382
|
more fixes
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-18 22:24:30 +03:00 |
|
Trial97
|
58efd3e9e2
|
fixed code scaning
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-18 21:43:57 +03:00 |
|
Trial97
|
4c52b18bdd
|
replaced removeFirst with mid
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-18 20:19:51 +03:00 |
|
Trial97
|
44ff247f5f
|
feat:refactored modpack ux
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-18 20:03:02 +03:00 |
|
Trial97
|
fecc1e087a
|
Add Trial97 to contribuitors list
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-18 13:35:50 +03:00 |
|
Trial97
|
d3acac16e6
|
added -Wno-gnu-zero-variadic-macro-arguments and fixed more warnings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-18 13:10:13 +03:00 |
|
Alexandru Ionut Tripon
|
28ffa8bf44
|
Update launcher/ui/pages/global/MinecraftPage.ui
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-08-18 12:57:08 +03:00 |
|
TheKodeToad
|
eb4efa5a9c
|
Merge pull request #1535 from Scrumplex/fix-skin-browse-btn
Fix browse button size in Skin Upload dialog
|
2023-08-18 10:47:42 +01:00 |
|
Trial97
|
6d1c67663d
|
feat:added option to show playtime in hours
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-18 12:24:28 +03:00 |
|
Sefa Eyeoglu
|
f4ebeedc21
|
fix: fix browse button size in skin upload dialog
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-18 09:01:57 +02:00 |
|
Sefa Eyeoglu
|
be2888d6fb
|
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-17 22:23:50 +02:00 |
|
Trial97
|
7ab391904a
|
Flame support for neoforge
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-17 22:23:34 +02:00 |
|
Sefa Eyeoglu
|
aac734d174
|
fix: add theoretical support for NeoForge in FTB modpacks
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-17 22:21:12 +02:00 |
|
TheKodeToad
|
ffd8ed550f
|
Reformat
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-17 18:53:32 +01:00 |
|
Trial97
|
c5bac475e8
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
|
2023-08-17 17:29:57 +03:00 |
|
Sefa Eyeoglu
|
e88418ab7f
|
Merge pull request #1392 from Scrumplex/feat-native-override
|
2023-08-17 16:09:16 +02:00 |
|
Trial97
|
bc0934a19c
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curseforge-url-handle
|
2023-08-17 15:25:32 +03:00 |
|
Trial97
|
044ce4df32
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file
|
2023-08-17 15:24:14 +03:00 |
|
Trial97
|
758999fa64
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background
|
2023-08-17 15:23:22 +03:00 |
|
Trial97
|
4a1d85f999
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
|
2023-08-17 14:23:37 +03:00 |
|
TheKodeToad
|
6da2e7d3f6
|
I was forced
/j
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-17 10:12:38 +01:00 |
|
Sefa Eyeoglu
|
85f36ebed7
|
Merge pull request #981 from Ryex/curseforge-url-handle
|
2023-08-17 09:24:35 +02:00 |
|
Trial97
|
f8ffb14619
|
Merge branch 'curseforge-url-handle' of github.com:Trial97/PrismLauncher into curseforge-url-handle
|
2023-08-17 00:25:38 +03:00 |
|
Trial97
|
5e2d1ffdfb
|
removed line
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-17 00:23:53 +03:00 |
|
TheKodeToad
|
3e2733d840
|
Merge branch 'develop' into better-launch
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-16 22:23:38 +01:00 |
|
Trial97
|
bad44ea264
|
feat:added flame install mod metadata
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-17 00:14:49 +03:00 |
|
Trial97
|
f0da16a758
|
removed line
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-17 00:13:12 +03:00 |
|
Trial97
|
b0e197de38
|
removed warning for one mod selected
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-16 21:26:43 +03:00 |
|
Alexandru Ionut Tripon
|
6c2c724bd9
|
Update launcher/ui/pages/instance/ExternalResourcesPage.ui
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-08-16 21:03:09 +03:00 |
|
Sefa Eyeoglu
|
c88088c91a
|
Merge pull request #1524 from PrismLauncher/renovate/korthout-backport-action-1.x
|
2023-08-16 19:28:41 +02:00 |
|
Trial97
|
f919d363b7
|
made safe for vegetarians
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-16 20:02:32 +03:00 |
|
Trial97
|
589d8b6923
|
feat:Added remove metadata button
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-16 19:53:39 +03:00 |
|
Sefa Eyeoglu
|
a5e7aedb4f
|
Merge pull request #1523 from Trial97/atlauncher
Fix crash when installing some ATLauncher packs
|
2023-08-16 07:18:34 +02:00 |
|
renovate[bot]
|
07f25d6cca
|
chore(deps): update korthout/backport-action action to v1.4.0
|
2023-08-15 14:19:42 +00:00 |
|
Trial97
|
c22eec8f27
|
fixed crash on atlauncher pack install
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 17:03:51 +03:00 |
|
Trial97
|
1faf741004
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 13:29:42 +03:00 |
|
TheKodeToad
|
8cff7c4de6
|
Merge branch 'develop' into rename-groups
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-15 11:03:19 +01:00 |
|