Export all settings used by(soon to be) default plugins

.gitattributes

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

osu!StreamCompanion/Code/Misc/SettingNames.cs → StreamCompanionTypes/SettingNames.cs

@@ -1,19 +1,19 @@
 using System.Collections.Generic;
 using StreamCompanionTypes.DataTypes;
 
-namespace osu_StreamCompanion.Code.Misc
+namespace StreamCompanionTypes
 {
-
     public sealed class SettingNames
-    {//main
+    {
+        //main
         public readonly ConfigEntry MainOsuDirectory = new ConfigEntry("MainOsuDirectory", "");
         public readonly ConfigEntry SongsFolderLocation = new ConfigEntry("SongsFolderLocation", "Songs");
         public readonly ConfigEntry LogLevel = new ConfigEntry("LogLevel", StreamCompanionTypes.DataTypes.LogLevel.Disabled.GetHashCode());
         public readonly ConfigEntry StartHidden = new ConfigEntry("StartHidden", false);
         public readonly ConfigEntry Console = new ConfigEntry("console", false);
         public readonly ConfigEntry LoadingRawBeatmaps = new ConfigEntry("LoadingRawBeatmaps", false);
         public readonly ConfigEntry LastRunVersion = new ConfigEntry("LastRunVersion", "N/A");
-    
+
         //ClickCounter 
         public readonly ConfigEntry KeyList = new ConfigEntry("keyList", new List<string>());
         public readonly ConfigEntry KeyNames = new ConfigEntry("keyNames", new List<string>());
@@ -61,7 +61,7 @@ public sealed class SettingNames
         public readonly ConfigEntry tcpSocketIp = new ConfigEntry("tcpSocketIp", "127.0.0.1");
         public readonly ConfigEntry tcpSocketPort = new ConfigEntry("tcpSocketPort", 7839);
         public readonly ConfigEntry tcpSocketLiveMapDataPort = new ConfigEntry("tcpSocketLiveMapDataPort", 7840);
-        
+
 
         private static readonly SettingNames _instance = new SettingNames();
         public static SettingNames Instance
@@ -72,5 +72,4 @@ public static SettingNames Instance
         private SettingNames()
         { }
     }
-
-}
+}

StreamCompanionTypes/StreamCompanionTypes.csproj

@@ -86,6 +86,7 @@
     <Compile Include="Interfaces\ISqliteUser.cs" />
     <Compile Include="Interfaces\MapDataGetter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SettingNames.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Enums\" />

osu!StreamCompanion/Code/Core/Loggers/ConsoleLogger.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 using osu_StreamCompanion.Code.Misc;
+using StreamCompanionTypes;
 using StreamCompanionTypes.DataTypes;
 using StreamCompanionTypes.Interfaces;
 

osu!StreamCompanion/Code/Core/Loggers/FileLogger.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using osu_StreamCompanion.Code.Misc;
+using StreamCompanionTypes;
 using StreamCompanionTypes.DataTypes;
 using StreamCompanionTypes.Interfaces;
 

osu!StreamCompanion/Code/Core/Maps/Processing/MapDataGetter.cs

@@ -4,6 +4,7 @@
 using osu_StreamCompanion.Code.Core.Savers;
 using osu_StreamCompanion.Code.Misc;
 using osu_StreamCompanion.Code.Modules.MapDataParsers.Parser1;
+using StreamCompanionTypes;
 using StreamCompanionTypes.DataTypes;
 using StreamCompanionTypes.Interfaces;
 

osu!StreamCompanion/Code/Core/Maps/Processing/MapStringFormatter.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using osu_StreamCompanion.Code.Misc;
+using StreamCompanionTypes;
 using StreamCompanionTypes.DataTypes;
 using StreamCompanionTypes.Interfaces;
 

osu!StreamCompanion/Code/Helpers/BeatmapHelpers.cs

@@ -8,6 +8,7 @@
 using osu_StreamCompanion.Code.Core;
 using osu_StreamCompanion.Code.Core.Maps;
 using osu_StreamCompanion.Code.Misc;
+using StreamCompanionTypes;
 using StreamCompanionTypes.Interfaces;
 using Beatmap = StreamCompanionTypes.DataTypes.Beatmap;
 

osu!StreamCompanion/Code/Modules/ClickCounter/ClickCounter.cs

@@ -4,6 +4,7 @@
 using osu_StreamCompanion.Code.Core;
 using osu_StreamCompanion.Code.Misc;
 using osu_StreamCompanion.Code.Modules.MapDataGetters.FileMap;
+using StreamCompanionTypes;
 using StreamCompanionTypes.DataTypes;
 using StreamCompanionTypes.Interfaces;
 

osu!StreamCompanion/Code/Modules/ClickCounter/ClickCounterSettings.cs

