CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,695 Commits 10 Branches 30 Tags 34 MiB
0c466bc530
Commit Graph

773 Commits

Author SHA1 Message Date
Jamie Mansfield
3a1abb555b
GH-3575 Fix build on Fedora 34 
Presumably this is caused by the bump to GCC 11 in Fedora 34. See
the error that did occur below...

    ./MultiMC5/application/KonamiCode.cpp: In member function ‘void KonamiCode::input(QEvent*)’:
    ./MultiMC5/application/KonamiCode.cpp:38:23: error: comparison of integer expressions of different signedness: ‘int’ and ‘std::array<Qt::Key, 10>::size_type’ {aka ‘long unsigned int’} [-Werror=sign-compare]
       38 |         if(m_progress == konamiCode.size())
          |            ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~
 2021-04-08 18:50:07 +01:00
phit
1f8408c793 NOISSUE Curseforge makeover 
update UI to match other modpack platforms
add sorting
add version selection, fixes GH-3667
add installing beta versions, fixes GH-3611
 2021-04-08 19:32:34 +02:00
Petr Mrázek
e5804b1279 NOISSUE add some logging to the system theme determination logic 2021-04-04 21:19:49 +02:00
Petr Mrázek
43cf647642 Revert "GH-3666 Fix multi-monitor dpi scaling on windows" 
This reverts commit 34bf688479.
 2021-03-28 19:46:01 +02:00
Petr Mrázek
5400d4e613
Merge pull request #3690 from jamierocks/ftb-search-edge 
NOISSUE Fix edgecase where new searches won't be processed
 2021-03-26 20:37:48 +00:00
Petr Mrázek
adf2301b2a
Merge pull request #3684 from KGB-8375/patch-1 
GH-3666 Fix multi-monitor dpi scaling on windows
 2021-03-26 20:36:28 +00:00
Jamie Mansfield
8e6400e8d8
NOISSUE Fix edgecase where new searches won't be processed 
This resolves an issue with the modpacks.ch search functionality, in
which a search issued while one is currently in progress won't be made
and the UI won't allow for the search to be made after.

Reproduction Steps:
1. Open the FTB pane in the Add Instance Dialog
2. Perform a search while MMC is still performing the initial search

The search won't be performed, the existing search will have been
aborted, and you are unable to try the search again (without trying a
different search in the meantime).

This was caused by 2 things:
1. A search cannot be re-attempted, and this logic doesn't consider
   failures.
2. The failure slot wasn't called when the NetJob was aborted, so
   the search would never be performed - but the term would be
   stored as if it had (trigering point 1).

I have resolved this by doing 2 things:
1. If the failure slot is called, set a searchState of Failed. Allow
   search re-attempts in this case.
2. If there is a present NetJob, abort and reset it. The immediately
   continue with the search.
 2021-03-26 20:03:57 +00:00
KGB-8375
34bf688479 GH-3666 Fix multi-monitor dpi scaling on windows 
Disable qt 5.6 DPI scaling and use windows' builtin DPI scaling, which works much better on multi-monitor setups
 2021-03-26 09:54:28 -04:00
phit
ba13e33ccc GH-3633 assume latest MC version, if CurseForge pack supports multiple 
right now these are unused anyway
 2021-03-26 14:18:47 +01:00
Petr Mrázek
b8ee9a2a8e NOISSUE update ubuntu packaging bits 2021-03-26 01:48:37 +01:00
Petr Mrázek
369a243f1f
Merge pull request #3682 from kb-1000/rename-twitch-curseforge 
NOISSUE rename Twitch to flame internally for consistency and to CurseForge for user displayed strings
 2021-03-26 00:38:58 +00:00
Petr Mrázek
1db6985be2
Merge pull request #3681 from kb-1000/fix-moc-warning 
NOISSUE fix MOC warning complaining about an unused MOC file include
 2021-03-26 00:37:25 +00:00
kb1000
a0cb1a0d42
NOISSUE rename Twitch to flame internally for consistency and to CurseForge for user displayed strings 2021-03-24 00:59:43 +01:00
kb1000
7acad35c3f
NOISSUE fix MOC warning complaining about an unused MOC file include 2021-03-23 23:05:10 +01:00
kb1000
4f3328e71c
NOISSUE disable datapacks button in the world screen if no world is selected 2021-03-23 21:54:48 +01:00
Petr Mrázek
4b02b3f84a NOISSUE add warning to the ATLauncher pack page 2021-03-21 20:34:28 +01:00
Petr Mrázek
1edcd9b86e NOISSUE implement deleting skins 2021-02-11 02:23:00 +01:00
Jamie Mansfield
152d476f20
NOISSUE Add search to ATLauncher 2021-02-11 00:57:07 +00:00
Petr Mrázek
40bdb0ffd6
Merge pull request #3593 from jamierocks/atl/description-view 
NOISSUE Show ATLauncher pack descriptions in text browser
 2021-02-10 18:38:04 +01:00
