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

667 Commits

Author SHA1 Message Date
therealfarfetchd
a55fa04353 Enable HiDPI pixmaps to fix icon scaling for HiDPI displays 2019-06-27 23:04:53 +02:00
Petr Mrázek
fde43c993e NOISSUE add silly twitch URL and CCIP resolving page to 'add instance' 
It needs a few more steps and it will handle all kinds of twitch packs.
 2019-06-27 03:20:11 +02:00
Petr Mrázek
917f148fc4 NOISSUE add support for 'experiment' Minecraft versions 2019-06-26 20:51:04 +02:00
Petr Mrázek
44a7c5867b
Merge pull request #2703 from Janrupf/feature/apply_proxy_settings 
GH-2499 Apply proxy settings immediately
 2019-06-23 21:38:30 +02:00
Petr Mrázek
75ddbc8851
Merge pull request #2705 from Janrupf/feature/fix_external_deletion_interaction 
GH-2515 Save instance ID before display dialog
 2019-06-23 21:31:56 +02:00
Petr Mrázek
e7c5b266c8
Merge pull request #2708 from Janrupf/feature/single_imgur_uploads 
GH-689 Don't create album for single screenshot
 2019-06-23 21:15:06 +02:00
janrupf
b5a16935b7 NOISSUE Renaming for better understanding 2019-06-23 14:54:17 +02:00
janrupf
77f3f028fa GH-2499 Apply proxy settings immediately 2019-06-22 01:48:37 +02:00
janrupf
2a96e16902 GH-689 Don't create album for single screenshot 2019-06-22 01:47:07 +02:00
janrupf
1ed84eddd5 GH-2515 Save instance ID before display dialog 2019-06-21 23:55:16 +02:00
janrupf
306b98edac GH-2592 Autoselect newly created instances 2019-06-21 22:38:26 +02:00
Petr Mrázek
8aa4b9dac5 NOISSUE limit fabric intermediary selection options in UI by minecraft version 2019-06-15 22:45:56 +02:00
Petr Mrázek
4836ba22cd NOISSUE fix fabric tooltip string 2019-06-15 22:29:34 +02:00
Petr Mrázek
6c30076b6c GH-2639 Add simple fabric loader installation support 2019-06-15 21:25:23 +02:00
isoraqathedh
d87bd4b588
Update run.sh 
Pass command line arguments through to the executable
 2019-06-08 21:21:22 +08:00
Petr Mrázek
30fba4d407 NOISSUE make the global settings button context sensitive 2019-06-01 18:05:42 +02:00
Petr Mrázek
932160818e NOISSUE add option to open global settings from instance settings 
This should hopefully giude people towards using the right thing.
 2019-06-01 12:28:53 +02:00
Petr Mrázek
59e1ed3d87 NOISSUE add the pocket fox icon 2019-06-01 00:59:02 +02:00
Petr Mrázek
3470a3df96 NOISSUE improve icon handling while importing and exporting instances 
Now it handles formats other than png.
 2019-05-31 21:53:58 +02:00
Alejandro González
cb71dfa605
Tweak strings as per peterix review 2019-04-14 23:02:01 +02:00
AlexTMjugador
2be98baaba Conform to existing code style 2019-04-15 00:44:59 +02:00
AlexTMjugador
0ce637bf0e Support launching profiler in offline mode 
This commit adds the necessary GUI controls to let the user choose
whether they want to launch Minecraft in offline mode with a configured profiler.
 2019-04-15 00:42:06 +02:00
Petr Mrázek
70ed30f9e6 GH-2591 less std::shared_ptr and more shared_qobject_ptr 
This eliminates some weird crashes.
 2019-04-07 23:59:04 +02:00
Petr Mrázek
414946cad9 Merge remote-tracking branch 'origin/feature/trim_server_details' into develop 2019-04-02 23:39:13 +02:00
Elise
1fc199697c GH-2551 Trim at serialization 2019-03-29 11:25:37 -04:00
Elise
597fe50d37 GH-2551 Trim server name and IP strings 2019-03-19 13:28:11 -04:00
Elise
a5e531d4f1 GH-2487 Make NO the default button 2019-02-26 16:56:08 -05:00
Petr Mrázek
73e487a31e NOISSUE hide the game options screen again 2019-02-21 00:44:36 +01:00
Joshua Anderson
6e8e4c5dfa
Update title of Add Empty dialog 2019-02-05 00:06:29 -07:00
Petr Mrázek
62c9fcdc6c NOISSUE first step towards having game options management 2019-01-30 00:35:24 +01:00
Petr Mrázek
c1ea42d3d9 Merge branch 'stable' of https://github.com/Scotsguy/MultiMC5 into develop 2019-01-17 00:51:54 +01:00
AppleTheGolden
437dec91f9
Update Copyright Year 2019-01-16 21:14:24 +01:00
Petr Mrázek
c08053d8b8 NOISSUE split out language selection widget, use it in settings 2019-01-09 04:38:35 +01:00
Petr Mrázek
e71786d7b9 NOISSUE language selection wizard improvements 
Same needs to be applied to the application settings later.
 2019-01-08 02:20:36 +01:00
