summaryrefslogtreecommitdiffstats
path: root/MultiMC.cpp
Commit message (Collapse)AuthorAgeLines
* Move settings lib into the main code, fixing error logging in it.Petr Mrázek2014-07-01-4/+4
|
* Merge branch 'feature_theme_support' into developPetr Mrázek2014-06-30-0/+1
|\ | | | | | | | | Conflicts: main.cpp
| * New flat icon themes from pexnerPetr Mrázek2014-05-25-0/+1
| | | | | | | | Squash and rework of commits from robotbrain
* | Merge branch 'feature/fix_intel' into developPetr Mrázek2014-06-28-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt changelog.yaml gui/MainWindow.cpp
| * | Fix issues with intel drivers. Forced java re-detection on Windows.Petr Mrázek2014-06-28-0/+1
| | |
* | | Tweaks to page dialog and version page.Petr Mrázek2014-06-09-0/+2
| | |
* | | Reduce startup logging verbosityPetr Mrázek2014-06-09-1/+1
| | |
* | | Reorganize logic code.Petr Mrázek2014-06-09-4/+4
| | |
* | | Much change, very jarmod.Petr Mrázek2014-06-09-0/+12
| | |
* | | Begin the transformation!Petr Mrázek2014-06-09-2/+3
|/ / | | | | | | Nuke all the things.
* | Still trying to fix FTBJan Dalheimer2014-05-23-0/+4
| |
* | Attempt at fixing FTBJan Dalheimer2014-05-23-36/+17
| |
* | Fix FTB?Jan Dalheimer2014-05-23-5/+6
| |
* | More FTB debug stuffJan Dalheimer2014-05-23-1/+1
| |
* | Some more FTB related debug infoJan Dalheimer2014-05-23-8/+26
| |
* | QDir::exists is not static in Qt 5.1.1Petr Mrázek2014-05-22-1/+1
| |
* | FTB paths changed on windows. Fixes #255Jan Dalheimer2014-05-22-5/+28
| |
* | Merge branch 'feature_crashreport' into developJan Dalheimer2014-05-21-0/+3
|\ \ | |/ |/|
| * Implement crash handling on LinuxForkk2014-05-09-0/+3
| | | | | | | | | | This will allow us to generate crash dumps and have users report crashes.
* | Add static data path for ... static data. Like translations. Move ↵Petr Mrázek2014-05-17-1/+14
|/ | | | translations there.
* Merge remote-tracking branch 'origin/feature_raise_console' into developPetr Mrázek2014-04-21-0/+1
|\
| * Make the console window raise itself after minecraft closes (#193)Taeyeon Mori2014-04-17-0/+1
| | | | | | | | | | This needs further testing: http://stackoverflow.com/questions/6087887/bring-window-to-front-raise-show-activatewindow-dont-work
* | Download and cache FML libs for legacy minecraft versions.Petr Mrázek2014-04-19-0/+1
|/ | | | | | * minor fix for version filtering (1.5 no longer shows forge for 1.5.1 and 1.5.2) * FML libs are downloaded to mods/minecraftforge/libs and cached * FML libs are copied to instances which contain FML or forge
* Workaround for dirty build folders.Petr Mrázek2014-04-06-1/+1
| | | | My disgust just turned into barely contained rage :<
* Get rid of long rebuilds because of minor cmake config changesPetr Mrázek2014-04-06-9/+9
|
* Merge remote-tracking branch 'origin/fix_ftb_again' into integration_butcheryPetr Mrázek2014-03-09-2/+15
|\
| * Use a constant for the buffer size.robotbrain2014-03-05-3/+4
| |
| * Fix it - it did it even if the op failed.robotbrain2014-03-05-3/+6
| |
| * Use windows api to prevent encoding problems.robotbrain2014-03-05-1/+10
| |
| * Fix ftb locations on old windows... again.robotbrain2014-03-03-1/+1
| |
* | Gather and store liteloader metadata.Petr Mrázek2014-03-02-0/+1
| |
* | Merge branch 'feature_profiling' into integration_json_and_toolsPetr Mrázek2014-02-24-2/+22
|\ \
| * | RestructureJan Dalheimer2014-02-16-3/+3
| | |
| * | Fix more stuff. Detached tools, only MCEdit for now.Jan Dalheimer2014-02-16-0/+7
| | |
| * | Underp. Don't depend on OneSix. Nicer "menu" style choosing.Jan Dalheimer2014-02-15-8/+0
| | |
| * | Profiler support. Currently JProfiler and JVisualVM are implemented.Jan Dalheimer2014-02-15-2/+23
| |/
* / New, better, liteloader supportJan Dalheimer2014-02-19-0/+10
|/
* Fix FTB paths on Windows XProbotbrain2014-02-13-2/+2
|
* Improve Console window output.Orochimarufan2014-01-17-0/+1
| | | | | | | | | -> 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ázek2014-01-12-13/+17
|\ | | | | | | | | | | | | | | into develop Conflicts: gui/dialogs/SettingsDialog.cpp gui/dialogs/SettingsDialog.ui
| * Clean up/update translation code and made language selectable in the ↵Jan Dalheimer2014-01-04-13/+17
| | | | | | | | settings dialog
* | Show Mojang service statuses in status barSky2014-01-12-0/+6
| |
* | Rework version numbering system.Forkk2014-01-07-2/+2
| | | | | | | | Again...
* | Implement proxy settingsForkk2014-01-06-47/+78
| |
* | Merge branch 'updater-tweak' into developPetr Mrázek2014-01-05-11/+12
|\ \
| * | More updater fixagePetr Mrázek2014-01-05-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | Preserve --dir parameter after updating Allow more than one copy of a command line parameter in MultiMC Linux runner script no longer changes current directory, which allows '--dir .' Fixed unit tests, removed the obsolete one (for some legacy updater command line params that were also removed) [fixes 63127704]
* | | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek2014-01-05-1/+3
|\ \ \ | |/ / |/| |
| * | Implement changing update channelsForkk2014-01-04-1/+3
| | | | | | | | | | | | | | | Allow the user to select which update channel they would like to download updates from.
* | | Some more updater fixesPetr Mrázek2014-01-05-13/+24
| | | | | | | | | | | | Paths were wrong - still used work directory instead of root
* | | Mess with the updater again.Petr Mrázek2014-01-05-39/+25
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 04:46:25 +0000