@@ -6,6 +6,7 @@
 using System.Windows.Input;
 using osu_StreamCompanion.Code.Core;
 using osu_StreamCompanion.Code.Misc;
+using StreamCompanionTypes;
 using StreamCompanionTypes.Interfaces;
 
 namespace osu_StreamCompanion.Code.Modules.ClickCounter

osu!StreamCompanion/Code/Modules/FirstRun/FirstRunFrm.cs

@@ -3,6 +3,7 @@
 using System.Windows.Forms;
 using osu_StreamCompanion.Code.Misc;
 using osu_StreamCompanion.Code.Modules.FirstRun.Phases;
+using StreamCompanionTypes;
 using StreamCompanionTypes.Interfaces;
 
 namespace osu_StreamCompanion.Code.Modules.FirstRun

osu!StreamCompanion/Code/Modules/MapDataFinders/SqliteData/CacheInitalizer.cs

@@ -4,6 +4,7 @@
 using osu_StreamCompanion.Code.Core;
 using osu_StreamCompanion.Code.Misc;
 using osu_StreamCompanion.Code.Windows;
+using StreamCompanionTypes;
 using StreamCompanionTypes.DataTypes;
 using StreamCompanionTypes.Interfaces;
 

osu!StreamCompanion/Code/Modules/MapDataFinders/osuMemoryID/MemoryDataFinderSettings.cs

@@ -2,6 +2,7 @@
 using System.Windows.Forms;
 using osu_StreamCompanion.Code.Core;
 using osu_StreamCompanion.Code.Misc;
