Commit Graph

57 Commits

Author SHA1 Message Date
Sebastian
98f41709eb Merge branch 'MultiMC:develop' into develop 2022-06-09 13:20:21 -05:00
Petr Mrázek
8235752dec NOISSUE stop marking Modrinth as WIP
Even though it might need more changes, it should be good to go.
2022-06-09 20:17:49 +02:00
Sebastian
abd412b455 Merge branch 'MultiMC:develop' into develop 2022-06-06 18:09:02 -05:00
Petr Mrázek
fe75a7f09e NOISSUE slightly improve Forge detection in FTBA import 2022-06-05 00:09:28 +02:00
Sebastian
99fa82c05e Merge branch 'MultiMC:develop' into develop 2022-05-30 17:51:54 -05:00
Petr Mrázek
214d615d18 NOISSUE significantly more reliable detection of modloaders for FTBA 2022-05-30 01:38:19 +02:00
Sebastian
d3d3ddb446 Merge branch 'MultiMC:develop' into develop 2022-05-29 01:14:22 -05:00
Petr Mrázek
66c6e6e05d NOISSUE disambiguate Json parsing calls 2022-05-29 04:58:42 +02:00
Petr Mrázek
f59822fd65 NOISSUE make FTBA import more lenient towards missing fields 2022-05-29 04:24:55 +02:00
Sebastian
11383e2be4 Merge branch 'MultiMC:develop' into develop 2022-05-28 18:19:47 -05:00
Petr Mrázek
43ebd02dcf NOISSUE it's LOCALAPPDATA not APPDATALOCAL... 2022-05-29 00:27:28 +02:00
Petr Mrázek
8a6f673567 NOISSUE maybe fix FTBA path on Windows? 2022-05-29 00:00:38 +02:00
Sebastian
f7dfa692c8 Merge branch 'MultiMC:develop' into develop 2022-05-28 16:37:12 -05:00
Petr Mrázek
efe181bd28 NOISSUE maybe fill in correct FTB App settings paths 2022-05-28 23:23:45 +02:00
Sebastian
dcbff71395 Merge branch 'MultiMC:develop' into develop 2022-05-28 16:18:56 -05:00
Petr Mrázek
41e5b3b628 NOISSUE Add FTB App import page to new instance dialog 2022-05-28 22:42:09 +02:00
Sebastian
c75ae2b218 Merge remote-tracking branch 'upstream/develop' into develop 2022-05-21 18:29:00 -05:00
Petr Mrázek
0a827ba70e NOISSUE Remove FTB and Curse integration
This has been requested by Slowpoke, on behalf of both FTB and OverWolf.

Import from locally installed packs from the official clients will be
the replacement, but for now, you will have to do that manually.