Petr Mrázek
4474d269cc NOISSUE granular model updates for language model 2019-01-06 22:14:13 +01:00
Petr Mrázek
ec2732ccd1 NOISSUE update FTB URLs 2019-01-04 01:48:36 +01:00
Petr Mrázek
3e60e770b5 NOISSUE just don't use std::abs, it doesn't work 2018-12-24 14:49:53 +01:00
Petr Mrázek
70052b180c NOISSUE maybe fix macos build, pngcrush images 2018-12-24 14:31:34 +01:00
Petr Mrázek
2e58429b6a NOISSUE kitty cat in a silly hat! 2018-12-24 03:26:14 +01:00
Petr Mrázek
56a9b65efb NOISSUE add missing Q_OBJECT macros 2018-12-23 01:05:11 +01:00
Petr Mrázek
14bb666a20 GH-2485 fix crash bug while creating instances 2018-12-14 01:18:18 +01:00
Petr Mrázek
13b293dd65 GH-2374 fix missing alternating backgrounds in worlds, add gametype column 2018-12-11 23:53:14 +01:00
Petr Mrázek
e8c382bede GH-2101 select everything when editing instance names 2018-11-23 21:47:23 +01:00
Petr Mrázek
54e857a7f5 NOISSUE proper inline editable instance names 
Pretty!
 2018-11-23 04:56:56 +01:00
Petr Mrázek
74c598d756 GH-2101 fix enter and double click activation of instances 2018-11-22 02:02:53 +01:00
Petr Mrázek
c214c13fb3 GH-2101 POC for inline renaming 2018-11-22 01:50:32 +01:00
Petr Mrázek
c4a472981f GH-2467 remove unused sorting indicators from version page 2018-11-21 00:55:40 +01:00
Petr Mrázek
a8e77f0ecc NOISSUE remove some nonsense and dead code 2018-11-15 00:36:47 +01:00
Petr Mrázek
0f0dc30729 GH-2144 Fix translatable string 2018-11-12 01:57:26 +01:00
janrupf
1648b34aed GH-1552 Hide PermGen when using an autodetected java version greater than 8 2018-11-12 01:50:04 +01:00
janrupf
4cc7329ce3 GH-2144 Append '(installed)' to the installed version name 2018-11-12 01:49:52 +01:00
janrupf
3d630c7856 GH-2452 Ask before deleting group 2018-11-12 01:48:53 +01:00
Petr Mrázek
58260da861 NOISSUE remove use of obsolete URL constants, simplify the rest 2018-11-04 13:18:35 +01:00
Chris Lane
0572a1e4e6
NOISSUE use https more widely 2018-11-02 12:04:08 +00:00
Petr Mrázek
24fd2918c7 NOISSUE fix more rhel 7.6 problems? 2018-11-01 23:30:13 +01:00
Petr Mrázek
aef0ccb1a2 GH-2232 add gif icon support (not animated) 2018-10-31 21:54:22 +01:00
Noah
d9c1fc09e7 add game and minecraft keywords 2018-10-31 20:40:19 +01:00
Noah
8b56d77f5e add minecraft keyword 2018-10-31 20:40:19 +01:00
Petr Mrázek
5f2d3f014a NOISSUE get rid of remaining tabs 2018-08-02 01:01:55 +02:00
Jannis Lübke
6aada8adf7 NOISSUE FTB pack code implementation, cleaned up 2018-08-02 00:52:31 +02:00
Petr Mrázek
6cee50eac6 NOISSUE gate new mods page behind cheat code 2018-08-01 20:05:18 +02:00
Petr Mrázek
9cc93ae81d NOISSUE fix crash bug caused by urge to maker code pretty 
Also added a note so this doesn't happen again...
 2018-07-31 02:20:04 +02:00
Petr Mrázek
0c73ddee73 NOISSUE set groups for instances by not setting groups for instances 
So simple. Better in every way.
 2018-07-31 01:54:08 +02:00
