summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Made the run script look for missing dependencies.Andrew2013-12-13-5/+20
| | | | | On Linux, MultiMC's startup script will now look for plugins with missing depenedencies and warn the user about them if they are missing.
* Merge branch 'develop' of github.com:Drayshak/MultiMC5 into developSky2013-12-13-31/+86
|\
| * Do not log auth crudPetr Mrázek2013-12-13-2/+2
| |
| * Fix syntax errorPetr Mrázek2013-12-13-9/+7
| | | | | | | | You do not need goto for that. Really.
| * Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek2013-12-13-1/+9
| |\
| | * Fix updater removing all files.Andrew2013-12-12-1/+9
| | | | | | | | | | | | Yeah, I don't know what I was thinking, but somehow it worked before.
| * | Add support for 1.7.4 user_type (needs testing with legacy accounts)Petr Mrázek2013-12-13-19/+58
| | |
| * | Use temporary files for the java checkerPetr Mrázek2013-12-13-7/+13
| |/
| * Include unistd.h in ProcessUtils.hAndrew2013-12-12-0/+4
| |
| * Remove -Werror from the updater's compile flagsAndrew2013-12-12-1/+1
| |
* | First sweep moving URLs to a constants fileSky2013-12-13-20/+56
|/
* Make sure adding forced candidates doesn't result in duplicatesSky2013-12-12-7/+5
|
* Don't break Linux and OS X builds :(Sky2013-12-12-9/+9
|
* Java version list should be sorted, JRE->JDK, 64->32Sky2013-12-12-25/+28
|
* Remove QsLog destinations when they are destroyed.Andrew2013-12-11-4/+17
| | | | | | This fixes some issues where MultiMC was segfaulting on exit because things were trying to write to the logger while they were being destroyed, but the destinations had already been destroyed and were left in the list.
* Fix console window sticking open derpSky2013-12-11-2/+5
|
* Fix checker progress derpSky2013-12-11-1/+1
|
* Merge https://github.com/Drayshak/MultiMC5 into developPetr Mrázek2013-12-11-78/+329
|\
| * Better (but unsorted) Java detectionSky2013-12-11-78/+329
| |
* | Swap https -> http for asset indexesPetr Mrázek2013-12-11-1/+1
| |
* | Merge branch 'feature_no_firstrun' of https://github.com/robotbrain/MultiMC5 ↵Petr Mrázek2013-12-11-1/+14
|\ \ | | | | | | | | | into develop
| * | Nuke!robotbrain2013-12-10-1/+0
| | |
| * | Fix my utter derprobotbrainify2013-12-10-59/+1
| | |
| * | Fix I think.robotbrain2013-12-09-0/+1
| | |
| * | Make it update the instance when it creates it, so you can install forgerobotbrain2013-12-09-1/+72
| | | | | | | | | | | | right away
* | | Do not let the console close while Minecraft is running (prevent return to ↵Petr Mrázek2013-12-10-0/+3
| |/ |/| | | | | main window)
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek2013-12-10-16/+21
|\ \
| * | Move fixup_bundle CMake stuff into a separate fileAndrew2013-12-10-16/+21
| | |
* | | Use metacache for minecraft.jar downloadsPetr Mrázek2013-12-10-15/+24
| | |
* | | Nuke.Petr Mrázek2013-12-10-7/+0
|/ /
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek2013-12-10-69/+45872
|\| | | | | | | | | | | Conflicts: CMakeLists.txt gui/MainWindow.cpp
| * Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developAndrew2013-12-09-40/+83
| |\
| * \ Merge branch 'feature_updater' into developAndrew2013-12-09-55/+45858
| |\ \
| | * \ Merge branch 'feature_updater' of github.com:MultiMC/MultiMC5 into ↵Petr Mrázek2013-12-07-83/+263
| | |\ \ | | | | | | | | | | | | | | | feature_updater
| | | * | Include shellapi.h in the updater on Windows.Andrew2013-12-06-0/+1
| | | | |
| | | * | Added WIN32_LEAN_AND_MEANAndrew2013-12-06-1/+2
| | | | | | | | | | | | | | | | | | | | Should reduce compile times and help get rid of some error things.
| | | * | Finish implementing update installation.Andrew2013-12-06-10/+128
| | | | | | | | | | | | | | | | | | | | Also add the option to update on exit.
| | | * | Implement update installerAndrew2013-12-05-73/+133
| | | | |
| | * | | Fix build failures on Windows.Petr Mrázek2013-12-07-8/+1
| | |/ / | | | | | | | | | | | | | | | | * remove atoll * fix include path of updater depends
| | * | Implement DownloadUpdateTaskAndrew2013-12-05-15/+555
| | | | | | | | | | | | | | | | Installing updates is not implemented yet. That's next.
| | * | Rework the update checking systemAndrew2013-12-04-176/+394
| | | |
| | * | Renew the updater branchPetr Mrázek2013-12-02-45/+44913
| | | | | | | | | | | | | | | | Now with some actual consensus on what the updater will do!
* | | | Finish assets update for 1.7.3Petr Mrázek2013-12-10-381/+203
| | | |
* | | | Merge branch 'feature_assets' into developPetr Mrázek2013-12-08-3/+447
|\ \ \ \ | |_|_|/ |/| | |
| * | | More work on new assets system. Works given a properly constructed assets ↵Sky2013-12-08-3/+210
| | | | | | | | | | | | | | | | folder, no downloading yet
| * | | Work on new assets system. Working legacy assets importer, disabled assets ↵Sky2013-12-08-1/+238
| | |/ | |/| | | | | | | downloading for now
* | | Fix offline mode bugsPetr Mrázek2013-12-08-40/+83
| |/ |/|
* | Move pastebin button on the console window to the leftPetr Mrázek2013-12-08-7/+7
| | | | | | | | It's been there before, it's there now :D
* | Merge branch 'feature_pasting' of https://github.com/robotbrain/MultiMC5 ↵Petr Mrázek2013-12-08-0/+136
|\ \ | | | | | | | | | into develop
| * | fix revertrobotbrainify2013-12-06-0/+2
| | |