aboutsummaryrefslogtreecommitdiff
path: root/CMakeLists.txt
AgeCommit message (Collapse)Author
2014-01-24Merge branch 'develop' into feature_derpstancesJan Dalheimer
2014-01-24Change naming from Derp -> OneSix until the new instance type supports legacyJan Dalheimer
2014-01-23Forge works now too, and so does forge+liteloaderJan Dalheimer
2014-01-22Hotfix 0.2.1 for twitch.Petr Mrázek
Add to the changelog and tweak the version number.
2014-01-22Derpstances. Everything renamed. Launching does not yet work.Jan Dalheimer
2014-01-20Update the changelog, version, scale the instance iconPetr Mrázek
2014-01-19Move a bunch of resources into the resources folder.Petr Mrázek
Also, cat is no longer mysterious. It's just FLUFFY!
2014-01-19Use icon theme so we can have more than one icon size per iconPetr Mrázek
2014-01-12Merge branch 'feature_localization' of https://github.com/02JanDal/MultiMC5 ↵Petr Mrázek
into develop Conflicts: gui/dialogs/SettingsDialog.cpp gui/dialogs/SettingsDialog.ui
2014-01-12Show Mojang service statuses in status barSky
2014-01-11No more generated resources.Petr Mrázek
2014-01-11Harden CacheDownload.Petr Mrázek
It's now super hard. SRSLY.
2014-01-08Merge branch 'master' into developForkk
2014-01-08Change the issue tracker URL to GitHub issuesForkk
Bump hotfix version number and add an entry in the changelog.
2014-01-08Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developForkk
2014-01-08Hopefully fix OSX icon filePetr Mrázek
2014-01-07Make CMake output version type infoForkk
2014-01-07Bump minor version number and update changelog.Forkk
2014-01-07Merge branch 'develop' of github.com:MultiMC/MultiMC5 into new-version-systemForkk
2014-01-08Deploy jars instead of extracting them at runtime, remove non-working nvidia fixPetr Mrázek
2014-01-07Rework version numbering system.Forkk
Again...
2014-01-06Add hack for NvidiaPetr Mrázek
2014-01-05Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek
2014-01-05Add an option to force using local updater binary (for updater development)Petr Mrázek
2014-01-04Prepend a 5 to version strings.Forkk
2014-01-05Mess with the updater again.Petr Mrázek
2014-01-04Fix a few things related to the translationsJan Dalheimer
2014-01-03Notifications system. Mainly to be used in case the updater breaks.Jan Dalheimer
2014-01-02Implement the news buttonForkk
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.
2014-01-02Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_newsForkk
Conflicts: CMakeLists.txt gui/MainWindow.h
2014-01-02Fixed buttons on osx by adding the accessible plugin.Noah Mayr
2014-01-01ThreadTask for all your ThreadNeedsPetr Mrázek
Use only when absolutely required.
2014-01-01Move assets migration to a task. Needs threading.Sky
2013-12-31Enable high DPI support on OSXPetr Mrázek
2013-12-31Refactor icon lists heavilyPetr Mrázek
* Icon list now uses a filesystem watcher for updates * Icon folder is user-customizable * All the little details. ALL OF THEM.
2013-12-28LiteLoader supportJan Dalheimer
2013-12-28Various updater fixesPetr Mrázek
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
2013-12-21Initial FTB support. Allows "tracking" of FTB instances.Jan Dalheimer
2013-12-20Some test madnessPetr Mrázek
2013-12-15Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_newsAndrew
Conflicts: CMakeLists.txt
2013-12-15Added a system to load news from MultiMC.org's RSSAndrew
Currently it doesn't show it anywhere in the UI. That's next.
2013-12-15Use asset sizes from the index to make the progress bar betterPetr Mrázek
2013-12-14Fix bugs introduced by unit test branchPetr Mrázek
Account json was getting rewritten by a folder Missing icon on Windows (hopefully fixed, `doing it live`)
2013-12-14Use ctestPetr Mrázek
2013-12-14Merge branch 'testing' of https://github.com/02JanDal/MultiMC5 into developPetr Mrázek
Conflicts: MultiMC.cpp
2013-12-13Merge branch 'develop' of github.com:Drayshak/MultiMC5 into developSky
2013-12-13First sweep moving URLs to a constants fileSky
2013-12-13Add support for 1.7.4 user_type (needs testing with legacy accounts)Petr Mrázek
2013-12-11Better (but unsorted) Java detectionSky
2013-12-10Move fixup_bundle CMake stuff into a separate fileAndrew