Commit Graph

4854 Commits

Author SHA1 Message Date
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
Sefa Eyeoglu
9337ec6706
Merge pull request #173 from Scrumplex/fix-icons 2022-10-29 00:36:15 +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
Sefa Eyeoglu
41032aaac2
Merge pull request #110 from Scrumplex/fix-nsis-shortcut 2022-10-19 14:28:36 +02:00
Sefa Eyeoglu
4e08f28246
Merge pull request #31 from flowln/who_needs_webview 2022-10-19 14:28:29 +02:00
Sefa Eyeoglu
46c57e120f
Merge pull request #27 from flowln/ftb_install_improve 2022-10-19 13:51:35 +02:00
Sefa Eyeoglu
6b52ee61ae
Merge pull request #92 from Scrumplex/new-logo 2022-10-19 13:41:56 +02:00
Sefa Eyeoglu
61fbc5a791
refactor: replace with new logo
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-19 13:08:23 +02:00
Sefa Eyeoglu
22365205f9
fix: use display name for NSIS
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-19 12:17:06 +02:00
DioEgizio
c6515c1dad
Merge pull request #54 from Samisafool/develop 2022-10-19 12:13:13 +02:00
Samisafool
8201d1df02
Rename
Signed-off-by: Samisafool <thenerdiestguy@gmail.com>
2022-10-19 15:02:43 +05:30
timoreo
ddf168c536
Merge pull request #75 from Gideon9212/develop 2022-10-19 06:27:09 +02:00
Gideon9212
c9f81f56e9
Fix banner
Removed boosted URL for plain

Signed-off-by: Gideon9212 <gideon_gallagher@zoho.com>
2022-10-18 18:35:03 -07:00
Gideon9212
570264e1e9
Merge branch 'develop' into develop
Signed-off-by: Gideon9212 <gideon_gallagher@zoho.com>
2022-10-18 17:28:42 -07:00
flow
325e58d98c
Merge pull request #88 from FayneAldan/multimc-fallback
go all the way up the fork chain!
2022-10-18 19:27:24 -03:00
flow
23a2960aa3
Merge pull request #60 from jitterdev/develop 2022-10-18 18:53:30 -03:00
Fayne Aldan
888a87463e
Add fallback for multimc.cfg
Signed-off-by: Fayne Aldan <FayneAldan@gmail.com>
2022-10-18 14:40:34 -06:00