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
Zakhar Afonin
18aa0d2faa
Minor fixes to make UltimMC actually build
2022-01-19 22:11:18 +03:00
Sebastian
a29b3849ce
Merge branch 'MultiMC:develop' into develop
2021-12-19 16:57:17 -05:00
Petr Mrázek
3dd6cea8da
NOISSUE do people not even build their PRs when they make them?
2021-12-19 19:12:43 +01: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
Petr Mrázek
526b322a4a
Merge pull request #4330 from NewoIsTaken/develop
...
GH-4000 Scan for Adoptium JREs
2021-12-19 18:40:31 +01:00
Petr Mrázek
aaa12e1ddc
Merge pull request #4354 from ISSOtm/patch-1
...
Indicate the data folder when related errors occur
2021-12-19 18:36:28 +01:00
Jamie Mansfield
06bedee835
NOISSUE Add license headers to source files created by me
2021-12-18 00:14:25 +00:00
Eldred Habert
cb67fc1d15
Indicate the data folder when related errors occur
...
This should help troubleshooting such errors when they occur
2021-12-15 00:46:35 +01: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
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
NewoIsTaken
b1910642bf
GH-4000 Scan for Adoptium JREs
2021-12-10 21:17:09 -05:00
Sebastian
79a23442d7
Fix files in CMake file
2021-12-10 18:13:19 -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
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
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
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
kb1000
eb1091a5f4
NOISSUE Remove some unused code from InstanceView
2021-12-01 21:21:05 +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
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
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
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
Petr Mrázek
eafeb64dec
NOISSUE qnam -> network
2021-11-17 13:20:50 +01:00
Sebastian
4a2580d0b7
Merge branch 'MultiMC:develop' into develop
2021-11-16 15:52:50 -05:00
