diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..1ff0c423 --- /dev/null +++ b/.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 diff --git a/osu!StreamCompanion/Code/Misc/SettingNames.cs b/StreamCompanionTypes/SettingNames.cs similarity index 98% rename from osu!StreamCompanion/Code/Misc/SettingNames.cs rename to StreamCompanionTypes/SettingNames.cs index e5e53f94..1a69373b 100644 --- a/osu!StreamCompanion/Code/Misc/SettingNames.cs +++ b/StreamCompanionTypes/SettingNames.cs @@ -1,11 +1,11 @@ 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()); @@ -13,7 +13,7 @@ public sealed class SettingNames 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()); public readonly ConfigEntry KeyNames = new ConfigEntry("keyNames", new List()); @@ -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() { } } - -} +} \ No newline at end of file diff --git a/StreamCompanionTypes/StreamCompanionTypes.csproj b/StreamCompanionTypes/StreamCompanionTypes.csproj index 32be7f1c..fe731518 100644 --- a/StreamCompanionTypes/StreamCompanionTypes.csproj +++ b/StreamCompanionTypes/StreamCompanionTypes.csproj @@ -86,6 +86,7 @@ + diff --git a/osu!StreamCompanion/Code/Core/Loggers/ConsoleLogger.cs b/osu!StreamCompanion/Code/Core/Loggers/ConsoleLogger.cs index 9d881fc4..28c7861a 100644 --- a/osu!StreamCompanion/Code/Core/Loggers/ConsoleLogger.cs +++ b/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; diff --git a/osu!StreamCompanion/Code/Core/Loggers/FileLogger.cs b/osu!StreamCompanion/Code/Core/Loggers/FileLogger.cs index 24549543..a6ec18fe 100644 --- a/osu!StreamCompanion/Code/Core/Loggers/FileLogger.cs +++ b/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; diff --git a/osu!StreamCompanion/Code/Core/Maps/Processing/MapDataGetter.cs b/osu!StreamCompanion/Code/Core/Maps/Processing/MapDataGetter.cs index ee9d899b..01dd77e9 100644 --- a/osu!StreamCompanion/Code/Core/Maps/Processing/MapDataGetter.cs +++ b/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; diff --git a/osu!StreamCompanion/Code/Core/Maps/Processing/MapStringFormatter.cs b/osu!StreamCompanion/Code/Core/Maps/Processing/MapStringFormatter.cs index b9a217da..5249463b 100644 --- a/osu!StreamCompanion/Code/Core/Maps/Processing/MapStringFormatter.cs +++ b/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; diff --git a/osu!StreamCompanion/Code/Helpers/BeatmapHelpers.cs b/osu!StreamCompanion/Code/Helpers/BeatmapHelpers.cs index 67d8682e..c6825250 100644 --- a/osu!StreamCompanion/Code/Helpers/BeatmapHelpers.cs +++ b/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; diff --git a/osu!StreamCompanion/Code/Modules/ClickCounter/ClickCounter.cs b/osu!StreamCompanion/Code/Modules/ClickCounter/ClickCounter.cs index 1f1c3c0f..0b1769ee 100644 --- a/osu!StreamCompanion/Code/Modules/ClickCounter/ClickCounter.cs +++ b/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; diff --git a/osu!StreamCompanion/Code/Modules/ClickCounter/ClickCounterSettings.cs b/osu!StreamCompanion/Code/Modules/ClickCounter/ClickCounterSettings.cs index b3e208f7..964015b5 100644 --- a/osu!StreamCompanion/Code/Modules/ClickCounter/ClickCounterSettings.cs +++ b/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 diff --git a/osu!StreamCompanion/Code/Modules/FirstRun/FirstRunFrm.cs b/osu!StreamCompanion/Code/Modules/FirstRun/FirstRunFrm.cs index ecac2363..c9f12deb 100644 --- a/osu!StreamCompanion/Code/Modules/FirstRun/FirstRunFrm.cs +++ b/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 diff --git a/osu!StreamCompanion/Code/Modules/MapDataFinders/SqliteData/CacheInitalizer.cs b/osu!StreamCompanion/Code/Modules/MapDataFinders/SqliteData/CacheInitalizer.cs index 6fe78882..793d86c4 100644 --- a/osu!StreamCompanion/Code/Modules/MapDataFinders/SqliteData/CacheInitalizer.cs +++ b/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; diff --git a/osu!StreamCompanion/Code/Modules/MapDataFinders/osuMemoryID/MemoryDataFinderSettings.cs b/osu!StreamCompanion/Code/Modules/MapDataFinders/osuMemoryID/MemoryDataFinderSettings.cs index ebb1b3b9..bc37973b 100644 --- a/osu!StreamCompanion/Code/Modules/MapDataFinders/osuMemoryID/MemoryDataFinderSettings.cs +++ b/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 { diff --git a/osu!StreamCompanion/Code/Modules/MapDataGetters/TcpSocket/TcpSocketDataGetter.cs b/osu!StreamCompanion/Code/Modules/MapDataGetters/TcpSocket/TcpSocketDataGetter.cs index b84d0c5b..dd3b3a7f 100644 --- a/osu!StreamCompanion/Code/Modules/MapDataGetters/TcpSocket/TcpSocketDataGetter.cs +++ b/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; diff --git a/osu!StreamCompanion/Code/Modules/MapDataGetters/TcpSocket/TcpSocketSettings.cs b/osu!StreamCompanion/Code/Modules/MapDataGetters/TcpSocket/TcpSocketSettings.cs index 987635b1..6064f01d 100644 --- a/osu!StreamCompanion/Code/Modules/MapDataGetters/TcpSocket/TcpSocketSettings.cs +++ b/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 diff --git a/osu!StreamCompanion/Code/Modules/MapDataParsers/Parser1/LegacyParserConfigConverter.cs b/osu!StreamCompanion/Code/Modules/MapDataParsers/Parser1/LegacyParserConfigConverter.cs index 0340b546..bbb5f2cb 100644 --- a/osu!StreamCompanion/Code/Modules/MapDataParsers/Parser1/LegacyParserConfigConverter.cs +++ b/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; diff --git a/osu!StreamCompanion/Code/Modules/MapDataParsers/Parser1/MapDataParser.cs b/osu!StreamCompanion/Code/Modules/MapDataParsers/Parser1/MapDataParser.cs index bd1916eb..2cb31a86 100644 --- a/osu!StreamCompanion/Code/Modules/MapDataParsers/Parser1/MapDataParser.cs +++ b/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; diff --git a/osu!StreamCompanion/Code/Modules/MapDataParsers/Parser1/ParserSettings.cs b/osu!StreamCompanion/Code/Modules/MapDataParsers/Parser1/ParserSettings.cs index 2b5aae7f..563da41a 100644 --- a/osu!StreamCompanion/Code/Modules/MapDataParsers/Parser1/ParserSettings.cs +++ b/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; diff --git a/osu!StreamCompanion/Code/Modules/MapDataReplacements/Map/MapReplacement.cs b/osu!StreamCompanion/Code/Modules/MapDataReplacements/Map/MapReplacement.cs index 1347f232..a215deed 100644 --- a/osu!StreamCompanion/Code/Modules/MapDataReplacements/Map/MapReplacement.cs +++ b/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; diff --git a/osu!StreamCompanion/Code/Modules/MapDataReplacements/PP/PpReplacements.cs b/osu!StreamCompanion/Code/Modules/MapDataReplacements/PP/PpReplacements.cs index 7bd92dd7..43badde8 100644 --- a/osu!StreamCompanion/Code/Modules/MapDataReplacements/PP/PpReplacements.cs +++ b/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; diff --git a/osu!StreamCompanion/Code/Modules/ModImageGenerator/API/ImageGenerator.cs b/osu!StreamCompanion/Code/Modules/ModImageGenerator/API/ImageGenerator.cs index 5db4c9bd..bbd7c6ba 100644 --- a/osu!StreamCompanion/Code/Modules/ModImageGenerator/API/ImageGenerator.cs +++ b/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; diff --git a/osu!StreamCompanion/Code/Modules/ModImageGenerator/ModImageGenerator.cs b/osu!StreamCompanion/Code/Modules/ModImageGenerator/ModImageGenerator.cs index 75031a9c..368c0f77 100644 --- a/osu!StreamCompanion/Code/Modules/ModImageGenerator/ModImageGenerator.cs +++ b/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; diff --git a/osu!StreamCompanion/Code/Modules/ModImageGenerator/ModImageGeneratorSettings.cs b/osu!StreamCompanion/Code/Modules/ModImageGenerator/ModImageGeneratorSettings.cs index 28b08a45..a454f1e6 100644 --- a/osu!StreamCompanion/Code/Modules/ModImageGenerator/ModImageGeneratorSettings.cs +++ b/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 diff --git a/osu!StreamCompanion/Code/Modules/ModsHandler/ModParser.cs b/osu!StreamCompanion/Code/Modules/ModsHandler/ModParser.cs index fd7f0332..1a9b2fe3 100644 --- a/osu!StreamCompanion/Code/Modules/ModsHandler/ModParser.cs +++ b/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 diff --git a/osu!StreamCompanion/Code/Modules/ModsHandler/ModParserSettings.cs b/osu!StreamCompanion/Code/Modules/ModsHandler/ModParserSettings.cs index d809e590..f731f6a5 100644 --- a/osu!StreamCompanion/Code/Modules/ModsHandler/ModParserSettings.cs +++ b/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; diff --git a/osu!StreamCompanion/Code/Modules/SCGUI/MainWindow.cs b/osu!StreamCompanion/Code/Modules/SCGUI/MainWindow.cs index 387aa318..001ec758 100644 --- a/osu!StreamCompanion/Code/Modules/SCGUI/MainWindow.cs +++ b/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 diff --git a/osu!StreamCompanion/Code/Modules/osuFallbackDetector/OsuFallbackDetector.cs b/osu!StreamCompanion/Code/Modules/osuFallbackDetector/OsuFallbackDetector.cs index 8c9e7020..44b36df4 100644 --- a/osu!StreamCompanion/Code/Modules/osuFallbackDetector/OsuFallbackDetector.cs +++ b/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; diff --git a/osu!StreamCompanion/Code/Modules/osuPathReslover/osuPathResolver.cs b/osu!StreamCompanion/Code/Modules/osuPathReslover/osuPathResolver.cs index 983a547b..e2bff020 100644 --- a/osu!StreamCompanion/Code/Modules/osuPathReslover/osuPathResolver.cs +++ b/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; diff --git a/osu!StreamCompanion/Code/Modules/osuPost/osuPost.cs b/osu!StreamCompanion/Code/Modules/osuPost/osuPost.cs index b834c14a..447eb788 100644 --- a/osu!StreamCompanion/Code/Modules/osuPost/osuPost.cs +++ b/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; diff --git a/osu!StreamCompanion/Code/Modules/osuPost/osuPostSettings.cs b/osu!StreamCompanion/Code/Modules/osuPost/osuPostSettings.cs index fe438155..c1b57700 100644 --- a/osu!StreamCompanion/Code/Modules/osuPost/osuPostSettings.cs +++ b/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 diff --git a/osu!StreamCompanion/Code/Modules/osuSongsFolderWatcher/osuSongsFolderWatcher.cs b/osu!StreamCompanion/Code/Modules/osuSongsFolderWatcher/osuSongsFolderWatcher.cs index a11f7b14..612baea2 100644 --- a/osu!StreamCompanion/Code/Modules/osuSongsFolderWatcher/osuSongsFolderWatcher.cs +++ b/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; diff --git a/osu!StreamCompanion/Program.cs b/osu!StreamCompanion/Program.cs index e3f576a0..45881e54 100644 --- a/osu!StreamCompanion/Program.cs +++ b/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; /// /// The main entry point for the application. diff --git a/osu!StreamCompanion/osu!StreamCompanion.csproj b/osu!StreamCompanion/osu!StreamCompanion.csproj index fb695ce3..345da67a 100644 --- a/osu!StreamCompanion/osu!StreamCompanion.csproj +++ b/osu!StreamCompanion/osu!StreamCompanion.csproj @@ -130,7 +130,6 @@ Component -