Commit Graph

13 Commits

Author SHA1 Message Date
Petr Mrázek
40570c3210 Fix settings objects, instances can be started from the GUI now 2013-03-24 15:36:00 +01:00
Orochimarufan
e4f86893a8 fix merge issues, make console window work again 2013-03-22 14:40:55 +01:00
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
7d7e4034f4 Property change propagation, changing instance groups, icon preview 2013-03-19 06:24:34 +01:00
Petr Mrázek
7e222c3e8f Loading instance groups and exposing them to the model 2013-03-18 23:35:54 +01:00
Petr Mrázek
65faabeed4 Connect instance list to model. 2013-03-18 23:00:46 +01:00
Andrew
8864c7ebdc Merge branch 'master' of git://github.com/peterix/MultiMC5 2013-03-13 13:25:24 -05:00
Andrew
f0cb300d04 Added properties to Instance class 2013-03-13 13:19:29 -05:00
Petr Mrázek
46f93311af Instance view, model, delegate. 2013-03-11 22:19:17 +01:00
Andrew
2d6e785e4e Implemented version lists. 2013-03-08 13:56:26 -06:00
Andrew
69040f923b Added a function to get an instance's type. 2013-03-06 12:32:15 -06:00
Andrew
36396f7c6a Massive re-organization. 2013-02-26 16:47:39 -06:00