Commit Graph

1306 Commits

Author SHA1 Message Date
a1fbf2b137 Merge pull request #346 from ryanccn/more-user-friendly-java-warning-text-ahaha 2022-11-15 14:47:36 +01:00
0b98a0884e Merge pull request #368 from PrismLauncher/credits 2022-11-15 14:47:36 +01:00
32b526b729 Merge pull request #333 from flowln/fix_atl_packs_post_modpack_update 2022-11-01 11:01:15 +01:00
7f6515dbe4 Merge pull request #329 from flowln/only_safe_workarounds 2022-11-01 11:01:15 +01:00
a39390b8b4 Merge pull request #359 from Chrono-byte/develop 2022-11-01 09:48:13 +01:00
63a3dd1919 Merge pull request #351 from Scrumplex/fix-trash 2022-10-31 22:58:09 +01:00
7a5a4de6ea Merge pull request #354 from Scrumplex/translations-maybe
Improve display names of certain languages
2022-10-31 11:31:47 +01:00
664d4e701e Merge pull request #352 from TheLastRar/Win-setDarkWinTitlebar-10OrGreater 2022-10-31 11:31:47 +01:00
a4ba8d8288 Merge pull request #353 from FayneAldan/accounts-consistency 2022-10-31 01:42:20 +01:00
392bf7a97b Merge pull request #342 from fn2006/prism-svg-fix 2022-10-29 23:11:37 +02:00
34687049b1 Merge pull request #338 from Scrumplex/fix-credits-1 2022-10-29 16:15:58 +02:00
9337ec6706 Merge pull request #173 from Scrumplex/fix-icons 2022-10-29 00:36:15 +02:00
ed28234cfb Merge pull request #319 from Scrumplex/fix-avoid-mr-segfault 2022-10-28 21:34:59 +02:00
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
2652f37453 Merge pull request #206 from flowln/changelog_height_fix 2022-10-28 21:34:59 +02:00
0eaff22145 Merge pull request #283 from flowln/fix_abort_on_autosearch 2022-10-28 21:34:59 +02:00
e28480a8e4 Merge pull request #274 from Protrikk/patch-1 2022-10-28 21:34:59 +02:00
fcef6321fc Merge pull request #228 from bensuperpc/change_cast 2022-10-28 21:34:59 +02:00
35e792c5de Merge pull request #240 from jn64/fix/version-label-width 2022-10-28 21:34:59 +02:00
c08b632b51 Merge pull request #234 from AliceDTRH/fix/dedupejava 2022-10-28 21:34:59 +02:00
cac800bfd8 Merge pull request #233 from jamierocks/atl-fix-aborting-installs 2022-10-28 21:34:59 +02:00
2eb8173951 Merge pull request #224 from jamierocks/atl-abort-close-optional-mods-dialog 2022-10-28 21:34:59 +02:00
75abf2c124 Merge pull request #225 from Scrumplex/fix-segfault-fileresolver 2022-10-28 21:34:59 +02:00
d40a18d6c5 Merge pull request #218 from getchoo/change-jars-path 2022-10-28 21:34:59 +02:00
a74fdc588c Merge pull request #185 from flowln/fix_blocked_mods_crash 2022-10-28 21:34:59 +02:00
c984e9b5d6 Merge pull request #202 from Heath123/patch-1 2022-10-28 21:34:59 +02:00
ddd319369a Merge pull request #39 from Sebbl0508/mod_dialog_fontsize 2022-10-28 21:34:59 +02:00
de3c336213 Merge pull request #184 from Chrono-byte/develop 2022-10-28 21:34:59 +02:00
4e08f28246 Merge pull request #31 from flowln/who_needs_webview 2022-10-19 14:28:29 +02:00
46c57e120f Merge pull request #27 from flowln/ftb_install_improve 2022-10-19 13:51:35 +02:00
61fbc5a791 refactor: replace with new logo
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-19 13:08:23 +02:00
8201d1df02 Rename
Signed-off-by: Samisafool <thenerdiestguy@gmail.com>
2022-10-19 15:02:43 +05:30
888a87463e Add fallback for multimc.cfg
Signed-off-by: Fayne Aldan <FayneAldan@gmail.com>
2022-10-18 14:40:34 -06:00
3a95a3b7c1 fix: don't take item from a possibly empty list
The list gets destroyed when we take the last object, so things explode.
😔

Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-18 16:51:42 -03:00
fb4cf0b75d Merge pull request #55 from flowln/config_add_fallback 2022-10-18 19:50:34 +02:00
83ceb26151 Streamline Button changes to improve source readability. 2022-10-18 17:28:23 +02:00
32cdfb871c fix: add fallback for polymc.cfg
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-18 12:22:42 -03:00
801e7da5ee feat: allow specifying fallbacks to INI files
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-18 12:22:42 -03:00
3405fd91c6 Merge pull request #33 from DioEgizio/remove-useless-actions 2022-10-18 15:31:32 +02:00
194822f11e Merge pull request #28 from flowln/fix_copy 2022-10-18 15:27:53 +02:00
98963d4cdf Merge pull request #29 from Scrumplex/feat-clear-metadata 2022-10-18 15:25:56 +02:00
804ef36b20 Merge pull request #26 from Scrumplex/armhf 2022-10-18 15:24:33 +02:00
e05fe77bfe feat: remove redundant actions from instance toolbar and redundant "instance"s
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-10-18 14:43:29 +02:00
6db3f68ae1 refactor: use correct data path
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-18 13:58:50 +02:00
3ac398ac49 fix: use display name in code
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-18 09:50:27 +02:00
722194405a refactor: initial rebrand
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-18 09:37:59 +02:00
87d35f0d16 fix: remove some unused libs
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-10-15 20:16:15 +02:00
c089f9b59f Merge pull request #1203 from DioEgizio/macos-legacy 2022-10-15 15:24:30 +02:00
8bc529be3d fix: include hidden files when copying instances
fixes instance ccopy on linux .-.

Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-15 09:20:31 -03:00
303628bb05 refactor: support system ghc-filesystem
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-15 13:13:38 +02:00