diff --git a/TrueCraft.Core/TrueCraft.Core.csproj b/TrueCraft.Core/TrueCraft.Core.csproj index 4a67de6..cb5375d 100644 --- a/TrueCraft.Core/TrueCraft.Core.csproj +++ b/TrueCraft.Core/TrueCraft.Core.csproj @@ -30,6 +30,9 @@ false + + ..\packages\Newtonsoft.Json.6.0.8\lib\net40\Newtonsoft.Json.dll + ..\lib\Ionic.Zip.Reduced.dll @@ -205,6 +208,7 @@ + @@ -325,7 +329,9 @@ fNbt - + + + diff --git a/TrueCraft.Launcher/UserSettings.cs b/TrueCraft.Core/UserSettings.cs similarity index 91% rename from TrueCraft.Launcher/UserSettings.cs rename to TrueCraft.Core/UserSettings.cs index 6cb8de6..63a5364 100644 --- a/TrueCraft.Launcher/UserSettings.cs +++ b/TrueCraft.Core/UserSettings.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using System.IO; -namespace TrueCraft.Launcher +namespace TrueCraft.Core { public class UserSettings { @@ -21,6 +21,7 @@ namespace TrueCraft.Launcher public string Username { get; set; } public string Password { get; set; } public string LastIP { get; set; } + public string SelectedTexturePack { get; set; } public FavoriteServer[] FavoriteServers { get; set; } public UserSettings() @@ -29,6 +30,7 @@ namespace TrueCraft.Launcher Username = ""; Password = ""; LastIP = ""; + SelectedTexturePack = "Default.zip"; FavoriteServers = new FavoriteServer[0]; } diff --git a/TrueCraft.Core/packages.config b/TrueCraft.Core/packages.config new file mode 100644 index 0000000..c4dd611 --- /dev/null +++ b/TrueCraft.Core/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/TrueCraft.Launcher/TrueCraft.Launcher.csproj b/TrueCraft.Launcher/TrueCraft.Launcher.csproj index fe12f20..1dd1f7b 100644 --- a/TrueCraft.Launcher/TrueCraft.Launcher.csproj +++ b/TrueCraft.Launcher/TrueCraft.Launcher.csproj @@ -46,7 +46,6 @@ - diff --git a/TrueCraft.Launcher/Views/MultiplayerView.cs b/TrueCraft.Launcher/Views/MultiplayerView.cs index 66d1c38..932826f 100644 --- a/TrueCraft.Launcher/Views/MultiplayerView.cs +++ b/TrueCraft.Launcher/Views/MultiplayerView.cs @@ -5,6 +5,7 @@ using System.Diagnostics; using Xwt.Drawing; using System.Reflection; using System.Linq; +using TrueCraft.Core; namespace TrueCraft.Launcher.Views {