Petr Mrázek
9965decd81 NOISSUE squish. 2018-07-28 22:12:57 +02:00
Petr Mrázek
9e7cdbfe11 NOISSUE pretty multi-line formatting... 2018-07-28 22:12:57 +02:00
Petr Mrázek
76d6ec91a4 NOISSUE simplify. 2018-07-28 22:12:57 +02:00
Petr Mrázek
7b439c85c0 SCRATCH things and stuff, related to grou saving 2018-07-28 22:12:57 +02:00
Petr Mrázek
12f2716f31 GH-2355 Do not allow instances to be created with whitespace prefix or suffix 2018-07-28 22:08:09 +02:00
Petr Mrázek
e4c33458f2 GH-2352 Add Minecraft folder button for instances, rearrange buttons by importance 2018-07-27 23:57:09 +02:00
Petr Mrázek
14f85813c8 NOISSUE hide the new mods page 2018-07-22 09:06:31 +02:00
Petr Mrázek
bbb3b3e6f6 NOISSUE tabs -> spaces 2018-07-15 14:51:05 +02:00
Petr Mrázek
03280cc62e NOISSUE separate new mods model from the simple one 
It should list mods in various locations...
 2018-07-15 14:04:09 +02:00
Petr Mrázek
128bce6acb SCRATCH second mods page, placeholder 2018-07-15 12:48:41 +02:00
Petr Mrázek
a222c94d34 NOISSUE add cancel button to the new instance dialog 2018-06-30 19:44:30 +02:00
Petr Mrázek
a872085f9a NOISSUE remove refresh button from servers page 2018-06-30 19:44:21 +02:00
Petr Mrázek
8516a6646e NOISSUE fix saving the servers.dat file when it doesn't exist yet 2018-06-30 01:27:44 +02:00
Petr Mrázek
44381c09d7 NOISSUE more warnings 2018-06-28 23:51:26 +02:00
Petr Mrázek
7fe94ca7b4 NOISSUE fix all sorts of warnings, enable Werror and pedantic 2018-06-28 23:18:45 +02:00
Sergey Shatunov
4d68c1b509
GH-2291 Fix build with Qt 5.11+ 2018-06-02 17:22:43 +07:00
Charles Milette
72c0002b45
Catch C++ exceptions by const reference 
Fixes #2277
 2018-05-19 19:18:26 -04:00
Petr Mrázek
b9fd381eee GH-2268 update the deb package to not depend on latest jre 
* `openjdk-8-jre` is now recommended
* the package now depends on `desktop-file-utils`
* the desktop icon has been updated to the current one
 2018-05-17 23:14:12 +02:00
Petr Mrázek
584f1e89b9 GH-2252 make URL drop signal use a queued connection instead of direct call 
Hopefully this will fix the issues with stuck applications on Windows.
 2018-04-23 08:45:58 +02:00
Petr Mrázek
72ff342d63 GH-2053 basics of the servers.dat management 2018-04-23 02:05:22 +02:00
Petr Mrázek
be9063317e NOISSUE hide the twitch platform page 2018-04-08 21:22:41 +02:00
Petr Mrázek
8cefc76108 NOISSUE show release dates of the meta versions in version picker views 2018-04-08 19:49:02 +02:00
Petr Mrázek
9b7f82ff26 NOISSUE fix build problem with missing <functional> include 2018-04-07 22:36:57 +02:00
Janrupf
7e1c5d439a #2228, #2229 - Auto import pack icons and fixed to big version selection - Closes #2228, Closes #2229 2018-04-07 22:09:19 +02:00
Janrupf
38ed0c2a1f NOISSUE Fixed ftb downloads always latest version 2018-04-07 00:46:49 +02:00
Lukas Haigner
9b7564e967 NOISSUE Fixed progress dialog 2018-04-07 00:46:49 +02:00
Petr Mrázek
15926b2b4a NOISSUE make FTB pack selection fancier 2018-04-06 21:59:04 +02:00
Petr Mrázek
6323aae56f NOISSUE move FtbListModel to where it is actually used 2018-04-06 21:04:34 +02:00
Petr Mrázek
c9c6037f50 NOISSUE fix Qt moc warning 2018-04-06 21:02:37 +02:00
Janrupf
97b74ef56a NOISSUE Fixed code for PR 2018-04-06 19:39:12 +02:00
Janrupf
df6e66101c NOISSUE Added 3rd party pack support 2018-04-05 19:33:31 +02:00
Janrupf
bbd523acb8 NOISSUE Added FTB Pack logos to chooser and fixed some missing includes 2018-04-02 23:02:33 +02:00
Petr Mrázek
3406335cd8 GH-2219 fix crash and bad view scaling in Java VersionSelectDialog 2018-04-02 22:58:02 +02:00
Petr Mrázek
fa8f19b046 GH-2211 fix crash in first launch wizard 2018-03-29 20:41:16 +02:00
Petr Mrázek
370bbada87 NOISSUE polish the new instance UI a bit more 2018-03-28 21:57:41 +02:00
Petr Mrázek
1ef416cb56 NOISSUE add pointless fun things, because. 2018-03-28 00:51:24 +02:00
Petr Mrázek
b46a34d0ae NOISSUE make vanilla refresh button work 2018-03-27 23:19:29 +02:00
Petr Mrázek
6188c577e3 NOISSUE fix page container spacing in UIs 2018-03-27 22:21:41 +02:00
Petr Mrázek
40a30b67f4 NOISSUE save the new instance dialog geometry when the dialog is accepted 2018-03-27 22:02:57 +02:00
Petr Mrázek
12b304ea73 NOISSUE fix crash in NewInstanceDialog 2018-03-27 21:05:41 +02:00
Petr Mrázek
8e44ab2338 NOISSUE redo new instance dialog 2018-03-27 09:25:36 +02:00
Petr Mrázek
4c7ea0f99a NOISSUE explain the custom commands better 2018-03-26 22:08:55 +02:00
Petr Mrázek
106155dd62 NOISSUE move modpack platform related files to 'modplatform' subfolders 2018-03-16 23:33:58 +01:00
Petr Mrázek
303842a19e NOISSUE Add Konami Code 
Fun little thing for hiding extra debug options in the future.
 2018-03-15 09:27:45 +01:00
