fn2006
|
53e1f96bea
|
attempt to fix windows builds
|
2022-11-02 10:23:33 +00:00 |
|
fn2006
|
66a98380d0
|
i fucked up the cherrypick
|
2022-11-01 20:24:40 +00:00 |
|
Sefa Eyeoglu
|
466f9c3ec7
|
fix: fix logo name
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2022-11-01 20:08:46 +00:00 |
|
fn2006
|
d53a539764
|
update launcher.svg
|
2022-11-01 19:51:35 +00:00 |
|
fn2006
|
37fc2d5d79
|
fix build
|
2022-11-01 18:50:45 +00:00 |
|
fn2006
|
e6253c8091
|
update NIX.md
|
2022-11-01 18:49:21 +00:00 |
|
fn2006
|
44a5130926
|
Merge branch 'release-5.x' of https://github.com/PrismLauncher/PrismLauncher into prism
|
2022-11-01 18:48:31 +00:00 |
|
Sefa Eyeoglu
|
d8044ababe
|
Merge pull request #332 from Scrumplex/chore-bump-5.1
|
2022-11-01 11:01:49 +01:00 |
|
timoreo
|
32b526b729
|
Merge pull request #333 from flowln/fix_atl_packs_post_modpack_update
|
2022-11-01 11:01:15 +01:00 |
|
timoreo
|
7f6515dbe4
|
Merge pull request #329 from flowln/only_safe_workarounds
|
2022-11-01 11:01:15 +01:00 |
|
DioEgizio
|
a39390b8b4
|
Merge pull request #359 from Chrono-byte/develop
|
2022-11-01 09:48:13 +01:00 |
|
Sefa Eyeoglu
|
63a3dd1919
|
Merge pull request #351 from Scrumplex/fix-trash
|
2022-10-31 22:58:09 +01:00 |
|
DioEgizio
|
7a5a4de6ea
|
Merge pull request #354 from Scrumplex/translations-maybe
Improve display names of certain languages
|
2022-10-31 11:31:47 +01:00 |
|
DioEgizio
|
664d4e701e
|
Merge pull request #352 from TheLastRar/Win-setDarkWinTitlebar-10OrGreater
|
2022-10-31 11:31:47 +01:00 |
|
flow
|
a4ba8d8288
|
Merge pull request #353 from FayneAldan/accounts-consistency
|
2022-10-31 01:42:20 +01:00 |
|
txtsd
|
392bf7a97b
|
Merge pull request #342 from fn2006/prism-svg-fix
|
2022-10-29 23:11:37 +02:00 |
|
Sefa Eyeoglu
|
34687049b1
|
Merge pull request #338 from Scrumplex/fix-credits-1
|
2022-10-29 16:15:58 +02:00 |
|
fn2006
|
0f581efda5
|
fix hardcoded svg path
|
2022-10-29 14:16:14 +01:00 |
|
Sefa Eyeoglu
|
9337ec6706
|
Merge pull request #173 from Scrumplex/fix-icons
|
2022-10-29 00:36:15 +02:00 |
|
Sefa Eyeoglu
|
5bcb6962c4
|
chore: bump version
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2022-10-28 21:54:10 +02:00 |
|
txtsd
|
0617b43190
|
Merge pull request #322 from DioEgizio/64bit-it
|
2022-10-28 21:34:59 +02:00 |
|
Sefa Eyeoglu
|
ed28234cfb
|
Merge pull request #319 from Scrumplex/fix-avoid-mr-segfault
|
2022-10-28 21:34:59 +02:00 |
|
DioEgizio
|
9c4455ca03
|
Merge pull request #301 from DioEgizio/clang-attempt
feat(actions): use clang32 for building on windows
|
2022-10-28 21:34:59 +02:00 |
|
Sefa Eyeoglu
|
9ec7837275
|
Merge pull request #318 from TheLastRar/manifest-platform
Fix: Don't specify x86 in manifest
|
2022-10-28 21:34:59 +02:00 |
|
Sefa Eyeoglu
|
549b5a6488
|
Merge pull request #231 from tobimori/patch-1
|
2022-10-28 21:34:59 +02:00 |
|
DioEgizio
|
2652f37453
|
Merge pull request #206 from flowln/changelog_height_fix
|
2022-10-28 21:34:59 +02:00 |
|
Sefa Eyeoglu
|
0eaff22145
|
Merge pull request #283 from flowln/fix_abort_on_autosearch
|
2022-10-28 21:34:59 +02:00 |
|
flow
|
2f5393b9d0
|
Merge pull request #281 from Scrumplex/fix-nsis-displayname
|
2022-10-28 21:34:59 +02:00 |
|
Sefa Eyeoglu
|
e28480a8e4
|
Merge pull request #274 from Protrikk/patch-1
|
2022-10-28 21:34:59 +02:00 |
|
flow
|
fcef6321fc
|
Merge pull request #228 from bensuperpc/change_cast
|
2022-10-28 21:34:59 +02:00 |
|
Sefa Eyeoglu
|
35e792c5de
|
Merge pull request #240 from jn64/fix/version-label-width
|
2022-10-28 21:34:59 +02:00 |
|
flow
|
c08b632b51
|
Merge pull request #234 from AliceDTRH/fix/dedupejava
|
2022-10-28 21:34:59 +02:00 |
|
flow
|
cac800bfd8
|
Merge pull request #233 from jamierocks/atl-fix-aborting-installs
|
2022-10-28 21:34:59 +02:00 |
|
Sefa Eyeoglu
|
2eb8173951
|
Merge pull request #224 from jamierocks/atl-abort-close-optional-mods-dialog
|
2022-10-28 21:34:59 +02:00 |
|
Sefa Eyeoglu
|
75abf2c124
|
Merge pull request #225 from Scrumplex/fix-segfault-fileresolver
|
2022-10-28 21:34:59 +02:00 |
|
flow
|
d40a18d6c5
|
Merge pull request #218 from getchoo/change-jars-path
|
2022-10-28 21:34:59 +02:00 |
|
Sefa Eyeoglu
|
a74fdc588c
|
Merge pull request #185 from flowln/fix_blocked_mods_crash
|
2022-10-28 21:34:59 +02:00 |
|
flow
|
25b0ec6eff
|
Merge pull request #147 from Minion3665/enhancement/update-nix-derivation
|
2022-10-28 21:34:59 +02:00 |
|
txtsd
|
04e8982d33
|
Merge pull request #198 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x
|
2022-10-28 21:34:59 +02:00 |
|
txtsd
|
58bd449db8
|
Merge pull request #197 from PrismLauncher/renovate/actions-cache-3.x
|
2022-10-28 21:34:59 +02:00 |
|
Sefa Eyeoglu
|
c984e9b5d6
|
Merge pull request #202 from Heath123/patch-1
|
2022-10-28 21:34:59 +02:00 |
|
Sefa Eyeoglu
|
ddd319369a
|
Merge pull request #39 from Sebbl0508/mod_dialog_fontsize
|
2022-10-28 21:34:59 +02:00 |
|
Sefa Eyeoglu
|
de3c336213
|
Merge pull request #184 from Chrono-byte/develop
|
2022-10-28 21:34:59 +02:00 |
|
Sefa Eyeoglu
|
6e94e9bff1
|
Merge pull request #148 from ZombieNub/prismlauncher-rename
|
2022-10-28 21:34:59 +02:00 |
|
flow
|
93b8d9e454
|
Merge pull request #123 from MMK21Hub/patch-1
|
2022-10-28 21:34:59 +02:00 |
|
flow
|
6d46081864
|
Merge pull request #100 from TheEvilSkeleton/improve-approachability
|
2022-10-28 21:34:59 +02:00 |
|
fn2006
|
765fb42a7e
|
Update README.md
|
2022-10-24 16:33:52 +01:00 |
|
fn2006
|
ecade0f510
|
small fixes
|
2022-10-24 16:27:07 +01:00 |
|
fn2006
|
23e5773094
|
Merge branch 'release-5.x' of https://github.com/PrismLauncher/PrismLauncher into prism
|
2022-10-24 16:24:36 +01:00 |
|
fn2006
|
1b9b1ccf31
|
Update README.md
|
2022-10-19 15:54:32 +01:00 |
|