diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-09-18 00:08:42 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-09-18 00:08:42 +0200 |
| commit | 930b07afd4229e952d0cd47ca62cd94235499a0c (patch) | |
| tree | 34cd74c3652da4b3ad0fd008faa2ab67adb4901f /gui/OneSixModEditDialog.h | |
| parent | 5cd3420c46e0b54f1479ddf720a8c9131c460a5e (diff) | |
| parent | b979d0ce5da515793a02802a6421ef607a498323 (diff) | |
| download | MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.tar MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.tar.gz MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.tar.lz MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.tar.xz MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.zip | |
Merge branch 'feature_library_model' into develop
Diffstat (limited to 'gui/OneSixModEditDialog.h')
| -rw-r--r-- | gui/OneSixModEditDialog.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gui/OneSixModEditDialog.h b/gui/OneSixModEditDialog.h index 3430bd26..d14c842c 100644 --- a/gui/OneSixModEditDialog.h +++ b/gui/OneSixModEditDialog.h @@ -40,12 +40,14 @@ private slots: void on_viewResPackBtn_clicked(); // Questionable: SettingsDialog doesn't need this for some reason? void on_buttonBox_rejected(); + void on_forgeBtn_clicked(); protected: bool eventFilter(QObject *obj, QEvent *ev); bool loaderListFilter( QKeyEvent* ev ); bool resourcePackListFilter( QKeyEvent* ev ); private: Ui::OneSixModEditDialog *ui; + QSharedPointer<OneSixVersion> m_version; QSharedPointer<ModList> m_mods; QSharedPointer<ModList> m_resourcepacks; OneSixInstance * m_inst; |