+using StreamCompanionTypes;
 
 namespace osu_StreamCompanion.Code.Modules.MapDataFinders.osuMemoryID
 {

osu!StreamCompanion/Code/Modules/MapDataGetters/TcpSocket/TcpSocketDataGetter.cs

@@ -5,6 +5,7 @@
 using osu_StreamCompanion.Code.Core;
 using osu_StreamCompanion.Code.Helpers;
 using osu_StreamCompanion.Code.Misc;
+using StreamCompanionTypes;
 using StreamCompanionTypes.DataTypes;
 using StreamCompanionTypes.Interfaces;
 

osu!StreamCompanion/Code/Modules/MapDataGetters/TcpSocket/TcpSocketSettings.cs

@@ -8,6 +8,7 @@
 using System.Windows.Forms;
 using osu_StreamCompanion.Code.Core;
 using osu_StreamCompanion.Code.Misc;
+using StreamCompanionTypes;
 using StreamCompanionTypes.Interfaces;
 
 namespace osu_StreamCompanion.Code.Modules.MapDataGetters.TcpSocket

osu!StreamCompanion/Code/Modules/MapDataParsers/Parser1/LegacyParserConfigConverter.cs

@@ -5,6 +5,7 @@
 using System.Windows.Forms;
 using osu_StreamCompanion.Code.Core;
 using osu_StreamCompanion.Code.Misc;
+using StreamCompanionTypes;
 using StreamCompanionTypes.DataTypes;
 using StreamCompanionTypes.Interfaces;
 

osu!StreamCompanion/Code/Modules/MapDataParsers/Parser1/MapDataParser.cs

@@ -8,6 +8,7 @@
 using Newtonsoft.Json.Linq;
 using osu_StreamCompanion.Code.Core;
 using osu_StreamCompanion.Code.Misc;
+using StreamCompanionTypes;
 using StreamCompanionTypes.DataTypes;
 using StreamCompanionTypes.Interfaces;
 

osu!StreamCompanion/Code/Modules/MapDataParsers/Parser1/ParserSettings.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using osu_StreamCompanion.Code.Misc;
+using StreamCompanionTypes;
 using StreamCompanionTypes.DataTypes;
 using StreamCompanionTypes.Interfaces;
 

osu!StreamCompanion/Code/Modules/MapDataReplacements/Map/MapReplacement.cs

@@ -3,6 +3,7 @@
 using osu_StreamCompanion.Code.Core;
 using osu_StreamCompanion.Code.Helpers;
 using osu_StreamCompanion.Code.Misc;
+using StreamCompanionTypes;
 using StreamCompanionTypes.DataTypes;
 using StreamCompanionTypes.Interfaces;
 using Beatmap = StreamCompanionTypes.DataTypes.Beatmap;

osu!StreamCompanion/Code/Modules/MapDataReplacements/PP/PpReplacements.cs

@@ -8,6 +8,7 @@
 using osu_StreamCompanion.Code.Helpers;
 using osu_StreamCompanion.Code.Misc;
 using OppaiSharp;
+using StreamCompanionTypes;
 using StreamCompanionTypes.DataTypes;
 using StreamCompanionTypes.Interfaces;
 using Beatmap = OppaiSharp.Beatmap;

osu!StreamCompanion/Code/Modules/ModImageGenerator/API/ImageGenerator.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using osu_StreamCompanion.Code.Core;
 using osu_StreamCompanion.Code.Misc;
+using StreamCompanionTypes;
 using StreamCompanionTypes.Interfaces;
 using Point = System.Drawing.Point;
 

osu!StreamCompanion/Code/Modules/ModImageGenerator/ModImageGenerator.cs

@@ -6,6 +6,7 @@
 using System.Windows.Forms;
 using osu_StreamCompanion.Code.Misc;
 using osu_StreamCompanion.Code.Modules.ModImageGenerator.API;
+using StreamCompanionTypes;
 using StreamCompanionTypes.DataTypes;
 using StreamCompanionTypes.Interfaces;
 

osu!StreamCompanion/Code/Modules/ModImageGenerator/ModImageGeneratorSettings.cs

@@ -2,6 +2,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 using osu_StreamCompanion.Code.Misc;
+using StreamCompanionTypes;
 using StreamCompanionTypes.Interfaces;
 
 namespace osu_StreamCompanion.Code.Modules.ModImageGenerator

osu!StreamCompanion/Code/Modules/ModsHandler/ModParser.cs

@@ -1,5 +1,6 @@
 using osu_StreamCompanion.Code.Misc;
 using osu_StreamCompanion.Code.Modules.ModParser;
+using StreamCompanionTypes;
 using StreamCompanionTypes.Interfaces;
 
 namespace osu_StreamCompanion.Code.Modules.ModsHandler

osu!StreamCompanion/Code/Modules/ModsHandler/ModParserSettings.cs

@@ -2,6 +2,7 @@
 using System.Windows.Forms;
 using osu_StreamCompanion.Code.Core;
 using osu_StreamCompanion.Code.Misc;
+using StreamCompanionTypes;
 using StreamCompanionTypes.DataTypes;
 using StreamCompanionTypes.Interfaces;
 

osu!StreamCompanion/Code/Modules/SCGUI/MainWindow.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 using osu_StreamCompanion.Code.Misc;
+using StreamCompanionTypes;
 using StreamCompanionTypes.Interfaces;
 
 namespace osu_StreamCompanion.Code.Modules.SCGUI

osu!StreamCompanion/Code/Modules/osuFallbackDetector/OsuFallbackDetector.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using osu_StreamCompanion.Code.Misc;
+using StreamCompanionTypes;
 using StreamCompanionTypes.DataTypes;
 using StreamCompanionTypes.Interfaces;
 

osu!StreamCompanion/Code/Modules/osuPathReslover/osuPathResolver.cs

@@ -4,6 +4,7 @@
 using System.Windows.Forms;
 using Microsoft.Win32;
 using osu_StreamCompanion.Code.Misc;
+using StreamCompanionTypes;
 using StreamCompanionTypes.DataTypes;
 using StreamCompanionTypes.Interfaces;
 

osu!StreamCompanion/Code/Modules/osuPost/osuPost.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Windows.Forms;
 using osu_StreamCompanion.Code.Misc;
+using StreamCompanionTypes;
 using StreamCompanionTypes.DataTypes;
 using StreamCompanionTypes.Interfaces;
 

osu!StreamCompanion/Code/Modules/osuPost/osuPostSettings.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Windows.Forms;
 using osu_StreamCompanion.Code.Misc;
+using StreamCompanionTypes;
 using StreamCompanionTypes.Interfaces;
 
 namespace osu_StreamCompanion.Code.Modules.osuPost

osu!StreamCompanion/Code/Modules/osuSongsFolderWatcher/osuSongsFolderWatcher.cs

@@ -5,6 +5,7 @@
 using System.Windows.Forms;
 using osu_StreamCompanion.Code.Helpers;
 using osu_StreamCompanion.Code.Misc;
+using StreamCompanionTypes;
 using StreamCompanionTypes.DataTypes;
 using StreamCompanionTypes.Interfaces;
 

osu!StreamCompanion/Program.cs

@@ -12,7 +12,7 @@ namespace osu_StreamCompanion
 {
     static class Program
     {
-        public static string ScVersion ="v180625.14";
+        public static string ScVersion ="v180626.12";
         private static Initializer _initializer;
         /// <summary>
         /// The main entry point for the application.

osu!StreamCompanion/osu!StreamCompanion.csproj

@@ -130,7 +130,6 @@
     <Compile Include="Code\Misc\ImpatientWebClient.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Code\Misc\SettingNames.cs" />
     <Compile Include="Code\Core\SqliteConnector.cs" />
     <Compile Include="Code\Helpers\BeatmapHelpers.cs" />
     <Compile Include="Code\Helpers\Helpers.cs" />