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

2308 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Petr Mrázek
0b86a7ebf3
Merge pull request #2718 from therealfarfetchd/hidpi-icon-fix 
Enable HiDPI pixmaps to fix icon scaling for HiDPI displays
 2019-06-30 15:39:29 +02:00
Petr Mrázek
63330bf111 NOISSUE connect twitch URL resolving to modpack resolving. works now. 2019-06-30 11:03:59 +02:00
Petr Mrázek
f74e3db804 NOISSUE Import page is now a MultiMC pack page 2019-06-29 01:13:39 +02:00
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
34611c00e3 Merge branch 'feature/update_translation_fix' into develop 2019-06-25 23:41:16 +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
2f1d31cf43
Merge pull request #2706 from Janrupf/feature/fix_hashtag_in_notes 
Feature/fix hashtag in notes
 2019-06-23 21:19:10 +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
Petr Mrázek
384979bf94
Merge pull request #2704 from Janrupf/feature/autoselect_new_instances 
GH-2592 Autoselect newly created instances
 2019-06-23 19:58:21 +02:00
janrupf
b5a16935b7 NOISSUE Renaming for better understanding 2019-06-23 14:54:17 +02:00
janrupf
320637e8dc GH-1701 Check job size for translation 2019-06-22 01:54:08 +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
7b52b8689b NOISSUE Test comment escaping with unit tests 2019-06-21 23:46:54 +02:00
janrupf
d21700ee91 NOISSUE Revert INI parser back to single pass 2019-06-21 23:46:54 +02:00
janrupf
f87c890912 GH-1813 Escape # in INI (and better reader) 2019-06-21 23:46:54 +02:00
janrupf
306b98edac GH-2592 Autoselect newly created instances 2019-06-21 22:38:26 +02:00
Petr Mrázek
ce12f1a734
Merge pull request #2694 from Janrupf/fix-disabled-mods 
Operate on copy of QString instead of appending
 2019-06-17 23:21:26 +02:00
janrupf
c1953739d9 NOISSUE Don't append .disabled to string 2019-06-17 15:49:26 +02:00
Petr Mrázek
e8bf9cef24 Merge branch 'develop' of https://github.com/lelandliu/MultiMC5 into develop 2019-06-15 22:47:36 +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
Petr Mrázek
83c48a0f1a
Merge pull request #2690 from asiekierka/fabric-modparse 
Add Fabric mod JSON parsing support
 2019-06-15 20:41:42 +02:00
asie
d251097545 fix author name parsing 2019-06-15 16:36:13 +02:00
asie
c35dbd972e Add Fabric mod JSON parsing support 2019-06-15 13:54:20 +02:00
Leland Liu
0c5d121452 Fixed adding a disabled duplicate 2019-06-14 15:48:24 -04:00
Petr Mrázek
53ad5cb436
Merge pull request #2684 from isoraqathedh/patch-1 
Pass command line arguments through to the executable
 2019-06-08 15:53:01 +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
86850ef5d0 NOISSUE fix macOS build, remove bundled dependencies on linux 
Your copy of MultiMC might stop working after this update
because we no longer bundle Qt and other system libraries.

Contact us at https://discord.gg/0k2zsXGNHs0fE4Wm if
you need help with installing Qt.

Qt 5.4.x or newer is required.
 2019-06-08 15:08:24 +02: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
Petr Mrázek
61913daaf3
Merge pull request #2603 from AlexTMjugador/develop 
Support launching profiler in offline mode
 2019-04-14 23:34:10 +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
Petr Mrázek
9292d846b6
Merge pull request #2565 from MultiMC/feature/deletion_harder 
GH-2487 Make deleting instances harder
 2019-03-23 14:23:45 +01:00
Elise
22db95ce3b
Merge branch 'develop' into feature/deletion_harder 2019-03-19 16:29:40 -04:00
Elise
597fe50d37 GH-2551 Trim server name and IP strings 2019-03-19 13:28:11 -04:00
Petr Mrázek
bf93ba02e9 NOISSUE fix metadata URL 2019-03-08 02:04:08 +01:00
Petr Mrázek
07c1685ff1 NOISSUE create translations folder before starting to watch it for changes 
Fixes issue where on first run, the translations don't show up.
 2019-03-08 01:21:04 +01:00