summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
Commit message (Expand)AuthorAgeLines
* Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 in...Petr Mrázek2014-02-01-4/+8
|\
| * Merge branch 'develop' into feature_derpstancesJan Dalheimer2014-01-24-1/+1
| |\
| * | Change naming from Derp -> OneSix until the new instance type supports legacyJan Dalheimer2014-01-24-19/+19
| * | Forge works now too, and so does forge+liteloaderJan Dalheimer2014-01-23-0/+2
| * | Derpstances. Everything renamed. Launching does not yet work.Jan Dalheimer2014-01-22-17/+19
* | | Add 'empty text' to all the version selection dialogs.Petr Mrázek2014-01-29-0/+4
* | | Offline mode can be used even when online.Petr Mrázek2014-01-27-0/+2
| |/ |/|
* | Hotfix 0.2.1 for twitch.0.2.1Petr Mrázek2014-01-22-1/+1
|/
* Update the changelog, version, scale the instance iconPetr Mrázek2014-01-20-2/+2
* Move a bunch of resources into the resources folder.Petr Mrázek2014-01-19-2/+2
* Use icon theme so we can have more than one icon size per iconPetr Mrázek2014-01-19-2/+8
* Merge branch 'feature_localization' of https://github.com/02JanDal/MultiMC5 i...Petr Mrázek2014-01-12-1/+0
|\
| * Fix a few things related to the translationsJan Dalheimer2014-01-04-1/+0
* | Show Mojang service statuses in status barSky2014-01-12-0/+4
* | No more generated resources.Petr Mrázek2014-01-11-4/+1
* | Harden CacheDownload.Petr Mrázek2014-01-11-0/+2
* | Merge branch 'master' into developForkk2014-01-08-1/+1
|\ \
| * | Change the issue tracker URL to GitHub issuesForkk2014-01-08-1/+1
* | | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developForkk2014-01-08-7/+5
|\ \ \ | |/ / |/| |
| * | Hopefully fix OSX icon filePetr Mrázek2014-01-08-7/+5
* | | Make CMake output version type infoForkk2014-01-07-2/+8
* | | Bump minor version number and update changelog.Forkk2014-01-07-1/+1
|/ /
* | 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
|\ \