Jamie Mansfield
6eabd336ee
NOISSUE Show FTB pack descriptions in text browser 2021-02-10 16:57:46 +00:00
Jamie Mansfield
003e019048
NOISSUE Show ATLauncher pack descriptions in text browser 2021-02-10 16:11:59 +00:00
AppleTheGolden
f3205ebf25
NOISSUE Swap discord invite with vanity url 2021-02-09 22:00:20 +01:00
Jamie Mansfield
ab19b86341 GH-405 ATLauncher Support 2021-02-07 23:30:24 +01:00
Petr Mrázek
5e980ceef2
Merge pull request #3556 from Zipdox/develop 
Fix packaging issue caused by qt5-default
 2021-02-07 02:24:42 +01:00
Petr Mrázek
1cf60a01d5
Merge pull request #3538 from Scotsguy/develop 
NOISSUE Update Copyright Year
 2021-02-07 02:23:31 +01:00
Petr Mrázek
ba4a1a68bd
Merge pull request #3537 from rbutoi/argv0 
Use argv[0] to print program name on a CLI error.
 2021-02-07 02:21:25 +01:00
Petr Mrázek
5a7c1f9edf NOISSUE force kill button to reevaluate its style on state change 2021-02-05 03:18:21 +01:00
Petr Mrázek
359905a8ef NOISSUE set instance dialog launch/kill button object name 2021-02-05 02:46:59 +01:00
Zipdox
61004a25ec Fix packaging issue caused by qt5-default 2021-01-26 21:47:26 +01:00
AppleTheGolden
0de064eb35
NOISSUE Update Copyright Year 2021-01-18 08:28:54 +01:00
Radu Butoi
1cb9382282 Use argv[0] to print program name on a CLI error. 2021-01-17 16:58:32 -05:00
TreyRuffy
9100373af2
Switch Session Server 
sessionserver.mojang.com has been down for a while and it looks like it is no longer in use.
https://bugs.mojang.com/browse/WEB-3166?focusedCommentId=820167&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-820167

I have switched the url to session.minecraft.net
 2021-01-11 19:26:40 -07:00
Petr Mrázek
dc45d46e9c NOISSUE fix the metainfo file 2021-01-07 11:54:08 +01:00
Joshua Stone
331f6df9e5 Improve metadata for screenshots 2020-12-10 11:43:37 -05:00
Joshua Stone
e9b779aa77 Update documentation WRT .rpm contents 2020-12-08 13:25:34 -05:00
Joshua Stone
42d124ed2b Move metainfo to ubuntu oflder so it can be used in both .rpm and .deb builds 2020-12-08 13:23:52 -05:00
Joshua Stone
a9a78c74db Fix contact email 2020-12-08 01:13:11 -05:00
Joshua Stone
d55030367e Use metainfodir macro directly 2020-12-08 00:55:50 -05:00
Joshua Stone
65990a1bf1 Remove disclaimer 2020-12-08 00:42:16 -05:00
Joshua Stone
399109728f Update RPM .spec to include metainfo file 2020-12-08 00:38:43 -05:00
Joshua Stone
c1161e2377 Add metainfo.xml for improving package metadata 2020-12-08 00:30:29 -05:00
kb1000
f4d58e17ee NOISSUE Add pack author and description to technic modpack import page 2020-11-30 00:31:27 +01:00
Petr Mrázek
6aa126be30
Merge pull request #3460 from kb-1000/rpm-package 
NOISSUE Add an RPM package
 2020-11-30 00:19:25 +01:00
Jamie Mansfield
5eace10d51
NOISSUE Continue requesting packs after ignoring one 
This was a mishap on my part, fortunately quickly exposed as the
combination of GH-3463 and GH-3464 made no packs visible.
 2020-11-29 13:58:20 +00:00
Jamie Mansfield
b8c6a42f49
NOISSUE Add sorting options to FTB pack install page 2020-11-29 13:46:14 +00:00
Petr Mrázek
ed11d33054
Merge pull request #3464 from jamierocks/ftb/ignore-dud-packs 
NOISSUE Ignore 'dud' FTB packs
 2020-11-29 00:16:00 +01:00
