Commit Graph

3181 Commits

Author SHA1 Message Date
Sebastian
a3b3598666 Update main.yml 2022-04-26 17:21:55 -05:00
Sebastian
8a42f06693 Merge pull request #179 from Samisafool/patch-1
Update BUILD.md
2022-04-17 12:20:48 -05:00
Samisafool
62f6b8eab2 Update BUILD.md 2022-04-15 09:43:01 +05:30
Zakhar Afonin
c20513a8c1 Update README.md 2022-04-14 15:02:41 +03: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
Zakhar Afonin
18aa0d2faa Minor fixes to make UltimMC actually build 2022-01-19 22:11:18 +03:00
Sebastian
043658b077 Upstream TeamCity is dead 2022-01-13 19:26:17 -05:00
Sebastian
9ae1701c9c Update GitHub actions 2022-01-13 19:24:22 -05: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
6d3eace2a8 NOISSUE fix up java dependency to 1.7 so builds work again
'7' is not a thing
2021-12-19 19:11:08 +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
5961c69019 Merge pull request #4321 from davispuh/java
Update Java version to 7+
2021-12-19 18:42:29 +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
Petr Mrázek
2f7fd221af Merge pull request #4367 from jamierocks/license-headers-jm
NOISSUE Add license headers to source files created by me
2021-12-19 18:35:43 +01:00
Petr Mrázek
1f4e3e83e3 Merge pull request #4364 from rfl890/patch-1
Change from Oracle JDK to AdoptOpenJDK
2021-12-19 18:35:32 +01:00
Petr Mrázek
fe12b58d06 Merge pull request #4373 from ImperatorStorm/update-man
Fixed small oversight in README.md
2021-12-19 18:29:50 +01:00
ImperatorStorm
d19ad15aec Fixed small oversight in README.md 2021-12-19 09:26:30 -08:00
rfl890
8bc3293ad0 Update BUILD.md 2021-12-19 07:59:19 -05:00
Jamie Mansfield
06bedee835 NOISSUE Add license headers to source files created by me 2021-12-18 00:14:25 +00:00
rfl890
7e1eb02ee6 Change from Oracle JDK to AdoptOpenJDK
The Oracle JDK 8 is now offered at a commercial license and requires an account to download. OpenJDK has no such license and is completely free to use.
2021-12-17 08:11:06 -05: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
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
c29b616497 Update Java version to 7+
Otherwise currently it doesn't build with newer Java
2021-12-10 03:15:01 +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