summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeLines
...
* Merge branch 'feature_localization' of https://github.com/02JanDal/MultiMC5 ↵Petr Mrázek2014-01-12-1/+0
|\ | | | | | | | | | | | | | | into develop Conflicts: gui/dialogs/SettingsDialog.cpp gui/dialogs/SettingsDialog.ui
| * 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
| | | | | | | | It's now super hard. SRSLY.
* | Merge branch 'master' into developForkk2014-01-08-1/+1
|\ \
| * | Change the issue tracker URL to GitHub issuesForkk2014-01-08-1/+1
| | | | | | | | | | | | Bump hotfix version number and add an entry in the changelog.
* | | 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
|/ / | | | | | | Again...
* | 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
| | | | | | | | | Make the news button open the latest news post in the user's web browser. Also remove the webkit dependency. I was planning on using it to display the news in a custom window, but we'll just use the user's browser for now.
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_newsForkk2014-01-02-7/+54
|\ | | | | | | | | | | Conflicts: CMakeLists.txt gui/MainWindow.h
| * 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
| | | | | | | | Use only when absolutely required.
| * 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
| | | | | | | | | | | | * Icon list now uses a filesystem watcher for updates * Icon folder is user-customizable * All the little details. ALL OF THEM.
| * LiteLoader supportJan Dalheimer2013-12-28-0/+2
| |
| * Various updater fixesPetr Mrázek2013-12-28-1/+5
| | | | | | | | | | | | | | Updater tests for path utils The updater now doesn't use splitpath on Windows (fixes problems with Windows XP) Fix up paths for the OSX updater - should now install the updates into the right place Fix translations install path - translation isntall and deploy should be fixed
| * 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
|\| | | | | | | | | Conflicts: CMakeLists.txt
| * 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
| | | | | | | | | | Account json was getting rewritten by a folder Missing icon on Windows (hopefully fixed, `doing it live`)
| * 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
| |\ | | | | | | | | | | | | Conflicts: MultiMC.cpp
| | * Unit testingJan Dalheimer2013-12-02-4/+20
| | |
* | | Added a system to load news from MultiMC.org's RSSAndrew2013-12-15-1/+12
|/ / | | | | | | Currently it doesn't show it anywhere in the UI. That's next.
* | 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
|\ \ | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt gui/MainWindow.cpp
| * \ Merge branch 'feature_updater' into developAndrew2013-12-09-41/+48
| |\ \
| | * | Implement DownloadUpdateTaskAndrew2013-12-05-0/+2
| | | | | | | | | | | | | | | | Installing updates is not implemented yet. That's next.
| | * | Rework the update checking systemAndrew2013-12-04-9/+37
| | | |
| | * | Renew the updater branchPetr Mrázek2013-12-02-37/+14
| | |/ | | | | | | | | | Now with some actual consensus on what the updater will do!
* | | 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
|\ \ \ | |/ / |/| |