Petr Mrázek
82208be49e NOISSUE add linux distro name and release stats to analytics 
Hopefully this can serve as some sort of guideline for focusing
effort towards the right distro packages to make.
 2018-03-13 00:28:51 +01:00
Janrupf
0812e3a87b NOISSUE Fixed code for PR 2018-03-12 15:09:07 +01:00
Janrupf
b8ca36372b GH-2124 First complete implementation, installing is working now! GH-2172 Added sorting 2018-03-11 19:30:47 +01:00
Janrupf
ab3fe74c97 Added FTB pack selection ad download, WIP 2018-02-28 19:43:56 +01:00
Petr Mrázek
06ccff0f47 GH-2150 Separate Java settings UI used in the wizard into a widget 2018-02-18 12:39:35 +01:00
Petr Mrázek
65bca65489 GH-2150 Split out custom commands into a custom widget 
Now it is used from a global page and from a sub-page in the instance settings.
 2018-02-17 00:57:54 +01:00
Petr Mrázek
a7957f24ba GH-2134 Totally overengineer skin upload input validation 
* It autocorrects local paths and file:// URLs to valid local paths.
* It recognizes other URL schemes as 'remote' and will show an error for them.
* The error dialogs have been fixed (they all had titles and content swapped).
 2018-02-15 00:40:23 +01:00
Petr Mrázek
2ea22d407d GH-604 use the same font for 'Other Logs' as for the main log 
This doesn't mean coloring, just the same font and font size.
 2018-02-14 21:37:32 +01:00
Petr Mrázek
22b32fce12 GH-2143 Switch Mojang status icons to current set of services 
This also removes the Web and Account web icons, because they are simply
not relevant to MultiMC (it does not use those). You can always
check their status by opening them in a browser.
 2018-02-13 21:35:05 +01:00
Petr Mrázek
604295e6d5 NOISSUE fix some warnings 2018-02-11 01:21:32 +01:00
Petr Mrázek
f259e9f727 NOISSUE update copyright dates 2018-02-11 00:40:01 +01:00
Petr Mrázek
38e669dbf5 NOISSUE change FS::updateTimestamp to work with directories too, use it to fix icon issues on macOS 2018-02-11 00:35:56 +01:00
Petr Mrázek
ca11765436 NOISSUE split logo into 'logo' and 'multimc' 2018-02-10 19:13:59 +01:00
Petr Mrázek
354ed2e7f0 NOISSUE version the discord variant of the icon 2018-02-10 16:13:05 +01:00
Petr Mrázek
a08afb8172 NOISSUE update the MultiMC logo 2018-02-10 16:09:14 +01:00
Petr Mrázek
41aef8414a NOISSUE add an 'open folder' button to the icon dialog 2018-02-05 02:01:12 +01:00
Petr Mrázek
83649b5d52 NOISSUE implement basic search in Other Logs page 2018-02-05 01:40:38 +01:00
Petr Mrázek
418251bd86 NOISSUE use a variable for binary build definitions 2018-01-28 19:04:39 +01:00
Petr Mrázek
0bcb24502e GH-2119 Update group view scrollbar when the size of rows doesn't change 
Previously, it would only update when you resize the window horizontally
enough to change the number of icons that fit in a row.
 2018-01-28 02:04:47 +01:00
