Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Fix issues with badly encoded escape sequences in config files. | Petr Mrázek | 2014-03-29 | -1/+2 |
| | ||||
* | Merge remote-tracking branch 'origin/feature_notif_65449324' into develop | Petr Mrázek | 2014-03-19 | -0/+228 |
|\ | ||||
| * | Allow reseting notifications | Jan Dalheimer | 2014-03-15 | -0/+15 |
| | | ||||
| * | Add a timer for clicking away the notification dialog | Jan Dalheimer | 2014-03-15 | -0/+213 |
| | | ||||
* | | Get rid of one reloadInstanceVersion | Jan Dalheimer | 2014-03-14 | -4/+0 |
| | | ||||
* | | Pull in BaseInstaller related changes from quickmod | Jan Dalheimer | 2014-03-14 | -52/+4 |
| | | ||||
* | | Move version stuff to the model and reimplement reordering | Jan Dalheimer | 2014-03-14 | -29/+40 |
|/ | ||||
* | Improve reporting of version file errors.x | Petr Mrázek | 2014-03-09 | -18/+46 |
| | ||||
* | Remove version patch reordering. Remove the main class display from onesix ↵ | Petr Mrázek | 2014-03-09 | -130/+34 |
| | | | | edit mods. | |||
* | More refactor. | Petr Mrázek | 2014-03-05 | -1/+1 |
| | ||||
* | No end in sight :< | Petr Mrázek | 2014-03-03 | -0/+4 |
| | ||||
* | Remove widgets from logic. | Petr Mrázek | 2014-03-02 | -9/+9 |
| | ||||
* | Reorganize the version-related code. | Petr Mrázek | 2014-03-01 | -3/+3 |
| | ||||
* | Merge branch 'feature_screenshots' into integration_json_and_tools | Petr Mrázek | 2014-02-25 | -0/+229 |
|\ | | | | | | | | | | | | | Conflicts: logic/net/URLConstants.h Resolve issues with multiple definitions of URL constants by moving them to their own object file. | |||
| * | Screenshots: Optimize image loading and memory use, fix list and button layout. | Petr Mrázek | 2014-02-25 | -14/+17 |
| | | ||||
| * | Reorganize all the screenshot files | Petr Mrázek | 2014-02-25 | -11/+11 |
| | | ||||
| * | Fix memory leak in system | robotbrain | 2014-02-24 | -5/+5 |
| | | ||||
| * | Deleting screenshots. Needs fixing. | robotbrain | 2014-02-24 | -4/+17 |
| | | ||||
| * | Imgur album creation | Jan Dalheimer | 2014-02-24 | -18/+26 |
| | | ||||
| * | Working screenshot upload | Jan Dalheimer | 2014-02-24 | -58/+73 |
| | | ||||
| * | Screenshot fixes, move some code around, fix some stuff | Jan Dalheimer | 2014-02-24 | -19/+50 |
| | | ||||
| * | Close to finished. Need to fix the upload part. Viewing works (in grayscale) | robotbrain | 2014-02-23 | -7/+16 |
| | | ||||
| * | Initial stuff. It doesnt work. | robotbrain | 2014-02-23 | -0/+150 |
| | | ||||
* | | Merge branch 'feature_profiling' into integration_json_and_tools | Petr Mrázek | 2014-02-24 | -37/+333 |
|\ \ | ||||
| * | | Fix MCEdit on OSX | Jan Dalheimer | 2014-02-21 | -0/+5 |
| | | | ||||
| * | | Fix some external tool related string sin the settings dialog. | Petr Mrázek | 2014-02-16 | -2/+2 |
| | | | ||||
| * | | Nicer way of selecting tool folders and executables | Petr Mrázek | 2014-02-16 | -79/+129 |
| | | | ||||
| * | | Links to the tools | Jan Dalheimer | 2014-02-16 | -0/+21 |
| | | | ||||
| * | | Restructure | Jan Dalheimer | 2014-02-16 | -1/+1 |
| | | | ||||
| * | | Fix path selections for tools (settings dialog) | Petr Mrázek | 2014-02-16 | -5/+18 |
| | | | ||||
| * | | Fix more stuff. Detached tools, only MCEdit for now. | Jan Dalheimer | 2014-02-16 | -2/+62 |
| | | | ||||
| * | | Fix stuff. Make sure different ways of aborting profiling work. | Jan Dalheimer | 2014-02-16 | -3/+5 |
| | | | ||||
| * | | Fix a few bugs in profilers. | Petr Mrázek | 2014-02-16 | -14/+16 |
| | | | | | | | | | | | | | | | | | | * Legacy was launching before the profiler. * Some clarity changes. * Report problem with empty strings as profiler paths. | |||
| * | | Underp. Don't depend on OneSix. Nicer "menu" style choosing. | Jan Dalheimer | 2014-02-15 | -60/+3 |
| | | | ||||
| * | | Profiler support. Currently JProfiler and JVisualVM are implemented. | Jan Dalheimer | 2014-02-15 | -1/+201 |
| |/ | ||||
* / | New, better, liteloader support | Jan Dalheimer | 2014-02-19 | -18/+23 |
|/ | ||||
* | fixed the destination (href) of the link http://github.com/MultiMC/MultiMC5 ↵ | p-schneider | 2014-02-14 | -1/+1 |
| | | | | in AboutDialog.ui (+German translation) | |||
* | Merge branch 'feature_groupview' into integration_derpstances_groupview | Petr Mrázek | 2014-02-08 | -1/+1 |
|\ | ||||
| * | Pave. | Petr Mrázek | 2014-02-04 | -1/+1 |
| | | ||||
* | | Allow overriding the order in which patches are applied | Jan Dalheimer | 2014-02-08 | -0/+156 |
| | | ||||
* | | Reload version after removing custom.json | Jan Dalheimer | 2014-02-03 | -0/+2 |
| | | ||||
* | | Disable anything related to user.json for now. Will be re-enabled once we ↵ | Jan Dalheimer | 2014-02-01 | -36/+1 |
| | | | | | | | | have a gui for it. | |||
* | | Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 ↵ | Petr Mrázek | 2014-02-01 | -122/+87 |
|\ \ | |/ |/| | | | | | | | | | | | into feature_derpstances Conflicts: gui/dialogs/OneSixModEditDialog.cpp logic/OneSixUpdate.cpp | |||
| * | Fix a bug | Jan Dalheimer | 2014-02-01 | -3/+12 |
| | | ||||
| * | Change the OneSix library view. It now shows a list of patches. | Jan Dalheimer | 2014-02-01 | -37/+67 |
| | | ||||
| * | Have the libraries tab show tweaker mods instead of libraries | Jan Dalheimer | 2014-01-27 | -0/+10 |
| | | ||||
| * | Split parsing/applying. Better error logging. Fix crash. | Jan Dalheimer | 2014-01-27 | -2/+2 |
| | | ||||
| * | Change naming from Derp -> OneSix until the new instance type supports legacy | Jan Dalheimer | 2014-01-24 | -33/+33 |
| | | ||||
| * | Forge works now too, and so does forge+liteloader | Jan Dalheimer | 2014-01-23 | -5/+11 |
| | | ||||
| * | Work towards liteloader support. Fix creating new instance | Jan Dalheimer | 2014-01-22 | -4/+4 |
| | |