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

2625 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Petr Mrázek
0c147fb5ee
Merge pull request #3843 from phit/adoptjdkdetection 
Update Java detection
 2021-06-18 19:14:15 +02:00
Petr Mrázek
09ce3d8f40
Merge pull request #3872 from phit/fixcursedropdown 
GH-3731 Limit Curserforge version height
 2021-06-18 19:10:18 +02:00
phit
00820df656 GH-3731 Limit Curserforge version height 2021-06-18 18:31:14 +02:00
phit
c2c288a956 NOISSUE Add BellSoft and Azul Java 2021-06-18 17:12:44 +02:00
phit
7ac6c4f3d9 NOISSUE Cleanup duplication and Microsoft JDK 2021-06-18 17:02:41 +02:00
phit
fd04ff2b08 NOISSUE Add AdoptOpenJDK Java detection 2021-06-18 16:10:48 +02:00
Petr Mrázek
434adc4cd7
Merge pull request #3870 from jamierocks/build-time-support-links 
NOISSUE Specify support URLs at build time
 2021-06-18 13:43:35 +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
Petr Mrázek
9fafe3ffe6
Merge pull request #3833 from jamierocks/disable-forge-btn-when-game-running 
NOISSUE Disable 'Install Forge' button when game is running
 2021-06-09 21:54:22 +02:00
Jamie Mansfield
3390367d93
NOISSUE Support CurseForge modpacks using Fabric Loader 2021-06-09 20:49:26 +01:00
Jamie Mansfield
6dd1fdbaf9
NOISSUE Fail pack installation for download errors for FTB 
This effectively reverts the changes made in [1] to resolve GH-3304.

[1] 05ffcf706b
 2021-06-03 15:16:03 +01:00
Jamie Mansfield
efa3bb33f5
NOISSUE Disable 'Install Forge' button when game is running 2021-06-03 15:03:19 +01:00
Petr Mrázek
60b686f014
Merge pull request #3804 from Janrupf/feature/default-server 
Add ability to select a server to join in the instance settings
 2021-05-24 02:41:54 +02:00
Petr Mrázek
3a8068e75f
Merge pull request #3803 from phit/patch-1 
NOISSUE Fix new Oracle Java Detection on Windows
 2021-05-24 02:41:08 +02:00
Janrupf
52c1150522 NOISSUE Add --server argument for --launch 2021-05-23 14:42:20 +02:00
Janrupf
58ab005f7e NOISSUE Add missing license header 2021-05-22 18:10:17 +02:00
Janrupf
ea6c42a93c NOISSUE Allow joining servers from the servers page 2021-05-22 18:07:08 +02:00
Janrupf
f33fe05e5f NOISSUE Use minecraft logic for parsing adresses 2021-05-22 17:24:37 +02:00
Janrupf
d97f13b4aa NOISSUE Use Vanilla logic for resolving servers 2021-05-22 17:00:14 +02:00
Janrupf
0ccd7223fd NOISSUE Make LauncherPart aware of server to join 2021-05-22 16:33:16 +02:00
Janrupf
23a706bbae NOISSUE Resolve minecraft server using DNS SRV 2021-05-22 16:14:25 +02:00
Janrupf
cc6cd0648a NOISSUE Add server launch arguments 2021-05-22 13:54:34 +02:00
Philip T
f78152d725
NOISSUE Fix new Oracle Java Detection on Windows 
Those were changed with Java 9 https://docs.oracle.com/javase/9/install/installation-jdk-and-jre-microsoft-windows-platforms.htm#JSJIG-GUID-47C269A3-5220-412F-9E31-4B8C37A82BFB
 2021-05-22 13:37:51 +02:00
Janrupf
f0eb5b4a0c NOISSUE Register settings for setting a server 2021-05-22 13:28:23 +02:00
Janrupf
2e2a5d0943 NOISSUE Required UI elements for setting a server 2021-05-22 13:15:59 +02:00
Petr Mrázek
911074e966
Merge pull request #3735 from kumquat-ir/develop 
NOISSUE Parse META-INF/mods.toml for Forge 1.14+ mod metadata
 2021-05-15 00:36:46 +02:00