Jamie Mansfield
7321a4fd3d
NOISSUE Ignore 'dud' FTB packs 
There is no guarantee from modpacks.ch that modpacks contain any
versions, which is currently an issue with pack 63 (Direwolf20 1.5).
 2020-11-28 22:13:53 +00:00
Jamie Mansfield
6249a54ba2
NOISSUE Use new modpacks.ch route for listing packs 2020-11-28 22:06:35 +00:00
kb1000
58c2228247
NOISSUE Add an RPM package for MultiMC 
The RPM package reuses the files from the Ubuntu package.
 2020-11-27 19:28:46 +01:00
Petr Mrázek
88d6b6ea3f GH-3427 add low effort datapack button to worlds 2020-11-24 22:31:49 +01:00
Jamie Mansfield
edfea9894e
NOISSUE Cleanup Technic support 2020-11-13 16:38:18 +00:00
Petr Mrázek
eb3e6e4c6a NOISSUE give technic icon a darker outline 2020-10-13 22:35:43 +02:00
Petr Mrázek
a7216ecca1 NOISSUE use Json parsing helpers to process technic search results 2020-10-13 22:18:42 +02:00
kb1000
8021fb25d0 GH-469 Implement support for importing and searching for Technic Platform and Solder modpacks 
This does not support any custom modpack.jar for 1.6 or newer, it simply uses standard Forge then.
Supports Forge and Fabric, and JAR mods for 1.5 and older.
 2020-10-13 21:34:16 +02:00
Petr Mrázek
5180536cc3 NOISSUE add a way to use native system versions of OpenAL and GLFW 
If your OS comes with patched/fixed/newer versions of those,
you can now check the checkboxes and stop using the old ones
shipped by Mojang.
 2020-09-10 23:10:17 +02:00
Petr Mrázek
feae420450 NOISSUE add 'java.vendor' to the checker and display/log the value 2020-09-07 22:28:41 +02:00
Petr Mrázek
8a0027c73a NOISSUE Add world icons and world icon reset button 2020-08-22 01:34:55 +02:00
Petr Mrázek
c6c9feb3a2 NOISSUE attempt to fix build on macOS 2020-08-21 02:40:19 +02:00
Jamie Mansfield
b0f5f4cb13 GH-3095 New FTB platform support 
Models are based on the models from my go-modpacksch library.

License:
========
The MIT License (MIT)

Copyright (c) Jamie Mansfield <https://www.jamiemansfield.me/>
Copyright (c) contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
 2020-08-21 02:24:29 +02:00
Qaz
f6097ef2b7 Update iron.png 2020-08-19 17:45:59 +02:00
Qaz
bb88697354 Update gold.png 2020-08-19 17:45:57 +02:00
Qaz
762a019a49 Update diamond.png 2020-08-19 17:45:53 +02:00
Qaz
f44bab0e0c Update brick.png 2020-08-19 17:45:50 +02:00
Qaz
883dbe2933 Update stone.png 2020-08-19 17:42:16 +02:00
Qaz
6753e217a9 Update planks.png 
Replace it with the new plank texture
 2020-08-19 17:40:01 +02:00
Petr Mrázek
e7f373496e GH-3234 Add support for custom meta URLs at build time 
This is not particularly interesting for non-developers.
Also includes some internal restructuring of URL constants in general.
 2020-07-18 16:22:05 +02:00
haykam821
90d45d2abf
Fix Fabric loader error messages being reused for intermediary mappings 2020-07-09 12:17:59 -04:00
Petr Mrázek
a0ef20a264 NOISSUE rename ComponentList to PackProfile 
It's not just components, so the naming needed cleaning up.
 2020-06-27 12:02:31 +02:00
Petr Mrázek
41590f2e50 NOISSUE Switch twitch modpack page to use a QListView 
This makes the lazy loading of the paginated search results
actually work.
 2020-06-07 11:15:17 +02:00
kb1000
79208a7383
Allow compiling MultiMC using Qt builds without accessibility again 2020-05-30 15:32:38 +02:00
Petr Mrázek
c4779e5a35
Merge pull request #3127 from OverMighty/develop 
fix: add support for args with spaces to MultiMC::messageReceived()
 2020-05-29 01:55:27 +02:00
