summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeLines
* Merge branch 'develop' of github.com:Drayshak/MultiMC5 into developSky2013-10-06-2/+4
|\
| * Fix Linux CMake issues arising from Windows workaroundSky2013-10-06-2/+4
| |
* | Merge branch 'develop' of https://github.com/MultiMC/MultiMC5 into developSky2013-10-06-0/+8
|\ \ | |/ |/|
| * Added file loggerPetr Mrázek2013-10-06-0/+8
| |
* | Add naive Windows Java detection - JavaUtils for finding it on other systems ↵Sky2013-10-05-0/+3
|/ | | | (incomplete)
* Added a make target that prints the version name.Andrew2013-10-01-1/+4
|
* Made run script instal as executable.Andrew2013-10-01-1/+1
| | | | Also fixed a small bug with the run script.
* Add run script to install.Andrew2013-10-01-1/+2
| | | | | Also renamed "translations_target" to "translations". The old name was dumb and annoying.
* Merge branch 'master' into developAndrew2013-10-01-25/+34
|\ | | | | | | This pulls in some changes I made to the CMakeLists file earlier.
| * Fixed CMakeLists install target on Linux.Andrew2013-09-19-25/+34
| |
* | Implemented xz and pack200 unpackers required for proper forge installation.Petr Mrázek2013-09-30-2/+12
|\ \ | | | | | | | | | | | | | | | | | | Merge branch 'feature_forge_unpackers' into develop Conflicts: CMakeLists.txt
| * | Add tweaks to make things build on windowsPetr Mrázek2013-09-30-2/+2
| | |
| * | ``Working'' forge unpackers. Needs a lot of hardening but good for alpha.Petr Mrázek2013-09-30-1/+5
| | |
| * | Replace lzma with xz. Tweaks to fix debug builds.Petr Mrázek2013-09-28-10/+8
| | |
* | | Fix stuff up some morePetr Mrázek2013-09-28-10/+1
| | |
* | | Merge branch 'develop' of https://github.com/hyperfang8/MultiMC5 into developPetr Mrázek2013-09-28-1/+1
|\ \ \ | |/ / |/| |
| * | Disable pack200 and Enable MultiMCLauncher dephyperfang82013-09-28-2/+2
| | | | | | | | | | | | | | | I disable pack200 in cmake because it fails to compile. I also renable MultiMCLauncher dep because resource file requires it.
* | | no unstable stuff. disable it.Petr Mrázek2013-09-28-3/+3
|/ /
* | Attempt fix for cmake warning spam on WindowsSky2013-09-26-0/+4
| |
* | Compression algo dependencies, still need hackery...Petr Mrázek2013-09-26-2/+9
| |
* | Implement basic yggdrasil auth.Petr Mrázek2013-09-23-2/+3
| | | | | | | | No fancy login token saving involved.
* | Working 1.6 modding (currently only forge)Petr Mrázek2013-09-22-83/+61
| |
* | Implement legacy forge button!Petr Mrázek2013-09-18-3/+6
| | | | | | | | | | Many refactors of the task system. Progress dialog now accepts generic ProgressProvider objects
* | Forge version list implementation. Needs integration and testing.Petr Mrázek2013-09-16-5/+13
| |
* | Split OneSixVersion into parts.Petr Mrázek2013-09-11-2/+9
| |
* | Changed CMakeList.txt to support translationsStiepen222013-09-08-0/+19
| |
* | Use HttpMetaCache to minimize network use.Petr Mrázek2013-09-08-0/+7
|/
* Move a good chunk of the singleton objects into a new QApplication subclass.Petr Mrázek2013-09-07-10/+11
|
* Untested ETag cache class.Petr Mrázek2013-09-06-0/+2
| | | | Yep.
* Eh, Derp.Petr Mrázek2013-09-05-1/+0
|
* Speed up the downloads. Massively.Petr Mrázek2013-09-02-1/+1
|
* Basic 1.6 mod management (no jar mods)Petr Mrázek2013-08-28-3/+5
|
* Nuke the old instance model, LONG LIVE THE NEW ONEPetr Mrázek2013-08-26-2/+0
|
* Do not assume clang on OSX.Petr Mrázek2013-08-26-2/+1
|
* OS compatibility and generic cleanup.Petr Mrázek2013-08-26-10/+5
| | | | | Removed bspatch/patchlib Now builds and runs on Windows
* Many improvementsPetr Mrázek2013-08-25-22/+27
| | | | | | | | | | | PermGen can be tweaked from the settings menu Groups are saved on change/exit Install target is no longer completely broken All the deplibs are now static Added notes dialog Fixed ini file format support (can save strings with newlines, tabs. UTF-8 is explicitly used!) Rename button now uses line breaks so it doesn't grow ever wider (Added a custom tool button subclass) There is now a CAT button. Meow.
* Sync, removal of webkit as a dependency, removal of the web windows.Petr Mrázek2013-08-20-4/+1
|
* Drag and Drop, mod management.Petr Mrázek2013-08-18-0/+2
|
* Move all the things (YES. Move them.)Petr Mrázek2013-08-17-32/+96
| | | | Also, implemented some basic modlist logic, to be wired up.
* Implement icon picker, bring back raster icons.Petr Mrázek2013-08-11-11/+3
|
* Massive renaming in the backend folder, all around restructure in the same.Petr Mrázek2013-07-29-9/+10
|
* Merge remote-tracking branch 'upstream/master'TakSuyu2013-07-27-0/+3
|\ | | | | | | | | Conflicts: gui/mainwindow.cpp
| * Broke instance loading(?), also attempted to make Toolbar grayed out when no ↵Stiepen2013-07-14-0/+3
| | | | | | | | instance is selected. For debug purposes it is initially not grayed out
* | Renamed some files to support naming schemeTakSuyu2013-07-27-3/+6
|/ | | | | | changed modeditwindow -> legacymodeditdialog added modeditdialog mapped slots for modeditdialog
* Add queued downloader, some super-minor UI tweaks in stuff that's not even ↵Petr Mrázek2013-06-30-5/+16
| | | | visible yet.
* Implemented LWJGL version lists.Andrew2013-05-17-0/+3
| | | | | | | | | | | | | | The LWJGL list actually doesn't use tasks for loading. Instead, it takes advantage of the QNetworkAccessManager's asynchronous requests. This is a system that I may look to implement for other version lists and things such as the Minecraft version list and possibly even instance mod lists. Loading things this way means that code that wants to load a list can simply call the load list function, rather than having to get a task from the list and execute the task. Unfortunately, it also means we can't have task progress dialogs for loading lists, but it shouldn't really be too difficult to write one that works with this system. At some point in the future, I'll probably end up putting all the code for this method of loading lists into a base class and then update the other lists to support it.
* Removed old plugin system and implemented some version list stuff.Andrew2013-05-03-4/+0
|
* Fix quazip issues.Andrew2013-04-01-2/+6
|
* Merge branch 'master' of git://github.com/peterix/MultiMC5Andrew2013-03-28-1/+9
|\ | | | | | | | | | | Conflicts: CMakeLists.txt gui/mainwindow.cpp
| * fix merge issues, make console window work againOrochimarufan2013-03-22-1/+1
| |