Petr Mrázek
b8cd13bb21
Merge pull request #3747 from runlevel5/patch-1 
Add limits header
 2021-05-15 00:35:36 +02:00
Petr Mrázek
deac64e0a2
Merge pull request #3787 from JoelTroch/feature/gh-3450 
GH-3450 Add checkboxes to display and record game time
 2021-05-15 00:35:05 +02:00
Petr Mrázek
2f1e8e82a3
Merge pull request #3729 from jamierocks/atl-loader-targets 
Various ATLauncher improvements and bug fixes
 2021-05-15 00:33:53 +02:00
Joël Troch
de089195cd GH-3450 Add checkboxes to display and record game time 2021-05-13 19:38:24 +02:00
Jamie Mansfield
df7873eb9a
GH-3764 Only install client mods for ATLauncher packs 2021-05-06 17:14:49 +01:00
Petr Mrázek
3d11f9a7e9 NOISSUE fix issue templates 2021-05-01 10:29:43 +02:00
Trung Lê
c2fd714f8d
Add limits header 2021-04-29 12:42:49 +10:00
Petr Mrázek
a09d03d71d NOISSUE stop relying on forge servers for old FML libs 2021-04-29 02:32:21 +02:00
kumquat-ir
e2e5294fb9 reimplement parsing logic for tomlc99 2021-04-17 10:33:45 -07:00
kumquat-ir
e668aa0f95 switch to new toml library 2021-04-17 09:46:11 -07:00
kumquat-ir
13afad80fb replace ${file.jarVersion} with something useful 2021-04-16 17:45:55 -07:00
kumquat-ir
7156e086f6 parse META-INF/mods.toml for metadata 2021-04-16 13:33:56 -07:00
kumquat-ir
860706caec allow parsing toml from a QByteArray 2021-04-16 11:02:02 -07:00
kumquat-ir
42253150e4 add toml11 as dependency 2021-04-15 23:19:01 -07:00
Jamie Mansfield
438ddfb88d
NOISSUE Support Fabric modpacks on ATLauncher 
Annoyingly the metadata structure is loader dependent :(
 2021-04-16 01:51:25 +01:00
Jamie Mansfield
73788f5d2f
NOISSUE Emit failure on failure conditions 
The 'Installing modpack' dialog will no longer stay open forever,
even though the installation has failed.
 2021-04-16 01:51:25 +01:00
Jamie Mansfield
87dbe82474
NOISSUE Support custom,latest,recommended loader versions for ATL 
This provides support for modpacks using the new loader mechanism in
ATLauncher and using a non-specific version target.
 2021-04-16 01:51:23 +01:00
Petr Mrázek
8b926d29d7 NOISSUE fix build 2021-04-08 22:28:55 +02:00
Petr Mrázek
4ac38991ad
Merge pull request #3691 from phit/feature/fixcurse 
NOISSUE Curseforge makeover
 2021-04-08 22:07:03 +02:00
Petr Mrázek
4ca481b2b3
Merge pull request #3715 from jamierocks/atl-trycatch-json 
NOISSUE Fedora build, ATL exceptions, and language tweaks
 2021-04-08 21:29:10 +02:00
Jamie Mansfield
524fc5b6ec
NOISSUE Fix string formatting issues 
This allows translations to have more control over the output :)
 2021-04-08 18:55:20 +01:00
Jamie Mansfield
64617201b0
GH-3334 Show English variants correctly 
This will no longer show 'American English' with the statistics of
'British English', yet show the correct translations - and will now
display 'British English'.
 2021-04-08 18:53:16 +01:00
Jamie Mansfield
d6dc22d57c
NOISSUE Handle JSON exceptions in ATLauncher support 
Thanks to phit for pointing this out :)
 2021-04-08 18:51:04 +01:00
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