817 Commits

Author	SHA1	Message	Date
Sebastian-byte	c908c1b5ef	Fix conflict	2021-07-23 16:34:31 -05:00
Petr Mrázek	0c466bc530	Merge pull request #3919 from hamarb123/develop ... Stop application freezes on macOS by moving data to MultiMC.app/Data	2021-07-23 16:13:32 +02:00
Petr Mrázek	b902c5cd78	Merge pull request #3956 from jamierocks/block-forge-117-install ... NOISSUE Disable Install Forge button on 1.17 (and above)	2021-07-23 13:41:23 +02:00
Jamie Mansfield	34f74fff0a	GH-3957 Fix 'Add Instance' label	2021-07-22 21:21:17 +01:00
Jamie Mansfield	211cfb4af7	NOISSUE Disable Install Forge button on 1.17 (and above) ... It appears that Minecraft Forge for Minecraft 1.17 will require setting JVM arguments to operate, this is not currently possible with MultiMC's meta. Therefore, when Forge for 1.17 is released a solution will need to be looked into.	2021-07-22 20:50:58 +01:00
Petr Mrázek	c5d0348181	NOISSUE Fix minutes display for total playtime	2021-07-22 21:18:03 +02:00
Leland Liu	1762d2fc7d	Added total playtime	2021-07-22 20:26:59 +02:00
Petr Mrázek	6f12b31ead	Merge pull request #3299 from QazCetelic/develop ... Update instance icons, using the newer minecraft textures	2021-07-22 17:56:18 +02:00
Petr Mrázek	3974f12643	Merge pull request #3831 from kb-1000/rpm-cleanup ... NOISSUE Some cleanups of the RPM package	2021-07-22 17:42:30 +02:00
Petr Mrázek	4fc37f5a35	Merge pull request #3931 from jamierocks/july-wrk2 ... NOISSUE Debranding, fix annoying warning, updated Patreon logo	2021-07-22 17:40:36 +02:00
Thomas Kain	4b3305afbe	Fix Windows icon scaling issues ... Recalculated the icon using the official logo SVG and GIMP. Appears visually identical to the old one at all resolutions.	2021-07-21 13:46:21 -04:00
Sebastian-byte	59ffdc8ff6	Revert all the disaster	2021-07-13 19:50:52 -05:00
Sebastian-byte	869a92b2a2	Revert "Merge pull request #9 from MultiMC/develop" ... This reverts commit ccc86e4e02, reversing changes made to 306c655ab5.	2021-07-13 19:44:51 -05:00
Sebastían	5019fafeb7	Merge branch 'develop' into develop	2021-07-13 19:31:59 -05:00
Sebastían	ccc86e4e02	Merge pull request #9 from MultiMC/develop ... Update MultiMC5 Base	2021-07-13 19:27:53 -05:00
Jamie Mansfield	d63ef939be	NOISSUE Update Patreon logo ... The logo was taken from Patreon's brand assets [1] archive, and shrunk to size with KolourPaint. [1] https://www.patreon.com/brand	2021-07-13 16:02:04 +01:00
Jamie Mansfield	66fde9e6b7	NOISSUE Correct trending URL string for Technic packs ... This seems to have just been an inadvertent mistake when copy-pasting. This commit just removes an annoying warning.	2021-07-13 15:42:44 +01:00
Hamish Arblaster	e883cf2359	GH-2529 Move data path on macOS to MultiMC.app/Data ... macOS seems to dislike changing files in the APPBUNDLE.app/Contents directory because it has to re-scan the directory every launch. As a result, large amounts of data there seems to cause freezes of MultiMC. Moving the default location outside of this directory, and thus the data, stops these freezes. There is also a dialogue when the user first opens the app that asks them if they'd like to migrate their data folder, if they select yes it will move it, and if they select no it will not move it and allow them to move it later with an option in settings.	2021-07-11 09:36:21 +10:00
Sebastian-byte	9bc4a1241c	Fix indent	2021-06-25 19:46:20 -05:00
Sebastian-byte	b7ce6a63dc	Resolved merge conflict	2021-06-25 18:46:21 -05:00
Petr Mrázek	dc3a4cebce	Merge pull request #3896 from jamierocks/mib-suffix ... NOISSUE Use MiB suffix for Java memory options	2021-06-25 12:27:57 +02:00
Jamie Mansfield	c77f5285e3	NOISSUE Close optional mod dialog with Install button ... This was a silly ommision I made.	2021-06-23 15:49:31 +01:00
Jamie Mansfield	d8598d6901	NOISSUE Use MiB suffix for Java memory options	2021-06-23 09:57:55 +01:00
Sebastían	42f29a9f29	Merge branch 'MultiMC:develop' into develop	2021-06-22 16:45:48 -05:00
Petr Mrázek	27d3ae145a	Merge pull request #3888 from jamierocks/atl-version-selection-width ... NOISSUE Fix ATLauncher version selection combo box width	2021-06-22 19:57:49 +02:00
max	5beb7edfff	Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop	2021-06-22 09:50:07 +03:00
Jamie Mansfield	4ba0c9c298	NOISSUE Support mod grouping and dependencies	2021-06-21 16:29:16 +01:00
Jamie Mansfield	74311a54cf	NOISSUE Support ATLauncher optional mods	2021-06-21 16:29:11 +01:00
Jamie Mansfield	a87c64d7d1	NOISSUE Fix ATLauncher version selection combo box width ... Resolves a bug that was introduced with [1], furthermore and in specific relation to the intent of said commit, this brings the version selection combo box inline with other mod platforms. [1] f7c144c393	2021-06-21 15:26:10 +01:00
phit	e439ce6e0b	NOISSUE Fix Modplatform Scrollbars properly	2021-06-20 22:59:58 +02:00
phit	f6d6e4c1c4	NOISSUE Fix FTB Legacy Pack Selection	2021-06-20 22:52:10 +02:00
Petr Mrázek	bace6fec1b	Merge pull request #3880 from phit/fix/GH-3720 ... GH-3720 Fix UI inconsistencies with Modplatforms	2021-06-20 22:39:03 +02:00
Petr Mrázek	a487234968	Revert "GH-3507 Modernize MacOS Icon" ... This reverts commit d08a2f00a2.	2021-06-20 21:53:02 +02:00
phit	f7c144c393	GH-3720 Fix UI inconsistencies with Modplatforms ... Fixes GH-3118 Fixes GH-3720 Fixes GH-3731 Icons and Ok button state will now switch consistently when moving between tabs. ATLaunchers packlist is now no longer redownloaded each time you open its Tab. All lists are striped now. And all search and filter fields now have a placeholder text.	2021-06-20 01:03:17 +02:00
Sebastían	308a0bd627	Merge branch 'MultiMC:develop' into develop	2021-06-19 14:43:53 -05:00
Jamie Mansfield	81d4dc09cc	NOISSUE Add notice re MSA to login dialog ... This commit should be reverted when support for Microsoft/Xbox authentication is introduced.	2021-06-19 20:31:49 +01:00
Petr Mrázek	5f8d07c009	Merge pull request #3875 from jamierocks/feature/gh-3033 ... GH-3033 Add filtering for version components	2021-06-19 12:50:21 +02:00
Petr Mrázek	25955c0817	Merge pull request #3877 from Zetabite/feature_offline_status_log ... NOISSUE Add info for instance launch mode and server status when online	2021-06-19 11:59:04 +02:00
Adrian	6db6ebe37f	NOISSUE Add info for instance launch mode and server status when online	2021-06-19 03:15:21 +02:00
Jamie Mansfield	b246fc171e	GH-2971 Brand mod model for resource/texture pack pages	2021-06-19 00:59:48 +01:00
Jamie Mansfield	c92b44e6d6	GH-3719 Translate some missing strings when changing locale	2021-06-19 00:14:36 +01:00
Jamie Mansfield	e148cfbbfd	NOISSUE Don't translate logged entries	2021-06-18 23:57:58 +01:00
Sebastían	f6e2eae195	Merge branch 'MultiMC:develop' into develop	2021-06-18 17:35:05 -05:00
Jamie Mansfield	c0f72488d0	GH-3033 Add filtering for version components	2021-06-18 23:21:12 +01:00
phit	d08a2f00a2	GH-3507 Modernize MacOS Icon ... full credit to @ThePotatoKing55	2021-06-18 20:27:25 +02:00
phit	00820df656	GH-3731 Limit Curserforge version height	2021-06-18 18:31:14 +02:00
Jamie Mansfield	40f41e5fbe	NOISSUE Specify support URLs at build time ... Support URLs (bug tracker, Discord guild, subreddit) are now specified as cache variables in cmake, and the buttons are not shown if no value is set for them. This is an early-stage move towards debranding the MultiMC codebase, and will (hopefully) alleviate support requests coming to us from illicit forks.	2021-06-18 12:24:20 +01:00
kb1000	663a1a5a83	Add xrandr to the dependencies of the RPM package	2021-06-14 20:34:51 +02:00
Max	167b6bd405	Dehardcode account providers (#38) ... * Dehardcode account providers * Fix crash on creation * Add dynamic 'add account dialog' provider selector * Fix typo and add newlines * Rename loginType to provider * Rename MojangAccount to Account and MojangAccountList to AccountList * Fix json save error	2021-06-14 12:51:25 +03:00
Zakhar Afonin	396400b60d	UI improvement: Ely.by skins in launcher	2021-06-12 08:46:53 +03:00