Commit Graph

12 Commits

Author SHA1 Message Date
Orochimarufan
cd1fdbbbc2 Merge branch 'master' of http://github.com/peterix/MultiMC5
Conflicts:
	CMakeLists.txt
	main.cpp
2013-03-22 14:01:54 +01:00
Orochimarufan
f4c9cb8c1d refactor indendation, fix a bug in MinecraftProcess & fix a bug in
InstanceLauncher
2013-03-22 13:56:57 +01:00
Petr Mrázek
65faabeed4 Connect instance list to model. 2013-03-18 23:00:46 +01:00
Andrew
36396f7c6a Massive re-organization. 2013-02-26 16:47:39 -06:00
Andrew
4ca35a760d Fixed a lot of MSVC problems 2013-02-25 14:44:36 -06:00
Andrew
b56b819c35 Fixed some formatting. 2013-02-25 13:39:07 -06:00
Orochimarufan
9f174ad4e7 Implement Instance launching
Use --launch <instance> to test
2013-02-22 16:17:31 +01:00
Orochimarufan
ca1fd44637 Merge branch 'master' of http://github.com/peterix/MultiMC5
Conflicts:
	CMakeLists.txt
	gui/mainwindow.cpp
	main.cpp
2013-02-21 20:40:32 +01:00
Petr Mrázek
50d1f62bf4 More GCC fixes 2013-02-21 19:59:34 +01:00
Andrew
2020d9c24b Fixed MSVC issues. 2013-02-21 12:42:16 -06:00
Andrew Okin
e9ef332ec4 Fixed some issues with GCC. 2013-02-21 12:10:10 -06:00
Andrew
dd2e836b4c Split MultiMC up into a few separate libraries.
Fixed plugin system.

Tons of other stuff...
2013-02-20 19:10:09 -06:00