summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
Commit message (Expand)AuthorAgeLines
* Hopefully fix OSX icon filePetr Mrázek2014-01-08-7/+5
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into new-version-systemForkk2014-01-07-69/+70
|\
| * Deploy jars instead of extracting them at runtime, remove non-working nvidia fixPetr Mrázek2014-01-08-69/+70
* | Rework version numbering system.Forkk2014-01-07-11/+19
|/
* Add hack for NvidiaPetr Mrázek2014-01-06-1/+1
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek2014-01-05-2/+2
|\
| * Prepend a 5 to version strings.Forkk2014-01-04-2/+2
* | Add an option to force using local updater binary (for updater development)Petr Mrázek2014-01-05-1/+2
* | Mess with the updater again.Petr Mrázek2014-01-05-0/+2
|/
* Notifications system. Mainly to be used in case the updater breaks.Jan Dalheimer2014-01-03-0/+4
* Implement the news buttonForkk2014-01-02-2/+2
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_newsForkk2014-01-02-7/+54
|\
| * Fixed buttons on osx by adding the accessible plugin.Noah Mayr2014-01-02-0/+12
| * ThreadTask for all your ThreadNeedsPetr Mrázek2014-01-01-2/+6
| * Move assets migration to a task. Needs threading.Sky2014-01-01-0/+2
| * Enable high DPI support on OSXPetr Mrázek2013-12-31-1/+4
| * Refactor icon lists heavilyPetr Mrázek2013-12-31-2/+7
| * LiteLoader supportJan Dalheimer2013-12-28-0/+2
| * Various updater fixesPetr Mrázek2013-12-28-1/+5
| * Initial FTB support. Allows "tracking" of FTB instances.Jan Dalheimer2013-12-21-0/+8
| * Some test madnessPetr Mrázek2013-12-20-1/+8
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_newsAndrew2013-12-15-6/+21
|\|
| * Use asset sizes from the index to make the progress bar betterPetr Mrázek2013-12-15-2/+0
| * Fix bugs introduced by unit test branchPetr Mrázek2013-12-14-2/+2
| * Use ctestPetr Mrázek2013-12-14-0/+1
| * Merge branch 'testing' of https://github.com/02JanDal/MultiMC5 into developPetr Mrázek2013-12-14-4/+20
| |\
| | * Unit testingJan Dalheimer2013-12-02-4/+20
* | | Added a system to load news from MultiMC.org's RSSAndrew2013-12-15-1/+12
|/ /
* | Merge branch 'develop' of github.com:Drayshak/MultiMC5 into developSky2013-12-13-2/+2
|\ \
| * | Add support for 1.7.4 user_type (needs testing with legacy accounts)Petr Mrázek2013-12-13-2/+2
* | | First sweep moving URLs to a constants fileSky2013-12-13-0/+1
|/ /
* | Better (but unsorted) Java detectionSky2013-12-11-0/+2
* | Move fixup_bundle CMake stuff into a separate fileAndrew2013-12-10-16/+5
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek2013-12-10-40/+48
|\ \
| * \ Merge branch 'feature_updater' into developAndrew2013-12-09-41/+48
| |\ \
| | * | Implement DownloadUpdateTaskAndrew2013-12-05-0/+2
| | * | Rework the update checking systemAndrew2013-12-04-9/+37
| | * | Renew the updater branchPetr Mrázek2013-12-02-37/+14
| | |/
* | | Finish assets update for 1.7.3Petr Mrázek2013-12-10-9/+2
* | | Merge branch 'feature_assets' into developPetr Mrázek2013-12-08-0/+8
|\ \ \ | |/ / |/| |
| * | Work on new assets system. Working legacy assets importer, disabled assets do...Sky2013-12-08-0/+8
| |/
* | Merge branch 'feature_pasting' of https://github.com/robotbrain/MultiMC5 into...Petr Mrázek2013-12-08-0/+2
|\ \
| * | fix revertrobotbrainify2013-12-06-0/+2
| * | revertrobotbrainify2013-12-06-113/+111
| * | work on pasting instance logsrobotbrainify2013-12-06-111/+113
| |/
* / Finish preliminary offline supportPetr Mrázek2013-12-08-2/+0
|/
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developAndrew2013-12-01-97/+126
|\
| * Exclude more debug libs (on OSX), debug builds include debug libs.Petr Mrázek2013-12-01-1/+21
| * Fix (hopefully) library dependency resolution.Petr Mrázek2013-12-01-90/+98
| * Fix login and startup logging issuesPetr Mrázek2013-12-01-7/+8