Andrew ebb2c54975 Merge branch 'master' of git://github.com/peterix/MultiMC5 ...

Conflicts:
	CMakeLists.txt
	gui/mainwindow.cpp

2013-03-28 11:37:12 -05:00

..

aboutdialog.cpp

Implement About Dialog

2013-02-21 19:35:52 +01:00

aboutdialog.h

Implement About Dialog

2013-02-21 19:35:52 +01:00

aboutdialog.ui

Implement About Dialog

2013-02-21 19:35:52 +01:00

browserdialog.cpp

implement desktop shortcut creation. windows code not tested.

2013-02-13 04:03:15 +01:00

browserdialog.h

add first iteration of the integrated browser

2013-02-13 00:35:35 +01:00

browserdialog.ui

add first iteration of the integrated browser

2013-02-13 00:35:35 +01:00

consolewindow.cpp

fix merge issues, make console window work again

2013-03-22 14:40:55 +01:00

consolewindow.h

fix merge issues, make console window work again

2013-03-22 14:40:55 +01:00

consolewindow.ui

Implement ConsoleWindow

2013-02-22 18:18:23 +01:00

iconcache.cpp

Add SVG icon rendering/cache

2013-03-20 07:59:35 +01:00

iconcache.h

Add SVG icon rendering/cache

2013-03-20 07:59:35 +01:00

instancedelegate.cpp

Added background cat. Proof of concept :3

2013-03-19 03:20:49 +01:00

instancedelegate.h

Instance view, model, delegate.

2013-03-11 22:19:17 +01:00

instancemodel.cpp

Add SVG icon rendering/cache

2013-03-20 07:59:35 +01:00

instancemodel.h

Property change propagation, changing instance groups, icon preview

2013-03-19 06:24:34 +01:00

logindialog.cpp

Use Keyring in the login dialog

2013-03-26 17:43:49 +01:00

logindialog.h

Use Keyring in the login dialog

2013-03-26 17:43:49 +01:00

logindialog.ui

Use Keyring in the login dialog

2013-03-26 17:43:49 +01:00

mainwindow.cpp

Merge branch 'master' of git://github.com/peterix/MultiMC5

2013-03-28 11:37:12 -05:00

mainwindow.h

Merge branch 'master' of git://github.com/peterix/MultiMC5

2013-03-28 11:37:12 -05:00

mainwindow.ui

Instance view, model, delegate.

2013-03-11 22:19:17 +01:00

modeditwindow.cpp

Added mod edit window.

2013-01-15 19:04:10 -06:00

modeditwindow.h

Added mod edit window.

2013-01-15 19:04:10 -06:00

modeditwindow.ui

Added mod edit window.

2013-01-15 19:04:10 -06:00

newinstancedialog.cpp

Added new instance dialog.

2013-02-01 13:07:36 -06:00

newinstancedialog.h

Added new instance dialog.

2013-02-01 13:07:36 -06:00

newinstancedialog.ui

Added new instance dialog.

2013-02-01 13:07:36 -06:00

settingsdialog.cpp

Massive re-organization.

2013-02-26 16:47:39 -06:00

settingsdialog.h

Rewrote the settings system. It may still need some work.

2013-02-25 13:24:46 -06:00

settingsdialog.ui

Fix settings dialog java tab layout

2013-03-24 18:38:58 +01:00

taskdialog.cpp

Massive re-organization.

2013-02-26 16:47:39 -06:00

taskdialog.h

Started working on task system and login system.

2013-02-05 16:34:20 -06:00

taskdialog.ui

Started working on task system and login system.

2013-02-05 16:34:20 -06:00

versionselectdialog.cpp

Implemented version lists.

2013-03-28 11:33:31 -05:00

versionselectdialog.h

Implemented version lists.

2013-03-28 11:33:31 -05:00

versionselectdialog.ui

Implemented version lists.

2013-03-28 11:33:31 -05:00