Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'fix_tests' of https://github.com/02JanDal/MultiMC5 into develop | Petr Mrázek | 2014-01-18 | -24/+52 |
|\ | ||||
| * | Get rid of some obsolete functions | Jan Dalheimer | 2014-01-05 | -3/+0 |
| | | ||||
| * | Unbreak and reactivate the some UpdateChecker tests | Jan Dalheimer | 2014-01-05 | -21/+52 |
| | | ||||
* | | DERP DERP DERP | Petr Mrázek | 2014-01-18 | -1/+2 |
| | | | | | | | | DERP ALERT. DUCK AND COVER! | |||
* | | Fix derp: there is no static QFileInfo::exists in Qt 5.1.1 | Petr Mrázek | 2014-01-18 | -2/+4 |
| | | ||||
* | | Marginally improve OneSix offline mode launch | Petr Mrázek | 2014-01-18 | -49/+97 |
| | | | | | | | | | | While reconstructing assets, skip files that don't exist. Report missing OneSix native libraries. | |||
* | | Fix settings dialog when offline | Petr Mrázek | 2014-01-18 | -0/+4 |
| | | ||||
* | | Change the native extraction/loading logic. | Petr Mrázek | 2014-01-18 | -47/+71 |
| | | ||||
* | | Improve Console window output. | Orochimarufan | 2014-01-17 | -81/+247 |
| | | | | | | | | | | | | | | | | | | -> 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> | |||
* | | Sort forge versions right. Do not spam the multimc log with mc server status ↵ | Petr Mrázek | 2014-01-16 | -13/+31 |
| | | | | | | | | stuff. | |||
* | | Fix FTB. | Petr Mrázek | 2014-01-15 | -34/+54 |
| | | | | | | | | | | Add support of private packs. Fix instance ID problems related to FTB instances. | |||
* | | Do not use the java checker during instance update | Petr Mrázek | 2014-01-14 | -93/+111 |
| | | ||||
* | | Small fix for stale files getting stuck in the cache | Petr Mrázek | 2014-01-13 | -5/+11 |
| | | ||||
* | | Merge branch 'feature_better_launch' into develop | Petr Mrázek | 2014-01-12 | -3/+11 |
|\ \ | ||||
| * | | Fix window title problem on OSX. | Petr Mrázek | 2014-01-12 | -3/+11 |
| | | | ||||
* | | | Merge branch 'feature_localization' of https://github.com/02JanDal/MultiMC5 ↵ | Petr Mrázek | 2014-01-12 | -608/+1777 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -15/+48 |
| | | | | | | | | | | | | | | | | settings dialog | |||
| * | | | Add xnrand to the translation credits | Jan Dalheimer | 2014-01-04 | -1/+1 |
| | | | | ||||
| * | | | Update mmc_de.ts | xnrand | 2014-01-04 | -88/+88 |
| | | | | | | | | | | | | | | | | Fixed grammar, improved wording. It's not perfect but definitely better. | |||
| * | | | Du/Sie consistency | Jan Dalheimer | 2014-01-04 | -5/+5 |
| | | | | ||||
| * | | | Update the german translation | Jan Dalheimer | 2014-01-04 | -337/+1465 |
| | | | | ||||
| * | | | Fix a few things related to the translations | Jan Dalheimer | 2014-01-04 | -12/+11 |
| | | | | ||||
* | | | | Merge branch 'feature_mojang_status' into develop | Petr Mrázek | 2014-01-12 | -0/+303 |
|\ \ \ \ | ||||
| * | | | | More space between status items | Sky | 2014-01-12 | -4/+4 |
| | | | | | ||||
| * | | | | More comments removal | Sky | 2014-01-12 | -1/+0 |
| | | | | | ||||
| * | | | | Remove wrong comments | Sky | 2014-01-12 | -10/+0 |
| | | | | | ||||
| * | | | | Show Mojang service statuses in status bar | Sky | 2014-01-12 | -0/+314 |
| | | | | | ||||
* | | | | | Merge branch 'feature_better_launch' into develop | Petr Mrázek | 2014-01-12 | -509/+1157 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | ||||
| * | | | Replace old launcher part with a shiny new one. No more garbage on the ↵ | Petr Mrázek | 2014-01-12 | -509/+1157 |
| | | | | | | | | | | | | | | | | command line. | |||
* | | | | Merge https://github.com/Drayshak/MultiMC5 into develop | Petr Mrázek | 2014-01-11 | -3/+6 |
|\ \ \ \ | ||||
| * \ \ \ | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop | Sky | 2014-01-11 | -30/+24 |
| |\ \ \ \ | ||||
| * | | | | | Show active account skin whilst it's checked for updates | Sky | 2014-01-11 | -3/+6 |
| | | | | | | ||||
* | | | | | | No more generated resources. | Petr Mrázek | 2014-01-11 | -13/+1 |
| | | | | | | ||||
* | | | | | | Harden CacheDownload. | Petr Mrázek | 2014-01-11 | -25/+41 |
| |/ / / / |/| | | | | | | | | | | | | | | It's now super hard. SRSLY. | |||
* | | | | | Make CacheDownload use QSaveFile | Petr Mrázek | 2014-01-10 | -30/+24 |
|/ / / / | ||||
* | | | | Add tooltips to Java memory spinboxes | Sky | 2014-01-10 | -1/+19 |
| | | | | ||||
* | | | | Hide user properties in the console too | Sky | 2014-01-10 | -0/+8 |
| | | | | ||||
* | | | | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop | Sky | 2014-01-09 | -8/+49 |
|\ \ \ \ | ||||
| * | | | | Make the GitHub link in the about dialog clickable | Forkk | 2014-01-08 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | Fixes #38 | |||
| * | | | | Merge branch 'master' into develop | Forkk | 2014-01-08 | -2/+4 |
| |\ \ \ \ | ||||
| | * \ \ \ | Merge branch 'hotfix-0.1.1'0.1.1 | Forkk | 2014-01-08 | -2/+4 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a quick hotfix to correct the issue tracker URL. Forgot to do so in the last release. | |||
| | | * | | | | Change the issue tracker URL to GitHub issues | Forkk | 2014-01-08 | -2/+4 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | Bump hotfix version number and add an entry in the changelog. | |||
| * | | | | | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop | Forkk | 2014-01-08 | -9/+16 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | ||||
| | * | | | Add logging calls to the java checker. | Petr Mrázek | 2014-01-09 | -2/+11 |
| | | | | | ||||
| * | | | | Merge branch 'release-0.1'0.1 | Forkk | 2014-01-08 | -269/+713 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | Release MultiMC version 0.1. | |||
| | * | | | | 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. | |||
| | * | | | | Remove lies from the changelog | Forkk | 2014-01-08 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | There wasn't really an Optimus fix. LIES! ALL LIES! | |||
| | * | | | | Make CMake output version type info | Forkk | 2014-01-07 | -2/+8 |
| | | | | | |