diff --git a/Novetus/Novetus.Bootstrapper/app.config b/Novetus/Novetus.Bootstrapper/app.config index 1710b39..2a14ff1 100644 --- a/Novetus/Novetus.Bootstrapper/app.config +++ b/Novetus/Novetus.Bootstrapper/app.config @@ -1,5 +1,15 @@ + + + +
+ + + diff --git a/Novetus/NovetusCore/Classes/NovetusEssentials/Extension.cs b/Novetus/NovetusCore/Classes/NovetusEssentials/Extension.cs index 3ff0df1..12c99ae 100644 --- a/Novetus/NovetusCore/Classes/NovetusEssentials/Extension.cs +++ b/Novetus/NovetusCore/Classes/NovetusEssentials/Extension.cs @@ -67,7 +67,7 @@ namespace Novetus.Core try { - IExtension newExt = (IExtension)Extension.LoadScriptFromContent(file); + IExtension newExt = (IExtension)ExtensionScript.LoadScriptFromContent(file); ExtensionList.Add(newExt); index = ExtensionList.IndexOf(newExt); Util.ConsolePrint("Loaded extension " + newExt.FullInfoString() + " from " + Path.GetFileName(file), 3); @@ -152,8 +152,8 @@ namespace Novetus.Core } #endregion - #region Script - public class Extension + #region ExtensionScript + public class ExtensionScript { public static object LoadScriptFromContent(string scriptPath) { diff --git a/Novetus/NovetusCore/Classes/NovetusEssentials/WebProxy.cs b/Novetus/NovetusCore/Classes/NovetusEssentials/WebProxy.cs index 7ce80c1..1c039c3 100644 --- a/Novetus/NovetusCore/Classes/NovetusEssentials/WebProxy.cs +++ b/Novetus/NovetusCore/Classes/NovetusEssentials/WebProxy.cs @@ -36,7 +36,7 @@ namespace Novetus.Core public ExtensionManager Manager = new ExtensionManager(); private static readonly SemaphoreLocker _locker = new SemaphoreLocker(); public bool Started { get { return Server.ProxyRunning; } } - private int WebProxyPort = 61710; + private int WebProxyPort = 6171; public void DoSetup() { diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs index 7ee62f2..f06b81b 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs @@ -105,6 +105,11 @@ namespace NovetusLauncher GlobalVars.UserConfiguration.ReadSetting("Map") + "]"; } + if (GlobalVars.UserConfiguration.ReadSettingBool("WebProxyEnabled")) + { + GlobalVars.Proxy.Start(); + } + Splash splash = SplashReader.GetSplash(); SplashLabel.Text = splash.SplashText; diff --git a/Novetus/NovetusLauncher/app.config b/Novetus/NovetusLauncher/app.config index 5e4c947..69404a7 100644 --- a/Novetus/NovetusLauncher/app.config +++ b/Novetus/NovetusLauncher/app.config @@ -1,5 +1,15 @@  + + + +
+ + + diff --git a/Novetus/NovetusURI/App.config b/Novetus/NovetusURI/App.config index 4baad5f..ec81595 100644 --- a/Novetus/NovetusURI/App.config +++ b/Novetus/NovetusURI/App.config @@ -1,5 +1,15 @@  + + + +
+ + +