Commit Graph

3316 Commits

Author SHA1 Message Date
Sebastian
9b82554b60 Merge branch 'MultiMC:develop' into develop 2022-06-11 07:34:35 -05:00
Petr Mrázek
7e63ddf7d4 NOISSUE Bump version 2022-06-11 13:21:44 +02:00
Petr Mrázek
583b63e90e NOISSUE fix typo in changelog 2022-06-10 02:10:07 +02:00
Sebastian
1cf815a8ff Merge branch 'MultiMC-develop' into develop 2022-06-09 18:34:06 -05:00
Sebastian
a0251bd9aa Solve conflicts 2022-06-09 18:33:37 -05:00
Petr Mrázek
c6b60969bb NOISSUE update changelog for 0.6.16 0.6.16 2022-06-09 23:50:30 +02:00
Petr Mrázek
c7256744c6 GH-3012 add --offline and --name arguments
These allow launching offline with a specified name from the command line.
2022-06-09 23:46:28 +02:00
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
dd7bba93ab Update main.yml 2022-06-09 11:41:37 -05:00
Sebastian
77791a6abb Update main.yml 2022-06-09 11:36:52 -05:00
Sebastian
3d35f0a512 Update main.yml 2022-06-09 11:32:17 -05:00
Sebastian
b8b4725a84 Update main.yml 2022-06-09 11:23:16 -05:00
Sebastian
7f70f1a149 Update main.yml 2022-06-09 11:17:54 -05:00
Sebastian
76d35871d8 Update main.yml 2022-06-09 11:13:24 -05:00
Sebastian
abd412b455 Merge branch 'MultiMC:develop' into develop 2022-06-06 18:09:02 -05:00
Petr Mrázek
dd277cba08 NOISSUE properly assign license to Mojang binary package code 2022-06-06 22:12:21 +02:00
Petr Mrázek
fdedf7078e NOISSUE Add minimal thing for clang-tidy integration 2022-06-06 22:08:31 +02:00
Petr Mrázek
fe75a7f09e NOISSUE slightly improve Forge detection in FTBA import 2022-06-05 00:09:28 +02:00
Petr Mrázek
305157746a NOISSUE Do not log Mojang token response 2022-06-05 00:08:49 +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
003756719c Update main.yml 2022-05-23 16:55:28 -05:00
Sebastian
b226fa8467 Update main.yml 2022-05-23 16:52:02 -05:00
Sebastian
7d37c5c355 Update main.yml 2022-05-23 16:45:59 -05:00
Sebastian
397adb3911 Merge branch 'MultiMC:develop' into develop 2022-05-23 16:45:29 -05:00
Petr Mrázek
399247a018 Merge pull request #4714 from jamierocks/h-atl-depends
NOISSUE Handle depends for main class and extra arguments for ATLauncher
2022-05-23 22:52:10 +02:00
Jamie Mansfield
0327a3cdbf NOISSUE Delete files from configs if they conflict with a mod 2022-05-23 21:40:14 +01:00
Jamie Mansfield
c88f147ae4 NOISSUE Handle extra arguments depends for ATLauncher 2022-05-23 20:42:37 +01:00
Jamie Mansfield
f9924af2a0 NOISSUE Handle main class depends for ATLauncher 2022-05-23 20:42:23 +01:00
Sebastian
bb324ac446 Brand properly with UltimMC 2022-05-23 18:53:16 +00:00
Sebastian
c74221f387 Update main.yml 2022-05-22 10:56:54 -05:00
Sebastian
36c1692f96 Merge branch 'MultiMC:develop' into develop 2022-05-22 09:51:14 -05:00
Sebastian
8676b566d9 Update main.yml 2022-05-22 09:43:21 -05:00
Sebastian
469654a82d Update main.yml 2022-05-22 09:40:30 -05:00
Petr Mrázek
edc351c0d0 Merge pull request #4706 from TrymDev/patch-1
Typo in LoggedProcess.cpp
2022-05-22 16:39:49 +02:00
Sebastian
6ae0d53c8f Merge pull request #200 from Samisafool/develop
Fix build
2022-05-22 09:02:16 -05:00
Samisafool
8d25c988c1 Fix build 2022-05-22 10:29:12 +05:30
Sebastian
e32ebefba9 Update main.yml 2022-05-21 19:09:11 -05:00
Sebastian
bf25cad719 Update README.md 2022-05-21 18:32:58 -05:00