It was nice while it lasted.
2022-05-19 20:43:50 +02:00
Petr Mrázek
ceaea5db2f NOISSUE Redo Curse import on top of modpacks.ch API 2022-05-17 00:22:23 +02:00
Jamie Mansfield
40e67d2bc6 NOISSUE Use ModpacksCH rather than FTB in error messages
As the platform will now be used more widely than Feed The Beast, its
more appropriate that these error messages use the platform name.
2022-05-16 01:50:02 +02:00
Petr Mrázek
f948fd82ab NOISSUE fix build on Windows 2022-05-16 00:39:13 +02:00
Petr Mrázek
9c4fcb826d NOISSUE fix build on Linux 2022-05-16 00:37:29 +02:00
Petr Mrázek
5c1026bd12 NOISSUE Working import from Modrinth, license update to accomodate it 2022-05-16 00:25:36 +02:00
kb1000
acc637cfcb Start working on search 2022-05-12 00:20:35 +02:00
kb1000
831b76bb78 Add support for importing Modrinth packs from files 2022-05-11 23:51:33 +02:00
Petr Mrázek
a8b3d470da Merge pull request #3760 from kb-1000/quilt
GH-3742 add Install Quilt button
2022-04-23 18:34:52 +02:00
Petr Mrázek
6afff3e31f NOISSUE prevent -version being passed to the JRE
We want specific JREs, always, not something that is magically resolved.
This counteracts some really bad advice recently being spread on reddit.
2022-04-06 22:47:52 +02:00
kb1000
533cd09057 NOISSUE Rename Quilt intermediary references to hashed 2022-03-16 20:21:30 +01:00
kb1000
b2e18253a1 GH-3742 add Install Quilt button 2022-03-16 20:21:19 +01:00
jopejoe1
0fa6c7fbbf Drop MS-PL 2022-02-21 04:15:21 +13:00
jopejoe1
68fbbf0156 Update FTB Lagacy layout tobe more consistent with others 2022-02-21 03:53:27 +13:00
jopejoe1
da36a5f8de Update Technic layout to be more consistent with others 2022-02-21 03:50:37 +13:00
Petr Mrázek
3ca661127f NOISSUE Add missing tooltip for Export Instance action 2022-02-03 18:09:51 +01:00
Petr Mrázek
2cf04d034a Merge pull request #4300 from Ghosty141/feature/screenshot_copy
GH-4044 Implemented copy screenshots to the clipboard
2022-01-30 16:11:47 +01:00
Maftei Albert-Alexandru
4afe2466fd Actual fix for #135 (#154)
* Fix for #135 and fixes for other issues such as actually playing the game

* Removed accidentally added .vscode files

* Patchy patch
2022-01-24 20:58:54 -05:00
Petr Mrázek
9579231ccc NOISSUE fix build and change how NetJob is used
Feed it network upfront...
2021-12-31 05:27:59 +01:00
Janrupf
be029ab360 GH-4299 Fix screenshot upload 2021-12-29 19:45:24 +01:00
CreeperzEdge
95c9a6d8f4 Use correct title on Java check during setup 2021-12-23 00:53:02 +11:00
Sebastian
a29b3849ce Merge branch 'MultiMC:develop' into develop 2021-12-19 16:57:17 -05:00
Petr Mrázek
6f6fa6955a Merge pull request #4295 from kb-1000/instanceview-unused-code
NOISSUE Remove some unused code from InstanceView
2021-12-19 18:43:13 +01:00
Jamie Mansfield
06bedee835 NOISSUE Add license headers to source files created by me 2021-12-18 00:14:25 +00:00
Sebastian
fc22ddd13d Merge branch 'MultiMC:develop' into develop 2021-12-13 19:11:57 -05:00
Petr Mrázek
7d047f9223 NOISSE add a shortcut to the loaders mods to main window 2021-12-12 22:39:25 +01:00
Sebastian-byte
984a5b86b8 Fix conflict 2021-12-10 18:07:09 -05:00
Sebastian
7e7ac3abe5 Merge pull request #130 from davispuh/profile
Fix profileInUseFilter
2021-12-10 17:56:32 -05:00
Dāvis Mosāns
663e6a313c Fix Microsoft account provider 2021-12-10 07:18:54 +02:00
Dāvis Mosāns
0448a3e122 Fix profileInUseFilter 2021-12-10 03:00:38 +02:00
Petr Mrázek
90a62c429a NOISSUE remove the hardcoded blocking of Forge installs
Doesn't make it work, but makes it theoretically possible.
2021-12-06 22:07:41 +01:00
Petr Mrázek
70d400f205 NOISSUE party hat for a party cat
On the 30th of November, it's been 10 years since the first
(documented) release of MultiMC. Party hats for everyone :)
2021-12-05 23:26:04 +01:00
Petr Mrázek
3c46d8a412 GH-4071 Heavily refactor and rearchitect account system
This makes the account system much more modular
and makes it treat errors as something recoverable,
unless they come directly from the MSA refresh token
becoming invalid.
2021-12-04 01:18:05 +01:00