Thalia Nero
0047ca454f Clarify WSL error messages 2020-05-28 17:59:54 -04:00
Petr Mrázek
07a1052c69 Fix. 2020-05-28 23:31:50 +02:00
Petr Mrázek
ba6a97557a NOISSUE prevent evil from winning 2020-05-28 23:17:50 +02:00
Petr Mrázek
9eaa636908 GH-2802 remove extra remapping of indexes in VersionPage model 2020-05-17 19:56:59 +02:00
Petr Mrázek
997c25620a GH-3131 fix not working with proxy ports > 32767 2020-05-17 13:59:30 +02:00
OverMighty
bbcacec6ec fix: add support for args with spaces to MultiMC::messageReceived() 
Previously, when the main instance of MultiMC would receive an `import`
or `launch` message from another instance, it would split the message on
each space, and only read the first word of the argument (zip path/URL
or instance ID). This commit fixes that problem by sectioning the
message string instead.
 2020-05-04 11:37:02 +02:00
Petr Mrázek
5ca5661c23 NOISSUE expose twitch pack url, description and author list 2020-04-29 21:17:51 +02:00
Petr Mrázek
296ff6de96 NOISSUE Add pagination support to twitch pack search 
Try searching for 'craft'. Now it gives ALL the results, not just
the first page of 25.
 2020-04-01 02:08:11 +02:00
Petr Mrázek
5e951299b2 NOISSUE fix build 2020-04-01 00:59:18 +02:00
Petr Mrázek
3ff93a4216 NOISSUE Bare-bones twitch pack browser 2020-04-01 00:44:24 +02:00
Petr Mrázek
3ad9ea507e NOISSUE update version number, changelog and credits in about dialog 2020-03-29 03:12:57 +02:00
Petr Mrázek
c9e851f12f GH-2544 enable Forge install button for >= 1.13 2020-03-28 15:55:12 +01:00
Petr Mrázek
69490535d0
Merge pull request #2979 from Brottweiler/desktop-entry-tweak 
Tweak GenericName for Linux desktop entry
 2020-02-25 18:02:09 +01:00
Brottweiler
95a09ba099 GH-2979 Tweak GenericName 2020-02-24 19:39:22 +01:00
OverMighty
47fa7b3f8c GH-2988 add --import command-line option 
When specified, opens the "Import from zip" dialog as soon as the main
window is shown, with the URL field prefilled with the argument given to
the option.

Closes #2998
 2020-02-24 18:52:26 +01:00
Petr Mrázek
bc98181ec2 GH-2769 add an option to not copy play time when copying instances 2020-01-09 15:31:32 +01:00
Petr Mrázek
6a095deea6 GH-2832 add .minecraft and libraries buttons to version page 2020-01-09 13:45:46 +01:00
Petr Mrázek
355e5e24da GH-2819 mod list filter now also looks at descriptions and authors 2020-01-08 21:12:45 +01:00
Petr Mrázek
8bdff97ac0 GH-2839 remove username wording from login and account dialogs 2020-01-08 13:37:05 +01:00
Petr Mrázek
6288805f37 GH-2853 fix collapsing state being sticky in group view 
Now it resets properly and collapsing a group doesn't make
all subsequent clicks collapse groups.
 2020-01-08 09:00:54 +01:00
Petr Mrázek
0d157d86b5 NOISSUE add wget as a dependency for deb package 2020-01-08 06:28:42 +01:00
Petr Mrázek
3581f5384f GH-2880 make services status widget open a valid page 
https://help.mojang.com/ no longer has API status
 2020-01-07 08:56:00 +01:00
Petr Mrázek
b5adff14ab NOISSUE remove dead reference to TwitchPage.ui 2019-11-18 02:38:08 +01:00
Petr Mrázek
af5120c828 GH-2859 remove twitch page and modpack import from URL 
The functionality was broken, beyond repair and an ongoing maintenance
nightmare.
 2019-11-18 00:38:36 +01:00
Petr Mrázek
47ed2f48d4 NOISSUE put legacy FTB support in a namespace, fix its base URL 2019-11-03 23:48:12 +01:00
Petr Mrázek
0c9340a3d2 NOISSUE fix translation string for Twitch drop area 2019-10-14 23:51:36 +02:00
Petr Mrázek
9cc5ebcdd1 GH-2859 improve UI for twitch pack import with drag&drop 2019-10-14 02:31:53 +02:00
Petr Mrázek
c60647523e NOISSUE remove remains of what could have been technic integration 2019-10-14 01:05:38 +02:00
Petr Mrázek
9165232ba4 NOISSUE remove unused 'PackagesPage' 2019-10-13 22:31:14 +02:00