1860 Commits

Author	SHA1	Message	Date
Sefa Eyeoglu	c9bf7f9896	fix: load instances no matter their instance type	2022-02-26 00:31:37 +01:00
flow	c4f4e9e620	merge upstream and resolve conflicts	2022-02-25 13:43:27 -03:00
Ezekiel Smith	f2b850ad20	Merge pull request #183 from timoreo22/fix-versions-segfault ... Fixed segfault in mod download	2022-02-26 01:55:11 +11:00
Ezekiel Smith	ccc27d1b7c	Merge pull request #192 from Scrumplex/refactor-remove-legacy-instances ... Drop legacy instances	2022-02-26 01:54:15 +11:00
flow	40a9828fba	fix: improve readability and set ok button as disabled by default	2022-02-23 19:17:33 -03:00
flow	04840d0638	fix(ui): add translation func to text in the confirm dialog	2022-02-23 14:44:55 -03:00
flow	38f12c50f7	Merge branch 'PolyMC:develop' into develop	2022-02-23 14:34:51 -03:00
Sefa Eyeoglu	ca8b62291f	fix: use legacy data path if it exists	2022-02-23 16:22:53 +05:30
txtsd	69d01204e0	Implement PR suggestions	2022-02-23 16:22:53 +05:30
txtsd	1e3b896fda	Replace layouts with LAUNCH_PORTABLE	2022-02-23 16:22:23 +05:30
Sefa Eyeoglu	e2c2a38005	Merge pull request #186 from theglitch76-forks/develop ... Enable WSL support	2022-02-22 08:23:57 +01:00
flow	f8b0d6453a	fix: sort mod list in confirmation dialog	2022-02-21 23:25:33 -03:00
flow	0102e91940	feat: add confirm dialog for installing mods ... When selecting multiple mods at once, it can become hard to keep track of which ones you selected. To address this, a dialog is now displayed when you finish selecting the mods to download, showing you which ones you selected and their filenames. From there, you can either accept it and download the mods, or you can cancel it and go back to the mod selection dialog.	2022-02-21 23:09:14 -03:00
flow	1004211a66	fix(ui): change text in selection button when there's no valid version	2022-02-21 22:52:50 -03:00
flow	f5cf4eb45f	feat(ui): allow downloading multiple mods from CurseForge at once	2022-02-21 21:53:21 -03:00
flow	512395e3f1	feat(ui): allow downloading multiple mods in Modrinth at once	2022-02-21 21:34:53 -03:00
flow	9c6727e27f	feat: change task container in ModDownloadDialog to a QHash ... Previously, we used a unique_ptr to a ModDownloadTask to keep track of the selected mod to download when we accepted the dialog. In order to allow multiple mods to be selected at once for download, this has been changed to a QHash where the key is the mods name (since it doesn't seem right to allow for multiple versions of the same mod to be downloaded at once), and the value is a pointer to the corresponding ModDownloadTask.	2022-02-21 21:34:06 -03:00
Sefa Eyeoglu	624ab25cd4	refactor: set default InstanceType to OneSix	2022-02-21 22:59:07 +01:00
Sefa Eyeoglu	a70d1f1a91	refactor: drop LegacyInstance	2022-02-21 22:30:44 +01:00
Sefa Eyeoglu	3059f13011	refactor: drop migration for pre-component instances	2022-02-21 22:11:10 +01:00
swirl	6d1f9d4d02	fix	2022-02-21 12:44:34 -05:00
swirl	da70122d9c	remove notifications	2022-02-20 19:23:08 -05:00
Glitch	8556ff5eac	Revert ba6a97557a ... Let evil win.	2022-02-20 15:00:23 -06:00
timoreo	adacab3349	Fixed segfault when closing window while version info download is still going	2022-02-19 15:17:45 +01:00
Sefa Eyeoglu	80a29af497	fix: typo for account disabled error messages	2022-02-18 19:18:29 +01:00
Sefa Eyeoglu	c5d9944993	feat(accounts): interrupt MSAStep when client ID doesn't match	2022-02-18 12:32:24 +01:00
Sefa Eyeoglu	14717396eb	feat(accounts): save client id in MSAStep	2022-02-18 12:32:24 +01:00
Sefa Eyeoglu	9c71f364d2	feat(accounts): add disabled account state	2022-02-18 12:32:24 +01:00
Sefa Eyeoglu	be910374dc	feat(accounts): support msa-client-id value	2022-02-18 12:32:24 +01:00
LennyMcLennington	12c8a04458	Merge pull request #173 from Scrumplex/fix-application-cpp ... fix: improve code readability in Application.cpp	2022-02-17 23:43:59 +00:00
swirl	7b4b997a34	Merge remote-tracking branch 'upstream/develop' into develop	2022-02-17 15:47:43 -05:00
Sefa Eyeoglu	6b4469c6cc	fix: combine errors if --launch is missing	2022-02-17 15:29:09 +01:00
Sefa Eyeoglu	037b0d7190	fix: improve code readability in Application.cpp	2022-02-16 17:33:28 +01:00
Lenny McLennington	929a035f96	Revert "make wsl work" ... This reverts commit 5779f20fa1.	2022-02-13 18:47:54 +00:00
swirl	5779f20fa1	make wsl work	2022-02-13 13:35:15 -05:00
Sefa Eyeoglu	a309f4e721	fix: MSA = Microsoft Authentication	2022-02-12 21:27:35 +01:00
Sefa Eyeoglu	159d868b77	fix(ui): explain why 'Add Microsoft' might be disabled	2022-02-12 21:27:35 +01:00
Sefa Eyeoglu	0854e83ce4	feat: implement MSA client id override ... Closes #11	2022-02-12 21:27:32 +01:00
Sefa Eyeoglu	bb02226870	feat(ui): add custom MSA client id setting	2022-02-12 21:05:42 +01:00
Sefa Eyeoglu	70a055bc27	Merge pull request #143 from Scrumplex/refactor-link-nbtpp-static	2022-02-12 17:47:38 +01:00
Sefa Eyeoglu	61db1c46be	fix: use our own prefix for rainbow lib	2022-02-12 17:02:54 +01:00
LennyMcLennington	7d912726d0	Merge pull request #134 from glowiak/patch-2 ... OpenBSD support and slackware build instructions	2022-02-12 03:30:24 +00:00
swirl	3cf81faabc	change "loader mods" to "mods" ... Closes: #128	2022-02-11 22:09:47 -05:00
LennyMcLennington	bcfa3246cb	Merge pull request #146 from dada513/macos_application_support ... [MACOS] Move app data to Application Support	2022-02-11 13:52:56 +00:00
Sefa Eyeoglu	f67871e79e	refactor(build): link nbt++ statically	2022-02-11 14:24:01 +01:00
LennyMcLennington	2341212337	Merge pull request #150 from dada513/fix_kwin_icon ... Fix freedesktop icons. Again	2022-02-11 12:05:01 +00:00
LennyMcLennington	53ea261350	Merge pull request #151 from dada513/rss_not_begone ... Re-add RSS feed with the new PolyMC website	2022-02-11 12:03:29 +00:00
LennyMcLennington	a17e5d0a4d	Merge pull request #129 from timoreo22/fix-mod-name ... Fixed the download menu putting the wrong name	2022-02-10 23:41:27 +00:00
Sefa Eyeoglu	8d2e7db178	fix: update link to translations platform	2022-02-10 14:55:52 +01:00
dada513	13d41bde7f	remove unused parsing of dates (bloat)	2022-02-10 13:57:18 +01:00
dada513	d42d6fe25a	fix rss format	2022-02-10 13:57:06 +01:00
dada513	beaac54dc9	Merge remote-tracking branch 'polymc/develop' into rss_not_begone	2022-02-10 13:14:30 +01:00
dada513	70f8cb81b8	Initial RSS re-add and removed hardcoded strings	2022-02-10 13:14:25 +01:00
dada513	f8ca6b4867	Revert "refactor: remove news feed" ... This reverts commit 361ce7818e.	2022-02-10 12:55:07 +01:00
Lenny McLennington	35d2ae3ef7	Remove drama from readme and remove mmc discord link	2022-02-10 11:21:25 +00:00
dada513	619fcbfabf	rename LAUNCHER_DESKTOPNAME to LAUNCHER_DESKTOPFILENAME	2022-02-10 08:56:34 +01:00
dada513	292869141f	Merge remote-tracking branch 'polymc/develop' into fix_kwin_icon	2022-02-10 08:05:17 +01:00
dada513	ca9929214d	Merge remote-tracking branch 'polymc/develop' into macos_application_support	2022-02-10 08:04:59 +01:00
dada513	d72c511131	Revert "Fix freedesktop icons" and fix icon on kwin	2022-02-10 07:46:41 +01:00
Victor	d2f86cbf32	Move app data to Application Support	2022-02-09 12:23:18 +01:00
Lenny McLennington	5284d604ef	translations	2022-02-09 00:02:51 +00:00
glowiak	dba9199e58	Support OpenBSD in UpdateController.cpp	2022-02-06 09:35:48 +01:00
glowiak	e806903d7e	Support OpenBSD without patches	2022-02-06 09:32:55 +01:00
timoreo	86935068f5	Fix wrong mod file name	2022-02-04 16:24:19 +01:00
swirl	076efc4cb2	Merge branch 'update-quazip' of git://github.com/Scrumplex/PolyMC into develop	2022-02-03 14:14:12 -05:00
swirl	2177aa2a6b	Merge branch 'offline-mode-accounts' of git://github.com/NyaomiDEV/PolyMC into feature/offline_mode	2022-02-03 13:54:27 -05:00
swirl	e2952061af	Merge branch 'feature/download_mods' of git://github.com/timoreo22/PolyMC into feature/download_mods	2022-02-03 13:45:20 -05:00
swirl	f5358aa1ca	Merge branch 'develop' into feature/close_after_launch	2022-02-03 13:43:44 -05:00
swirl	3d3f9a8609	make closeAfterLaunch good	2022-02-03 12:50:24 -05:00
Petr Mrázek	3ca661127f	NOISSUE Add missing tooltip for Export Instance action	2022-02-03 18:09:51 +01:00
swirl	407f9d9ef0	Merge remote-tracking branch 'upstream/develop' into develop	2022-02-02 11:17:04 -05:00
swirl	bff683e6d4	Merge pull request #108 from redstrate/improve_about_page ... Improve the About page	2022-02-02 09:17:30 -05:00
timoreo22	11841c47e6	Double braindead combo	2022-02-01 22:23:34 +01:00
timoreo	71b1ac9f34	Fix braindead moments	2022-02-01 21:56:52 +01:00
Sefa Eyeoglu	c4cb7ddc4f	fix: bring back JAR Folder mods ... what is this?	2022-01-31 21:40:59 +01:00
Sefa Eyeoglu	a8089b76c0	fix: bring back instance exports	2022-01-31 21:40:59 +01:00
Sefa Eyeoglu	0442b80a2c	refactor: simpler includes for quazip	2022-01-31 21:40:59 +01:00
Sefa Eyeoglu	81c72c2038	refactor: bring back methods that need to be reimplemented	2022-01-31 21:40:59 +01:00
Sefa Eyeoglu	3aa809b8c0	refactor: add in-tree QuaZip	2022-01-31 21:40:59 +01:00
Sefa Eyeoglu	efa414c442	refactor: initial migration to QuaZip 1.2 ... Let's move off our custom QuaZip. In the olden times we needed the custom version of QuaZip, as it was basically unmaintained and on SourceForge (eww). But nowadays it's maintained and on GitHub. See new GitHub page: https://github.com/stachenov/quazip	2022-01-31 21:40:59 +01:00
timoreo	aa2c27bf69	Update to Modrinth API V2	2022-01-31 17:18:11 +01:00
Joshua Goins	0211ee3ef1	Add "PolyMC Contributors" to Credits section ... This also adds a link to the PolyMC Contributors page on Github.	2022-01-31 09:09:58 -05: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
bexnoss	e0a04c5031	Lock offline mode support behind insertion of at least one Minecraft account ... Co-Authored-By: Naomi Calabretta <tony0000.ac@gmail.com>	2022-01-30 02:42:29 +01:00
bexnoss	9d23ac562f	Add offline mode support	2022-01-30 02:35:56 +01:00
swirl	0065a29901	Close after Launch setting	2022-01-29 19:04:44 -05:00
Jan200101	3aa9f5c376	Update rpm spec to support OpenSuse and conform to Fedora guidelines	2022-01-28 19:42:30 +01:00
timoreo	efc44c56a6	Fix button being present in other pages	2022-01-28 19:32:42 +01:00
timoreo22	8b790a6dd9	Merge branch 'PolyMC:develop' into feature/download_mods	2022-01-28 18:12:35 +01:00
Joshua Goins	c1aaf89baa	Improve the About page ... Improves #106. This more clearly marks the original MultiMC contributors, and now correctly hides the "Build Platform" if this is set as empty. The version label is now moved under the "PolyMC" title so it looks just a little bit better (and matches other applications). The copyright on the "About" page now correctly attributes the MultiMC contributors just like on the "License" page.	2022-01-27 19:06:07 -05:00
Joshua Goins	5ac528f141	Fix icons changing when exiting the settings window	2022-01-27 18:37:57 -05:00
swirl	33aac2985a	Merge pull request #105 from Scrumplex/rss-begone ... Remove news	2022-01-27 17:00:15 -05:00
Sefa Eyeoglu	361ce7818e	refactor: remove news feed ... Closes #63	2022-01-27 22:59:20 +01:00
swirl	02889b7a11	Merge pull request #67 from PolyMC/feature/no_paste_ee ... Full replacement of paste.ee	2022-01-26 17:40:49 -05:00
Lenny McLennington	0eff21a4f1	Validate Pastebin URL with regex	2022-01-26 00:34:02 +00:00
Stypox	0235eb5c28	Fix error message ... The code is trying to get a string from a json object, and if that fails it should log "is not a string", not "is not a timestamp".	2022-01-24 11:44:47 +01:00
Petr Mrázek	8804b035b2	NOISSUE log server response when failing to fetch profile	2022-01-24 11:44:47 +01:00
Petr Mrázek	54e3438e37	NOISSUE correctly set http status code in auth reply	2022-01-24 11:44:47 +01:00
Petr Mrázek	ddfed7bb87	NOISSUE in java checker, ignore invalid lines altogether ... Declaring them as errors is just causing problems because Java randomly prints garbage to STDOUT now.	2022-01-24 11:44:47 +01:00
Petr Mrázek	70c04745ee	NOISSUE add some logging to profile fetching failures	2022-01-24 11:44:47 +01:00
timoreo	1d0e6bf453	Changed modrinth author data to not be a list	2022-01-24 07:23:01 +01:00
timoreo	a2d88f6df4	Fixed spacing	2022-01-24 07:12:19 +01:00
swirl	019c77f9f7	Merge pull request #52 from oynqr/develop ... Default to system locale language	2022-01-23 15:00:26 -05:00
swirl	af20b5ee0e	support paste.polymc.org	2022-01-23 12:54:58 -05:00
Stypox	8b31c638f3	Fix error message ... The code is trying to get a string from a json object, and if that fails it should log "is not a string", not "is not a timestamp".	2022-01-22 21:58:32 +01:00
txtsd	6961a39cd2	feat: Assign java max mem based on system RAM ... If the system has <6GB RAM, it uses (system RAM / 1.5) If the system has >=6GB, it uses 4GB Signed-off-by: txtsd <code@ihavea.quest>	2022-01-23 02:12:03 +05:30
Sefa Eyeoglu	dd76fb0ec7	feat(MSALogin): add open page & copy code button ... Closes #55	2022-01-20 21:04:48 +01:00
Lenny McLennington	caeab926bc	PasteUpload: Trim whitespace from response body	2022-01-19 19:05:52 +00:00
timoreo	6d22794cf9	Reduce spaghettiness	2022-01-19 09:47:09 +01:00
Lenny McLennington	b50e584369	PasteUpload task changed to use 0x0.st's protocol ... - Modified PasteUpload task to upload the log file to 0x0.st and other services with the same protocol. - Modified Paste settings UI to allow the user to select a custom paste URL, simplified the settings page code.	2022-01-19 08:27:26 +00:00
timoreo	affc2521aa	Various fixes	2022-01-18 12:28:55 +01:00
Philipp David	83e1dd285a	Set default lang only if index received	2022-01-17 09:52:04 +01:00
Philipp David	b9beb3c7d2	Sort system locale to front of list	2022-01-17 09:52:04 +01:00
Philipp David	2dd2555a63	Update selected language automatically	2022-01-17 09:52:04 +01:00
Philipp David	126e6d13aa	Use isEmpty instead of 0 length check	2022-01-17 09:52:04 +01:00
Philipp David	236c0166f6	Default to system locale language	2022-01-17 09:52:04 +01:00
Lenny McLennington	55597b458c	Revert "Merge pull request #50 from bexnoss/offline-mode" ... This reverts commit b4f750e7db, reversing changes made to b19e315615.	2022-01-17 03:45:47 +00:00
Lenny McLennington	f55297eca9	Revert "Merge pull request #81 from bexnoss/fix-msa-account-refresh" ... This reverts commit 0bc8baf117, reversing changes made to 81fe41a038.	2022-01-17 03:45:33 +00:00
bexnoss	5f9270ed4b	Fix MSA account refresh	2022-01-16 23:30:17 +01:00
swirl	81fe41a038	Default to colored icons, update copyright ... Closes: #74	2022-01-16 12:03:30 -05:00
Petr Mrázek	917f8a31e3	NOISSUE log server response when failing to fetch profile	2022-01-16 12:51:42 +01:00
Petr Mrázek	aa770b63fb	NOISSUE correctly set http status code in auth reply	2022-01-16 12:46:20 +01:00
Petr Mrázek	c1bf31cb27	NOISSUE in java checker, ignore invalid lines altogether ... Declaring them as errors is just causing problems because Java randomly prints garbage to STDOUT now.	2022-01-16 12:05:40 +01:00
Petr Mrázek	86d99f80c3	NOISSUE add some logging to profile fetching failures	2022-01-16 11:43:19 +01:00
timoreo	975f77756d	Added curseforge selection	2022-01-16 11:20:21 +01:00
Petr Mrázek	f78bb90ed9	GH-4125 fix it better	2022-01-15 16:25:52 -05:00
Petr Mrázek	dc129fd886	GH-4125 workaround for java printing garbage to stdout on bedrock linux	2022-01-15 16:25:52 -05:00
timoreo	621e0ba4a8	Added smart file selection ... This might fail in a few special cases	2022-01-15 10:25:24 +01:00
timoreo	f6de472da2	Added a no version message	2022-01-15 09:06:48 +01:00
timoreo	4b37c46889	Filtering per mod loader & mc version	2022-01-15 08:51:47 +01:00
Thomas Sirack	0bbd0ac0b9	Change method of shell script fix per suggestion ... The Launcher.in file is now modified rather than CMakeLists.txt	2022-01-14 19:28:10 -07:00
swirl	a606b47a22	pastebin URL app setting	2022-01-14 18:30:02 -05:00
swirl	a62155c1c9	preliminary stuff for paste.ee removal	2022-01-14 18:20:06 -05:00
swirl	b4f750e7db	Merge pull request #50 from bexnoss/offline-mode ... Offline Mode Support	2022-01-14 18:03:35 -05:00
swirl	b19e315615	Set maximum memory allocated to 4GB by default	2022-01-14 17:34:50 -05:00
timoreo	2896f70cd8	Removing copyrights	2022-01-14 22:07:54 +01:00
timoreo	1a8c972aef	Fixed icons ... Also having a mod loader is now enforced	2022-01-14 20:22:15 +01:00
bexnoss	cdaa397dcf	Reword offline mode disclaimer	2022-01-14 14:19:31 +01:00
timoreo	9e6fa8f29a	Added the downloading of the mods	2022-01-14 12:47:18 +01:00
timoreo	4d599eb118	Added modrinth icon	2022-01-14 10:51:44 +01:00
timoreo	4e9039be2d	Start of mod downloading	2022-01-14 09:56:27 +01:00
bexnoss	395e265564	Add offline mode disclaimer	2022-01-14 00:01:05 +01:00
bexnoss	46a3b4de6e	Remove unnecessary semicolon	2022-01-12 18:41:33 +01:00
bexnoss	6ecc8c5496	Remove unnecessary license header	2022-01-12 14:57:32 +01:00
bexnoss	a1ff3b1ee3	Add offline mode support	2022-01-12 14:26:02 +01:00
bexnoss	d4b522b6cb	Add offline mode UI	2022-01-12 10:36:26 +01:00
Mustafa Çalışkan	3329d94c9b	Introduce POLYMC_JAVA_PATHS env	2022-01-11 18:24:37 +03:00
Mustafa Çalışkan	a12118f1a0	Sort java versions from current to oldest	2022-01-11 17:40:58 +03:00
swirl	1d8196e11a	More rebranding ... Closes: #39 Mostly done with rebranding now. We just need to translate some services to PolyMC.	2022-01-10 12:47:35 -05:00
swirl	1cc7a193c2	add logo to different styles ... Also fixed genicons to automate this.	2022-01-09 14:18:51 -05:00
swirl	e50d07f791	remove patreon stuff ... Closes: #22 Update to 1.0.5 Remove "Forking/Redistribution" tab in About (why is it even there?) Metainfo now corresponds to version add discord Completely removed Patreon.	2022-01-09 13:51:46 -05:00
Ezekiel Smith	87af5f631d	Update branding: New Logo (#30) ... New logo Co-authored-by: swirl <swurl@swurl.xyz>	2022-01-09 00:13:15 -05:00
Petr Mrázek	52420963cf	GH-4125 fix it better	2022-01-08 12:26:16 +01:00
Petr Mrázek	03d7300732	GH-4125 workaround for java printing garbage to stdout on bedrock linux	2022-01-08 11:14:07 +01:00
swirl	2c7d248703	New pixel Ouroboros logo by @karolinaabb	2022-01-06 22:42:33 -05:00
swirl	0e4ccaca02	fix icon and version ... Closes: #16 Fixed the icon so Qt renders it properly, and actually renders it properly in the About page. Also, scaled it up a bit Changed launcher.svg icon to temporary Ouroboros logo fixed genicons again Fix version to 1.0.3 (making tag rn) Install the PolyMC icon properly.	2022-01-03 17:46:05 -05:00
swirl	3f3c5ea247	Rebranding logo ... add temporary Ouroboros logo, thanks Lenny for vectorizing change logo file names Desktop file now includes proper exec using the app binary name fix genicons for use with libicns	2021-12-31 16:37:54 -05:00
dada513	fa98ed3ccd	Merge remote-tracking branch 'upstream/develop' into upstream_update	2021-12-31 18:05:40 +01: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
Petr Mrázek	9cc168c526	NOISSUE fix some OS ifdefs	2021-12-31 00:36:25 +01:00
Petr Mrázek	94fdf13f4a	NOISSUE proper fix for missing profile + demo mode	2021-12-30 21:26:29 +01:00
Petr Mrázek	3efcccf334	Merge pull request #4345 from graemeg/freebsd-support ... Adds FreeBSD support to MultiMC	2021-12-30 20:00:45 +01:00
Petr Mrázek	5e909a4e85	Merge pull request #4394 from Janrupf/develop ... GH-4299 Fix Screenshot upload	2021-12-30 19:58:16 +01:00
Petr Mrázek	a6e59cb4f4	NOISSUE detect when user loses entitlements	2021-12-30 17:19:41 +01:00
Janrupf	be029ab360	GH-4299 Fix screenshot upload	2021-12-29 19:45:24 +01:00
Janrupf	6fe07561fe	GH-4299 Don't hard crash on when missing network	2021-12-29 19:45:15 +01:00
swirl	f25a9bc103	Completely remove Google Analytics library	2021-12-29 10:37:09 -05:00
Graeme Geldenhuys	f42c3a953c	Restore getNativePath() to its original form.	2021-12-28 21:59:24 +00:00
dada513	d821ffb829	Flatpak & Debian Packaging (#4) ... Flatpak & Debian packages	2021-12-28 10:45:04 -05:00
swirl	a11162ec61	update README, delete RPM/Ubuntu packaging dirs ... Closes: #2 Update wording/information for packages add more of the individual Matrix rooms in case spaces don't work add PolyMC Discord to README Deleted RPM & Ubuntu/Debian packaging directories, will need to be moved to separate repositories.	2021-12-26 16:01:29 -05:00
swirl	a254467184	Matrix room/space, a bit more rebranding	2021-12-24 14:28:54 -05:00
CreeperzEdge	95c9a6d8f4	Use correct title on Java check during setup	2021-12-23 00:53:02 +11:00
Lenny McLennington	18a931eaa9	Merge remote-tracking branch 'upstream/develop' into develop	2021-12-20 03:01:41 +00:00
Lenny McLennington	e6246a9306	Move MSA Client ID to the same place as the others ... MSA Client ID has been moved to CMakeLists.txt, and defaults to the Client ID for the PolyMC application. Removed secrets/notsecrets library, replace with (temporary?) program_info subdirectory.	2021-12-20 02:57:13 +00: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
swirl	ce30cda73e	Fix README and some references to MultiMC.	2021-12-18 14:29:33 +00:00
swirl	7912e0f32b	Apply patches ... Re-add lin-system, and fix Linux datadir fix jar paths allow for modern java	2021-12-18 14:29:33 +00: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
Petr Mrázek	7d047f9223	NOISSE add a shortcut to the loaders mods to main window	2021-12-12 22:39:25 +01:00
Graeme Geldenhuys	3bc450a6d7	Restore the previously deleted line.	2021-12-12 16:45:18 +00:00
Graeme Geldenhuys	fce98f5e16	Fixes compilation error expanding from macro 'major'.	2021-12-12 11:45:58 +00:00
Graeme Geldenhuys	7179e75e70	Changes required to support FreeBSD	2021-12-12 11:39:36 +00: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
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
Ghosty	a97d0a36f4	NOISSUE Copy Image is not shown if the selection is > 1	2021-12-03 16:29:28 +01:00
Ghosty	e9c52ec696	NOISSUE Added Copy File(s) feature for the screenshot page ... - Ctrl+C now copies the file instead of the image data - Renamed Copy to Copy Image	2021-12-03 16:08:11 +01:00
Ghosty	75f2dab3c8	NOISSUE Implemented copy screenshots to the clipboard ... - Added context-menu entry - Ctrl+C keybind works as well - If multiple screenshots are selected, only the first one gets copied	2021-12-03 03:11:53 +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
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
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
Petr Mrázek	eafeb64dec	NOISSUE qnam -> network	2021-11-17 13:20:50 +01:00
Jamie Mansfield	014e65220e	NOISSUE Error on launch when launching 1.18 with < Java 17	2021-11-16 18:25:16 +00:00
Petr Mrázek	6c82883206	NOISSUE fix account re-adding not updating current account	2021-11-16 02:21:59 +01:00
Petr Mrázek	25fbeb265a	NOISSUE fix build some more	2021-11-10 03:16:04 +01:00
Petr Mrázek	30d5a7ab48	NOISSUE fix build	2021-11-10 03:12:01 +01:00
Petr Mrázek	475d949a1e	GH-4217 Add support for GamePass accounts and MC profile setup ... - We now use the new endpoint for loggiong in via XBox tokens (/launcher/login) - We now check game entitlements instead of only relying on MC profile presence - Accounts can now be added even when they do not have a profile - The launcher will guide you through selecting a Minecraft name if you don't have one yet	2021-11-10 03:02:51 +01:00
Petr Mrázek	32f9c61c6e	Merge pull request #4233 from ImperatorStorm/update-man ... NOISSUE Update manpage to include new `-a / --profile` option.	2021-11-08 20:05:04 +01:00
ImperatorStorm	9ccce62f50	NOISSUE Update manpage to include new -a / --profile option.	2021-11-07 20:48:15 -08:00
Owen Wang	0660768478	GH-4200 Search Eclipse Foundation and Adoptium in Registry	2021-11-07 21:35:43 -05:00
Owen Wang	b1beeee11f	GH-4224 Scan 64 bit lib directory to find Java	2021-11-07 21:19:35 -05:00
Janrupf	0423464b88	GH-4227 Don't blindly trust mods.toml to be valid	2021-11-06 22:43:16 +01:00
Petr Mrázek	7b4c52e1e3	NOISSUE fix some small build issues	2021-11-03 15:45:42 +01:00
Petr Mrázek	27f276ef13	GH-1795 add terminal launch option to use a specific Minecraft profile ... Used like this: ``` ./MultiMC --launch 1.17.1 --profile MultiMCTest --server mc.hypixel.net ```	2021-10-31 21:43:33 +01:00
Petr Mrázek	393d17b8d3	GH-4164 set instance drag image hotspot based on where the drag started	2021-10-27 10:25:18 +02:00
Petr Mrázek	ae4939e0d2	GH-4164 Assign instances to groups using drag & drop	2021-10-25 23:51:42 +02:00
Petr Mrázek	85ecbad467	GH-3490 sort instances by name is now aware of numbers	2021-10-25 21:43:00 +02:00
Petr Mrázek	040af58070	NOISSUE add more logging when java checker fails to start	2021-10-25 12:01:08 +02:00
Petr Mrázek	6f6c9c6f68	NOISSUE fix debranding changes affecting version file format	2021-10-24 12:25:44 +02:00
Petr Mrázek	7f28f0bf01	Merge pull request #4186 from ImperatorStorm/addman ... MultiMCGH-4120 Add manpage to ubuntu and rpm packages	2021-10-24 02:51:37 +02:00
Jamie Mansfield	41d855fd11	GH-4185 Include the modpack version in instance title for ATLauncher	2021-10-24 00:39:42 +01:00
Jamie Mansfield	4b13577a59	GH-4185 Include the modpack version in instance title for modpacks.ch	2021-10-24 00:39:02 +01:00
Jamie Mansfield	c377ad6025	NOISSUE Use MiB suffix for memory and permgen	2021-10-24 00:26:37 +01:00
Jamie Mansfield	a6df7d709f	NOISSUE Correct spelling of miscellaneous	2021-10-24 00:26:16 +01:00
Jamie Mansfield	2e60413f7f	NOISSUE Add option to disable global play time status	2021-10-24 00:17:07 +01:00
Jamie Mansfield	5bc6dd8f97	NOISSUE Remove lingering full stop in playtime status	2021-10-24 00:11:09 +01:00
Jamie Mansfield	7cbca6ab20	NOISSUE Use common duration format for global and instances	2021-10-24 00:09:21 +01:00
Petr Mrázek	110c73edf2	Merge pull request #4178 from jamierocks/qt-clear-button ... NOISSUE Use Qt's clear button for ATLauncher page	2021-10-24 01:01:58 +02:00
Petr Mrázek	e6cb7b7710	Merge pull request #4177 from jamierocks/mch-search ... NOISSUE Fix modpacks.ch search	2021-10-24 01:01:38 +02:00
ImperatorStorm	aed8d5f8f5	MultiMCGH-4120 Add manpage to ubuntu and rpm packages	2021-10-21 19:17:51 -07:00
Petr Mrázek	8bc6560b5e	NOISSUE fix translations	2021-10-21 23:27:01 +02:00
Petr Mrázek	7c86732a47	NOISSUE Update links to repo, fix up library README	2021-10-21 23:25:52 +02:00
Petr Mrázek	d9b46289a1	NOISSUE finish up the obvious parts of debranding ... This is not absolutely complete, but reasonably so	2021-10-21 00:47:53 +02:00
Petr Mrázek	5b3dffce62	NOISSUE continue debranding...	2021-10-21 00:47:53 +02:00
Petr Mrázek	297d4b4196	NOISSUE continue the debranding	2021-10-21 00:47:53 +02:00
Petr Mrázek	e12a769800	NOISSUE fix windows rc file and mac icon	2021-10-21 00:47:53 +02:00
Petr Mrázek	462a44b4be	GH-4011 fix license text missing from About dialog	2021-10-21 00:47:53 +02:00
Petr Mrázek	441ab7eedc	NOISSUE debranding for real, initial work ... This is probably very broken on macOS and Windows and will need a lot of work to complete fully.	2021-10-21 00:47:53 +02:00
Petr Mrázek	6a4130c914	NOISSUE re-align the status bar	2021-10-21 00:47:53 +02:00
Jamie Mansfield	3f0e729815	NOISSUE Use Qt's clear button for ATLauncher page ... This replaces our 'Reset' button.	2021-10-17 20:18:18 +01:00
Jamie Mansfield	b93997501d	NOISSUE Use Qt's clear button for modpacks.ch page ... This replaces our 'Reset' button.	2021-10-17 20:14:16 +01:00
Jamie Mansfield	1869dd0de3	NOISSUE Search as you type for modpacks.ch ... Since we just filter data locally now, this isn't painfully slow - indeed it's very quick. This also matches other platforms, such as ATLauncher.	2021-10-16 23:36:31 +01:00
Jamie Mansfield	175132539b	NOISSUE Filter all pack's by name to search for modpacks.ch ... modpacks.ch searching has changed, and while likely a bug - we may as well make this change while we fetch all packs anyway. This makes MMC more reactive for searchs for the platform. This should be reverted if/when the modpacks.ch hits a size where we need to restrict how many packs are fetched.	2021-10-16 23:31:27 +01:00
kb1000	fa7a7d52d0	Remove broken Mojang services status	2021-10-08 19:29:49 +02:00
Petr Mrázek	8c4fb86ba0	Merge pull request #4103 from tobfos2611/develop ... Fix underaged account that isn't linked to a family help link.	2021-10-03 21:59:46 +02:00
Petr Mrázek	668d31b79e	Merge pull request #4143 from phit/patch-1 ... NOISSUE Remove outdated SSL docs	2021-10-03 21:52:13 +02:00
Petr Mrázek	3138e58c75	NOISSUE fix typo in FMLLibrariesTask.cpp	2021-10-03 21:46:10 +02:00
Philip T	0b312956db	NOISSUE Remove outdated SSL docs ... the link is dead and the equivalent newer page is useless, https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/dn265983(v=ws.11)?redirectedfrom=MSDN#related-content	2021-10-03 13:43:43 +02:00
Petr Mrázek	3f3fac8462	Merge pull request #4117 from jamierocks/fix-4114 ... GH-4114 Allow the same file for be downloaded to multiple paths	2021-09-28 18:25:42 +02:00
Petr Mrázek	e46dc03eb1	NOISSUE add all missing shader packs icons	2021-09-26 02:54:52 +02:00
Petr Mrázek	0bb0578f2b	NOISSUE add more shaderpacks icons	2021-09-25 01:46:39 +02:00
Petr Mrázek	cdf8d20c95	NOISSUE add shaderpacks icon for iOS icon theme	2021-09-25 01:43:19 +02:00
Petr Mrázek	560f7fa61a	NOISSUE bump deb package version	2021-09-24 15:39:21 +02:00
Petr Mrázek	1752d47035	Merge pull request #4100 from kb-1000/run-sh-exec ... Use exec to launch the MultiMC script in the Debian/RPM packages	2021-09-24 15:24:18 +02:00
Petr Mrázek	0f3cf0595b	NOISSUE add shader pack page for instances ... Only theme with an icon is simple colored, rest is TBD	2021-09-23 21:26:56 +02:00
Jamie Mansfield	433dd2d161	GH-4114 Allow the same file for be downloaded to multiple paths ... This is a potential fix to GH-4114.	2021-09-23 00:52:10 +01:00
Petr Mrázek	a5956194df	NOISSUE Remove Requestor, it is unused	2021-09-21 22:02:12 +02:00
Jamie Mansfield	0dcd24a53b	GH-4055 Don't download multiple files to the same path ... FTB should fix their metadata, but this should resolve issues downloading their packs at present.	2021-09-17 16:00:43 +01:00
tobfos	28d7c5d309	Removed unnecessary text in link. ... Thanks @RDKRACZ.	2021-09-15 20:46:07 +10:00
Toby Foster	7229ebbb08	Fix underaged account that isn't linked to a family help link.	2021-09-15 18:10:00 +10:00
kb1000	29f304f070	Use exec to launch the MultiMC script in the Debian/RPM packages	2021-09-14 12:13:41 +02:00
Petr Mrázek	e2355eb276	NOISSUE enable listing symlinks in mod/world lists	2021-09-09 00:27:46 +02:00
Petr Mrázek	7185fd9a8f	Merge pull request #4060 from StaticRocket/develop ... Add custom-commands icon for other themes	2021-09-08 20:22:13 +02:00
Petr Mrázek	46468c8f14	NOISSUE block MS account adding on macOS < 10.13 builds ... It's never going to work with Qt 5.6, so there's no point. People need to update.	2021-09-05 18:54:27 +02:00
Petr Mrázek	878c4fb810	NOISSUE Provide dummy implementation for the secrets library	2021-09-05 18:23:49 +02:00
Petr Mrázek	d644fb2094	GH-4014 do not switch to Qt 5.15.2 on Windows ... It is unstable for reasons unknown.	2021-09-04 23:51:57 +02:00
Petr Mrázek	938f896bfa	GH-4014 change updater to recognize new Qt 5.15.2 builds	2021-09-04 21:27:09 +02:00
Petr Mrázek	cd87029e6f	NOISSUE add style plugins to packaging if present	2021-08-31 18:55:56 +02:00
StaticRocket	4f7aad0f8d	Add custom-commands to pe_light icon theme	2021-08-30 23:35:16 -04:00
StaticRocket	b47d986f22	Add custom-commands to pe_dark icon theme	2021-08-30 23:34:59 -04:00
StaticRocket	51cdb8c790	Add custom-commands to pe_colored icon theme	2021-08-30 23:34:21 -04:00
StaticRocket	acbca16013	Add custom-commands to pe_blue icon theme	2021-08-30 23:33:56 -04:00
StaticRocket	62ecb3e58d	Add custom-commands to iOS icon theme	2021-08-30 23:33:41 -04:00
StaticRocket	92895f11d1	Add custom-commands to OSX icon theme	2021-08-30 23:33:22 -04:00
Petr Mrázek	23442442d8	GH-3392 fix a bunch of bugs and implement STS error states	2021-08-31 01:11:52 +02:00
Petr Mrázek	3171014301	GH-3392 checking for migration status and refresh button in accounts list	2021-08-29 22:55:33 +02:00
Petr Mrázek	7239502675	GH-3392 Add recognition of already migrated Mojang accounts	2021-08-29 19:59:18 +02:00
StaticRocket	93c527ed3d	Add flat icon for custom-commands	2021-08-28 21:13:35 -04:00
Petr Mrázek	b2c1100b1c	NOISSUE introduce the concept of secrets static library	2021-08-27 22:35:17 +02:00
Petr Mrázek	34a5459dce	NOISSUE cut down Requestor	2021-08-25 21:27:51 +02:00
Petr Mrázek	5c0e70e237	Merge pull request #4017 from jamierocks/fix-4012 ... GH-4012 Disable Xbox login if no MS client token is specified	2021-08-22 20:34:25 +00:00
Petr Mrázek	e2be2ada05	NOISSUE fix build ... Missing QUrl include	2021-08-22 20:10:57 +02:00
Petr Mrázek	eae65da110	GH-3392 Switch MS account login to use device flow instead ... Device flow involves the user manually opening a web page and putting in a code. We no longer need to interact with the browser.	2021-08-22 20:01:18 +02:00
Petr Mrázek	50b92c1af2	NOISSUE Markdown is not available in Qt 5.4 ... who would have thought?	2021-08-20 01:57:59 +02:00
Petr Mrázek	1b68d51da6	NOISSUE add setting capes, tweak missing profile message, fix cape IDs	2021-08-20 01:34:32 +02:00
Petr Mrázek	94fd9a3535	NOISSUE fix linux builds	2021-08-19 10:27:30 +02:00
Petr Mrázek	345641f7d2	NOISSUE sanitize some MSA auth logging	2021-08-19 00:43:19 +02:00
Jamie Mansfield	2a21e28ffd	GH-4012 Disable Xbox login if no MS client token is specified	2021-08-17 13:19:04 +01:00
Petr Mrázek	4ea52f4758	GH-3392 make sure skin upload at least doesn't fail completely	2021-08-15 23:46:12 +02:00
Petr Mrázek	44d634f564	GH-3392 Fix strings in AuthContext and make them translateable	2021-08-15 23:40:37 +02:00
Petr Mrázek	3a53349e33	GH-3392 dirty initial MSA support that shares logic with Mojang flows ... Both act as the first step of AuthContext.	2021-08-15 23:18:50 +02:00
phit	c2ec2a4af5	GH-3996 Detect Adoptium JDK's	2021-08-09 18:43:55 +02:00
Petr Mrázek	17af6d70b4	GH-3974 fix pinning to taskbar in various linux environments	2021-07-27 21:46:38 +02:00
Petr Mrázek	d2de849c86	NOISSUE set the required defs for main library	2021-07-26 14:03:59 +02:00
Petr Mrázek	20b9f2b42a	NOISSUE Flatten gui and logic libraries into MultiMC	2021-07-25 19:50:44 +02:00
Petr Mrázek	253067c782	Move all the things (YES. Move them.) ... Also, implemented some basic modlist logic, to be wired up.	2013-08-17 13:40:51 +02:00
Petr Mrázek	b1d00fce8d	CMake build system, big pile of libs: bspatch, quazip, java, the launcher	2013-01-11 02:25:40 +01:00