summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Merge branch 'feature/update_translation_fix' into developPetr Mrázek2019-06-25-1/+8
|\
| * GH-1701 Check job size for translationjanrupf2019-06-22-1/+8
* | Merge pull request #2703 from Janrupf/feature/apply_proxy_settingsPetr Mrázek2019-06-23-0/+4
|\ \
| * | GH-2499 Apply proxy settings immediatelyjanrupf2019-06-22-0/+4
| |/
* | Merge pull request #2705 from Janrupf/feature/fix_external_deletion_interactionPetr Mrázek2019-06-23-2/+3
|\ \
| * | GH-2515 Save instance ID before display dialogjanrupf2019-06-21-2/+3
| |/
* | Merge pull request #2706 from Janrupf/feature/fix_hashtag_in_notesPetr Mrázek2019-06-23-3/+16
|\ \
| * | NOISSUE Test comment escaping with unit testsjanrupf2019-06-21-1/+2
| * | NOISSUE Revert INI parser back to single passjanrupf2019-06-21-10/+43
| * | GH-1813 Escape # in INI (and better reader)janrupf2019-06-21-40/+19
| |/
* | Merge pull request #2708 from Janrupf/feature/single_imgur_uploadsPetr Mrázek2019-06-23-0/+32
|\ \
| * | GH-689 Don't create album for single screenshotjanrupf2019-06-22-0/+32
| |/
* | Merge pull request #2704 from Janrupf/feature/autoselect_new_instancesPetr Mrázek2019-06-23-0/+12
|\ \ | |/ |/|
| * NOISSUE Renaming for better understandingjanrupf2019-06-23-5/+5
| * GH-2592 Autoselect newly created instancesjanrupf2019-06-21-0/+12
|/
* Merge pull request #2694 from Janrupf/fix-disabled-modsPetr Mrázek2019-06-17-1/+1
|\
| * NOISSUE Don't append .disabled to stringjanrupf2019-06-17-1/+1
|/
* Merge branch 'develop' of https://github.com/lelandliu/MultiMC5 into developPetr Mrázek2019-06-15-2/+2
|\
| * Fixed adding a disabled duplicateLeland Liu2019-06-14-2/+2
* | NOISSUE limit fabric intermediary selection options in UI by minecraft versionPetr Mrázek2019-06-15-0/+6
* | NOISSUE fix fabric tooltip stringPetr Mrázek2019-06-15-1/+1
* | GH-2639 Add simple fabric loader installation supportPetr Mrázek2019-06-15-1/+51
* | Merge pull request #2690 from asiekierka/fabric-modparsePetr Mrázek2019-06-15-0/+56
|\ \ | |/ |/|
| * fix author name parsingasie2019-06-15-7/+10
| * Add Fabric mod JSON parsing supportasie2019-06-15-0/+53
|/
* Merge pull request #2684 from isoraqathedh/patch-1Petr Mrázek2019-06-08-3/+3
|\
| * Update run.shisoraqathedh2019-06-08-3/+3
|/
* NOISSUE fix macOS build, remove bundled dependencies on linuxPetr Mrázek2019-06-08-2/+2
* NOISSUE make the global settings button context sensitivePetr Mrázek2019-06-01-1/+11
* NOISSUE add option to open global settings from instance settingsPetr Mrázek2019-06-01-53/+55
* NOISSUE add the pocket fox iconPetr Mrázek2019-06-01-4/+301
* NOISSUE improve icon handling while importing and exporting instancesPetr Mrázek2019-05-31-38/+129
* Merge pull request #2603 from AlexTMjugador/developPetr Mrázek2019-04-14-3/+32
|\
| * Tweak strings as per peterix reviewAlejandro González2019-04-14-5/+7
| * Conform to existing code styleAlexTMjugador2019-04-15-4/+4
| * Support launching profiler in offline modeAlexTMjugador2019-04-15-1/+28
|/
* GH-2591 less std::shared_ptr and more shared_qobject_ptrPetr Mrázek2019-04-07-83/+79
* Merge remote-tracking branch 'origin/feature/trim_server_details' into developPetr Mrázek2019-04-02-2/+2
|\
| * GH-2551 Trim at serializationElise2019-03-29-4/+4
| * GH-2551 Trim server name and IP stringsElise2019-03-19-2/+2
* | Merge pull request #2565 from MultiMC/feature/deletion_harderPetr Mrázek2019-03-23-1/+2
|\ \
| * \ Merge branch 'develop' into feature/deletion_harderElise2019-03-19-4/+5
| |\ \ | |/ / |/| |
* | | NOISSUE fix metadata URLPetr Mrázek2019-03-08-1/+1
* | | NOISSUE create translations folder before starting to watch it for changesPetr Mrázek2019-03-08-4/+5
| |/ |/|
| * GH-2487 Make NO the default buttonElise2019-02-26-1/+2
|/
* NOISSUE update changelog0.6.5Petr Mrázek2019-02-21-1/+11
* NOISSUE hide the game options screen againPetr Mrázek2019-02-21-1/+1
* NOISSUE fix buildPetr Mrázek2019-02-19-1/+0
* GH-2209 Fix sounds in old (pre-1.6) versionsPetr Mrázek2019-02-19-25/+209
* Merge pull request #2532 from andersmmg/patch-1Petr Mrázek2019-02-05-1/+1
|\