Commit Graph

3155 Commits

Author SHA1 Message Date
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
6336401aea Merge branch 'MultiMC:develop' into develop 2021-12-11 19:43:25 -05:00
Petr Mrázek
431d773eec NOISSUE We are using es_UY as latin american spanish
Make it actually say that in the UI.
2021-12-11 13:06:53 +01:00
Sebastian
79a23442d7 Fix files in CMake file 2021-12-10 18:13:19 -05:00
Sebastian-byte
a0b42d4745 Merge branch 'MultiMC-develop' into develop 2021-12-10 18:07:47 -05: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
Petr Mrázek
298564ed71 Merge pull request #4327 from NewoIsTaken/patch-1
NOISSUE Ignore Install Directory
2021-12-10 20:49:00 +01:00
Owen Wang
871ceb21dd NOISSUE Ignore Install Directory 2021-12-10 14:03:38 -05:00
Sebastian
3d873a39e8 Merge pull request #129 from davispuh/auth
Fix InjectAuthlib
2021-12-10 00:28:37 -05:00
Dāvis Mosāns
663e6a313c Fix Microsoft account provider 2021-12-10 07:18:54 +02:00
Dāvis Mosāns
92e1a0fa08 Fix InjectAuthlib 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
80beccb2c4 NOISSUE Add small workaround for presenting Japanese with Kanji 0.6.14 2021-12-08 01:23:12 +01:00
Petr Mrázek
dba4c452e0 NOISSUE account tweaks 2021-12-08 01:22:57 +01: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
a5581b479e NOISSUE fix launching offline while online 2021-12-06 20:17:31 +01:00
Petr Mrázek
825ef52dd5 NOISSUE fix up some corner cases around migrating accounts 2021-12-06 20:16:13 +01:00
Petr Mrázek
3a940ffb52 NOISSUE Add cat xcf file 2021-12-06 02:40:53 +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
cd513c02c4 NOISSUE bump version and update the changelog 2021-12-05 22:06:01 +01:00
Petr Mrázek
c8ca6acc15 NOISSUE fix some error mappings for Mojang accounts 2021-12-05 03:48:07 +01:00
Petr Mrázek
d37003b1de NOISSUE fix builds, make account refresh queue user friendly 2021-12-04 02:10:14 +01:00
Petr Mrázek
db6431d9e0 NOISSUE add missing chrono include 2021-12-04 01:27:58 +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
Petr Mrázek
ffcef673de Merge pull request #4285 from khenriks/develop
Fix instructions for building on Mac
2021-11-30 20:24:19 +01:00
Petr Mrázek
241086883e Merge pull request #4230 from NewoIsTaken/patch-1
GH-4224 Scan 64 bit lib directory to find Java
2021-11-28 21:45:36 +01:00
K Henriksson
20eada7bbe Fix instructions for building on Mac
Relative paths and .. components don't work with CMake's bundle support.

The also adds a note about potential code signing problems.
2021-11-28 10:44:51 -08:00
Petr Mrázek
859d710581 GH-4071 handle invalid MSA refresh token as a hard error 2021-11-28 19:01:21 +01:00
Petr Mrázek
285188ea53 GH-4071 handle network errors when logging in with MSA as 'soft'
This makes the tokens not expire when such errors happen.

Only applies to MSA, not the XBox and Mojang steps afterwards.
Further testing and improvements are still needed.
2021-11-28 18:42:01 +01:00
Petr Mrázek
0e31f77468 Merge pull request #4283 from khenriks/fixicon
Install launcher icns to correct file name
2021-11-28 13:10:15 +01:00
K Henriksson
024f5952ce Install launcher icns to correct file name 2021-11-25 15:14:28 -08:00
Sebastian-byte
ee46b67d09 Merge branch 'MultiMC-develop' into develop 2021-11-23 19:59:03 -05:00
Sebastian-byte
95b8e17ae2 Fix another conflict 2021-11-23 19:57:06 -05:00
Petr Mrázek
a522cad6d6 NOISSUE also undo the AUTORCC change because it was also broken
It broke 32bit linux builds...
2021-11-23 01:37:13 +01:00
Petr Mrázek
b49987e876 NOISSUE fix fix fix the accounts again 2021-11-23 01:25:24 +01:00
Petr Mrázek
27e328c044 NOISSUE Do not rely on AUTOUIC
It is bugged and does not detect changes in .ui files, which makes development painful.
2021-11-22 14:29:38 +01:00
Petr Mrázek
b258eac215 NOISSUE continue reshuffling the codebase 2021-11-22 03:55:16 +01:00
Petr Mrázek
5040231f8d NOISSUE fix build on macOS 2021-11-21 23:42:55 +01:00
Petr Mrázek
9fc677c2a4 NOISSUE more refactoring 2021-11-21 23:36:55 +01:00
Petr Mrázek
69213b1206 NOISSUE continue refactoring things to make tests pass 2021-11-21 23:21:12 +01:00
Sebastian-byte
0cbae4aa38 Hopefully does some build fixes 2021-11-20 16:26:01 -05:00
Abhay
b3412ca15c Update launcher icon (#106)
* Update launcher icon

* Added logo as SVG.

* Removed PNG.

Co-authored-by: Abhay <abdu@abhays-macbook-air.local>
2021-11-20 14:49:18 -05:00
Sebastian-byte
f2f9ded41d Merge branch 'MultiMC-develop' into develop 2021-11-20 14:37:14 -05:00
Sebastian-byte
b7509c80bf Fix conflict 2021-11-20 14:35:57 -05:00
Petr Mrázek
c2c56a2f6c NOISSUE fix build 2021-11-20 17:08:34 +01:00
Petr Mrázek
0c861db7a2 NOISSUE Some happy little refactors 2021-11-20 16:22:22 +01:00
Samisafool
66bb7105db misc stuff (#99)
* Remove more mojang account references where they don't belong

I forgor 💀 to put this in the last PR

* Update README.md

* Change patreon button to "Support MultiMC" instead of "Support UltimMC"

* requested changes
2021-11-18 01:28:28 -05:00
Sebastian
21d4b896cb Merge branch 'MultiMC:develop' into develop 2021-11-17 15:49:48 -05:00