merged from 0.6.7 codebase

1 files changed, 25 insertions, 19 deletions

diff --git a/api/logic/Env.h b/api/logic/Env.h
index 276d762d..8b9b827e 100644
--- a/api/logic/Env.h
+++ b/api/logic/Env.h
@@ -20,40 +20,46 @@ class Index;
 }
 
 #if defined(ENV)
-	#undef ENV
+    #undef ENV
 #endif
 #define ENV (Env::getInstance())
 
 
 class MULTIMC_LOGIC_EXPORT Env
 {
-	friend class MultiMC;
+    friend class MultiMC;
 private:
-	struct Private;
-	Env();
-	~Env();
-	static void dispose();
+    struct Private;
+    Env();
+    ~Env();
+    static void dispose();
 public:
-	static Env& getInstance();
+    static Env& getInstance();
 
-	QNetworkAccessManager &qnam() const;
+    QNetworkAccessManager &qnam() const;
 
-	shared_qobject_ptr<HttpMetaCache> metacache();
+    shared_qobject_ptr<HttpMetaCache> metacache();
 
-	std::shared_ptr<IIconList> icons();
+    std::shared_ptr<IIconList> icons();
 
-	/// init the cache. FIXME: possible future hook point
-	void initHttpMetaCache();
+    /// init the cache. FIXME: possible future hook point
+    void initHttpMetaCache();
 
-	/// Updates the application proxy settings from the settings object.
-	void updateProxySettings(QString proxyTypeStr, QString addr, int port, QString user, QString password);
+    /// Updates the application proxy settings from the settings object.
+    void updateProxySettings(QString proxyTypeStr, QString addr, int port, QString user, QString password);
 
-	void registerIconList(std::shared_ptr<IIconList> iconlist);
+    void registerIconList(std::shared_ptr<IIconList> iconlist);
 
-	shared_qobject_ptr<Meta::Index> metadataIndex();
+    shared_qobject_ptr<Meta::Index> metadataIndex();
+
+    QString getJarsPath();
+    void setJarsPath(const QString & path);
+
+    bool isFeatureEnabled(const QString & featureName) const;
+    void enableFeature(const QString & featureName, bool state = true);
+    void getEnabledFeatures(QSet<QString> & features) const;
+    void setEnabledFeatures(const QSet<QString> & features) const;
 
-	QString getJarsPath();
-	void setJarsPath(const QString & path);
 protected:
-	Private * d;
+    Private * d;
 };