Petr Mrázek
d66ae206dd NOISSUE move bundle utilities magic back to the application folder 
This may fix macOS issues?
 2018-01-27 21:59:06 +01:00
Petr Mrázek
166e5a03d6 NOISSUE rearrange build system 
* Added install commands to the libraries instead of force installing files
* Most of the application cmake stuff moved to top level
* RPATH should now be set/cleared correctly
* Contains a fix for GH-1780
 2018-01-27 02:00:20 +01:00
Samuel Rakitničan
0942867ecc GH-2103 Make /usr/local the default prefix for lin-system 
/usr/local is a sane default since /usr is meant to be used by packages.
 2018-01-18 12:09:03 +01:00
Petr Mrázek
e8336babad NOISSUE fix the installation prefix mess 2018-01-16 07:08:59 +01:00
Petr Mrázek
d0e58acd84 GH-2103 add suggested changes from the pull request 2018-01-16 06:48:10 +01:00
Carl Philipp Reh
360d877abf GH-2103 Take CMAKE_INSTALL_PREFIX into account in MULTIMC_JARS_LOCATION 
When installing MultiMC with the lin-system layout and specifying an
install prefix that is not the empty string, then MultiMC looks for its
Jars in the wrong location. Fix this by appending CMAKE_INSTALL_PREFIX.
 2018-01-16 06:47:58 +01:00
srakitnican
7ea1d68244
GH-2102 multimc.desktop: Remove deprecated entries 2018-01-14 08:23:17 +01:00
Petr Mrázek
b7f28a92d4 NOISSUE change default install layout on linux to lin-nodeps 
This avoids issues with included bundle utilities on certain systems
and is a step in the intended direction (not distributing dependencies).
 2018-01-08 01:42:50 +01:00
Petr Mrázek
0636c03d7c GH-2087 remove the revert to vanilla functionality, add file download button to version page 2018-01-05 04:26:46 +01:00
Petr Mrázek
ee341b78ba GH-2089 update wording of the instance delete confirmation dialog 2018-01-04 04:16:31 +01:00
Petr Mrázek
7cd13302c5 NOISSUE only show pack import warnings when there are some 2017-12-31 07:20:28 +01:00
Petr Mrázek
4340068a84 NOISSUE add button for creating empty, properly registered, components 2017-12-31 01:37:50 +01:00
Petr Mrázek
58ead6a1f4 NOISSUE handle 'folder' Flame packages by ignoring them, show warnings for minor Flame import problems 2017-12-30 18:57:46 +01:00
Petr Mrázek
5937b1c3d4 NOISSUE make the patreon button text slightly shorter 
"Support MultiMC" instead of "Support us on Patreon!"
 2017-12-30 05:18:09 +01:00
Petr Mrázek
719f3e863a NOISSUE add versioning to component metadata format and use it 2017-12-29 00:37:14 +01:00
Petr Mrázek
50ca6cbb4d NOISSUE fix crash bug in version page of instances 
This was caused by generation of temporary component objects
when no such thing should have been happening.
 2017-12-29 00:35:10 +01:00
Petr Mrázek
257f8ca9fd NOISSUE fix typo when deleting log files 
"Do you really want to these files?" was missing "delete".
 2017-12-25 13:06:38 +01:00
Petr Mrázek
642c3f1d09 NOISSUE sort export dialog contents in ascending order by default 2017-12-21 01:25:43 +01:00
Petr Mrázek
c2726037ce NOISSUE add missing world and help icons 2017-12-19 01:49:46 +01:00
Petr Mrázek
9eb0525dab NOISSUE preserve log page checkbox state when the instance window is closed 
Only for a single session, not between sessions.
 2017-12-18 01:19:43 +01:00
Petr Mrázek
fb7897a6f4 NOISSUE remopve instance settings button from the main window 
This should steer new users to the main settings even more, while keeping
the instance settings still available.
 2017-12-17 22:17:29 +01:00
Petr Mrázek
5858483592 NOISSUE ignore merge commits in dev build changelog 2017-12-17 21:08:20 +01:00
Petr Mrázek
f18afd3d1e NOISSUE fix a bunch of warnings thrown by Qt internals 
Badly connected signals/slots and similar things.
 2017-12-14 00:29:00 +01:00
Petr Mrázek
ef2cbe16e6 NOISSUE when there is a version added already, preselect it in the version select dialog 2017-12-09 01:30:23 +01:00