Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'feature_groupview' into integration_derpstances_groupview | Petr Mrázek | 2014-02-08 | -25/+1526 |
|\ | ||||
| * | Group View: Use painting code from the previous group headers, small ↵ | Petr Mrázek | 2014-02-08 | -19/+117 |
| | | | | | | | | optimizations | |||
| * | Paint the headers nicer. | Petr Mrázek | 2014-02-05 | -28/+50 |
| | | ||||
| * | Fix crash bug related to data changes in new group view. | Petr Mrázek | 2014-02-04 | -0/+4 |
| | | ||||
| * | A try at fixing the instance delegate. A bit. Maybe. | Petr Mrázek | 2014-02-04 | -0/+5 |
| | | ||||
| * | Pave. | Petr Mrázek | 2014-02-04 | -25/+1397 |
| | | ||||
* | | 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 | -35/+35 |
| | | ||||
| * | 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 |
| | | ||||
| * | Derpstances. Everything renamed. Launching does not yet work. | Jan Dalheimer | 2014-01-22 | -126/+37 |
| | | ||||
* | | Add 'empty text' to all the version selection dialogs. | Petr Mrázek | 2014-01-29 | -29/+248 |
| | | | | | | | | Customize it for the Forge one so people finally shut up about 1.7.4 | |||
* | | Offline mode can be used even when online. | Petr Mrázek | 2014-01-27 | -106/+175 |
|/ | | | | | | Allow the user to pick a player name for offline mode. Big auth refactor. Now using session objects instead of the accounts themselves. Sessions only last for one instance start and hold all the auth and player data. | |||
* | Update the changelog, version, scale the instance icon | Petr Mrázek | 2014-01-20 | -3/+3 |
| | ||||
* | Move a bunch of resources into the resources folder. | Petr Mrázek | 2014-01-19 | -1/+1 |
| | | | | Also, cat is no longer mysterious. It's just FLUFFY! | |||
* | Use icon theme so we can have more than one icon size per icon | Petr Mrázek | 2014-01-19 | -46/+26 |
| | ||||
* | Try to improve status arrows a bit | Sky | 2014-01-19 | -4/+7 |
| | ||||
* | Fix settings dialog when offline | Petr Mrázek | 2014-01-18 | -0/+4 |
| | ||||
* | Improve Console window output. | Orochimarufan | 2014-01-17 | -0/+3 |
| | | | | | | | | | -> Log Pre- and Post-Launch command happenings -> Enable the java part to specify the level TODO: fix logging with mc 1.7's log4j logging infrastructure Signed-off-by: Orochimarufan <orochimarufan.x3@gmail.com> | |||
* | Merge branch 'feature_localization' of https://github.com/02JanDal/MultiMC5 ↵ | Petr Mrázek | 2014-01-12 | -235/+273 |
|\ | | | | | | | | | | | | | | | into develop Conflicts: gui/dialogs/SettingsDialog.cpp gui/dialogs/SettingsDialog.ui | |||
| * | Hopefully fix Qt 5.1 compilation | Jan Dalheimer | 2014-01-04 | -1/+1 |
| | | ||||
| * | Clean up/update translation code and made language selectable in the ↵ | Jan Dalheimer | 2014-01-04 | -2/+31 |
| | | | | | | | | settings dialog | |||
| * | Fix a few things related to the translations | Jan Dalheimer | 2014-01-04 | -2/+2 |
| | | ||||
* | | Merge branch 'feature_mojang_status' into develop | Petr Mrázek | 2014-01-12 | -0/+90 |
|\ \ | ||||
| * | | More space between status items | Sky | 2014-01-12 | -4/+4 |
| | | | ||||
| * | | Show Mojang service statuses in status bar | Sky | 2014-01-12 | -0/+90 |
| | | | ||||
* | | | Merge branch 'feature_better_launch' into develop | Petr Mrázek | 2014-01-12 | -13/+46 |
|\ \ \ | |/ / |/| | | ||||
| * | | Replace old launcher part with a shiny new one. No more garbage on the ↵ | Petr Mrázek | 2014-01-12 | -13/+46 |
| | | | | | | | | | | | | command line. | |||
* | | | Show active account skin whilst it's checked for updates | Sky | 2014-01-11 | -3/+6 |
| | | | ||||
* | | | Add tooltips to Java memory spinboxes | Sky | 2014-01-10 | -1/+19 |
| | | | ||||
* | | | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop | Sky | 2014-01-09 | -2/+11 |
|\ \ \ | ||||
| * | | | Make the GitHub link in the about dialog clickable | Forkk | 2014-01-08 | -0/+2 |
| | | | | | | | | | | | | | | | | Fixes #38 | |||
| * | | | Change the issue tracker URL to GitHub issues | Forkk | 2014-01-08 | -1/+1 |
| | | | | | | | | | | | | | | | | Bump hotfix version number and add an entry in the changelog. | |||
| * | | | Fix the window title | Forkk | 2014-01-08 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | The window title now says "MultiMC 5 - Version <version> [on <platform>]" | |||
| * | | | Word wrap the update channel description label | Forkk | 2014-01-08 | -1/+4 |
| |/ / | | | | | | | | | | | | | Previously, channel descriptions that were too long would mess up the dialog. | |||
* / / | Add "MB" as a suffix to memory spinboxes | Sky | 2014-01-09 | -1/+19 |
|/ / | ||||
* | | Add information to the about dialog. | Forkk | 2014-01-07 | -24/+102 |
| | | ||||
* | | Merge pull request #35 from 02JanDal/fix_keep_selection | Sky | 2014-01-07 | -18/+21 |
|\ \ | | | | | | | Fix instances getting deselected after FTB instances are loaded (or when ever the model is reset, like on a reload) | |||
| * | | Fix instances getting deselected after FTB instances are loaded (or whenever ↵ | Jan Dalheimer | 2014-01-06 | -18/+21 |
| | | | | | | | | | | | | the model is reset) | |||
* | | | Fix proxy settings radio buttons not triggering updates of the proxy settings. | Petr Mrázek | 2014-01-07 | -6/+18 |
| | | | ||||
* | | | Implement proxy settings | Forkk | 2014-01-06 | -3/+187 |
|/ / | ||||
* | | Implement console window tray icon, console window hiding, better scrolling | Petr Mrázek | 2014-01-06 | -27/+96 |
| | | ||||
* | | Scroll console window for <= lines above the bottom instead of the very bottom. | Petr Mrázek | 2014-01-06 | -2/+1 |
| | |