diff --git a/.gitignore b/.gitignore index 9ecfa8547..7ba4b4d24 100644 --- a/.gitignore +++ b/.gitignore @@ -245,3 +245,4 @@ Project-Aurora/.idea/* Project-Aurora/Project-Aurora/Resources/Win64/ Project-Aurora/Project-Aurora/Resources/Win32/ +/NZXTSharp diff --git a/Project-Aurora/Aurora-LightFXWrapper/Aurora-LightFXWrapper.vcxproj b/Project-Aurora/Aurora-LightFXWrapper/Aurora-LightFXWrapper.vcxproj index 68bcee75c..60fc256e6 100644 --- a/Project-Aurora/Aurora-LightFXWrapper/Aurora-LightFXWrapper.vcxproj +++ b/Project-Aurora/Aurora-LightFXWrapper/Aurora-LightFXWrapper.vcxproj @@ -22,7 +22,7 @@ {A759300D-9550-47BA-8616-C24B6BC05A02} Win32Proj AuroraLightFXWrapper - 10.0 + 10.0.19041.0 @@ -193,4 +193,4 @@ - + \ No newline at end of file diff --git a/Project-Aurora/Aurora-LogiLEDWrapper/Aurora-LogiLEDWrapper.vcxproj b/Project-Aurora/Aurora-LogiLEDWrapper/Aurora-LogiLEDWrapper.vcxproj index 9d6a45bfd..1c206a373 100644 --- a/Project-Aurora/Aurora-LogiLEDWrapper/Aurora-LogiLEDWrapper.vcxproj +++ b/Project-Aurora/Aurora-LogiLEDWrapper/Aurora-LogiLEDWrapper.vcxproj @@ -22,7 +22,7 @@ {20259BE1-55C9-4EFB-9D30-C933F621B9D4} Win32Proj AuroraLogiLEDWrapper - 10.0 + 10.0.19041.0 @@ -198,4 +198,4 @@ - + \ No newline at end of file diff --git a/Project-Aurora/Aurora-RazerLEDWrapper/Aurora-RazerLEDWrapper.vcxproj b/Project-Aurora/Aurora-RazerLEDWrapper/Aurora-RazerLEDWrapper.vcxproj index dfeb200db..fd1983974 100644 --- a/Project-Aurora/Aurora-RazerLEDWrapper/Aurora-RazerLEDWrapper.vcxproj +++ b/Project-Aurora/Aurora-RazerLEDWrapper/Aurora-RazerLEDWrapper.vcxproj @@ -22,7 +22,7 @@ {004D1E3E-F20E-4ECA-ABB1-467D1CE2C173} Win32Proj AuroraRazerLEDWrapper - 10.0 + 10.0.19041.0 @@ -193,4 +193,4 @@ - + \ No newline at end of file diff --git a/Project-Aurora/Project-Aurora/Profiles/Dota 2/GSI/Nodes/Items.cs b/Project-Aurora/Project-Aurora/Profiles/Dota 2/GSI/Nodes/Items.cs index 28cb4786f..6b65d471f 100644 --- a/Project-Aurora/Project-Aurora/Profiles/Dota 2/GSI/Nodes/Items.cs +++ b/Project-Aurora/Project-Aurora/Profiles/Dota 2/GSI/Nodes/Items.cs @@ -19,7 +19,7 @@ public class Items_Dota2 : Node /// /// Gets the array of the inventory items /// - [Range(0, 5)] + [Range(0, 8)] public Item[] InventoryItems { get { return inventory.ToArray(); } @@ -42,12 +42,13 @@ public Item[] StashItems internal Items_Dota2(string json_data) : base(json_data) { List slots = _ParsedData.Properties().Select(p => p.Name).ToList(); - foreach (string item_slot in slots) + + foreach (string ItemSlot in slots) { - if (item_slot.StartsWith("slot")) - this.inventory.Add(new Item(_ParsedData[item_slot].ToString())); - else - this.stash.Add(new Item(_ParsedData[item_slot].ToString())); + if (ItemSlot.StartsWith("slot")) + this.inventory.Add(new Item(_ParsedData[ItemSlot].ToString())); + else if(ItemSlot.StartsWith("stash")) + this.stash.Add(new Item(_ParsedData[ItemSlot].ToString())); } } @@ -80,13 +81,13 @@ public Item GetStashAt(int index) /// /// Checks if item exists in the inventory /// - /// The item name + /// The item name /// A boolean if item is in the inventory - public bool InventoryContains(string itemname) + public bool InventoryContains(string ItemName) { - foreach(Item inventory_item in this.inventory) + foreach(Item InventoryItem in this.inventory) { - if (inventory_item.Name.Equals(itemname)) + if (InventoryItem.Name.Equals(ItemName)) return true; } @@ -98,11 +99,11 @@ public bool InventoryContains(string itemname) /// /// The item name /// A boolean if item is in the stash - public bool StashContains(string itemname) + public bool StashContains(string ItemName) { - foreach (Item stash_item in this.stash) + foreach (Item StashItem in this.stash) { - if (stash_item.Name.Equals(itemname)) + if (StashItem.Name.Equals(ItemName)) return true; } @@ -112,13 +113,13 @@ public bool StashContains(string itemname) /// /// Gets index of the first occurence of the item in the inventory /// - /// The item name + /// The item name /// The first index at which item is found, -1 if not found. - public int InventoryIndexOf(string itemname) + public int InventoryIndexOf(string ItemName) { for (int x = 0; x < this.inventory.Count; x++) { - if (this.inventory[x].Name.Equals(itemname)) + if (this.inventory[x].Name.Equals(ItemName)) return x; } @@ -130,11 +131,11 @@ public int InventoryIndexOf(string itemname) /// /// The item name /// The first index at which item is found, -1 if not found. - public int StashIndexOf(string itemname) + public int StashIndexOf(string ItemName) { for (int x = 0; x < this.stash.Count; x++) { - if (this.stash[x].Name == itemname) + if (this.stash[x].Name == ItemName) return x; } diff --git a/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2ItemLayer.xaml b/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2ItemLayer.xaml index 1af3cc8f4..8899d7501 100644 --- a/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2ItemLayer.xaml +++ b/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2ItemLayer.xaml @@ -5,13 +5,21 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Aurora.Profiles.Dota_2.Layers" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" x:Class="Aurora.Profiles.Dota_2.Layers.Control_Dota2ItemLayer" - mc:Ignorable="d" Loaded="UserControl_Loaded"> + mc:Ignorable="d" Loaded="UserControl_Loaded" Height="173.701"> diff --git a/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2ItemLayer.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2ItemLayer.xaml.cs index 47780150d..4f7e3736a 100644 --- a/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2ItemLayer.xaml.cs +++ b/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2ItemLayer.xaml.cs @@ -54,12 +54,15 @@ public void SetSettings() UIUtils.SetSingleKey(this.item_slot4_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 3); UIUtils.SetSingleKey(this.item_slot5_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 4); UIUtils.SetSingleKey(this.item_slot6_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 5); - UIUtils.SetSingleKey(this.stash_slot1_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 6); - UIUtils.SetSingleKey(this.stash_slot2_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 7); - UIUtils.SetSingleKey(this.stash_slot3_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 8); - UIUtils.SetSingleKey(this.stash_slot4_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 9); - UIUtils.SetSingleKey(this.stash_slot5_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 10); - UIUtils.SetSingleKey(this.stash_slot6_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 11); + UIUtils.SetSingleKey(this.item_slot7_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 6); + UIUtils.SetSingleKey(this.item_slot8_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 7); + UIUtils.SetSingleKey(this.item_slot9_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 8); + UIUtils.SetSingleKey(this.stash_slot1_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 9); + UIUtils.SetSingleKey(this.stash_slot2_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 10); + UIUtils.SetSingleKey(this.stash_slot3_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 11); + UIUtils.SetSingleKey(this.stash_slot4_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 12); + UIUtils.SetSingleKey(this.stash_slot5_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 13); + UIUtils.SetSingleKey(this.stash_slot6_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 14); settingsset = true; } @@ -226,6 +229,82 @@ private void item6_keys_callback(DeviceKeys[] resulting_keys) Global.key_recorder.Reset(); } + + private void item_slot7_textblock_MouseDown(object sender, MouseButtonEventArgs e) + { + RecordSingleKey("Dota 2 - Item Slot 7 Key", sender as TextBlock, item7_keys_callback); + } + + private void item7_keys_callback(DeviceKeys[] resulting_keys) + { + Global.key_recorder.FinishedRecording -= item7_keys_callback; + + Dispatcher.Invoke(() => + { + item_slot6_textblock.Background = new SolidColorBrush(Color.FromArgb(0, 0, 0, 0)); + + if (resulting_keys.Length > 0) + { + if (IsLoaded) + (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys[6] = resulting_keys[0]; + + UIUtils.SetSingleKey(this.item_slot7_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 6); + } + }); + + Global.key_recorder.Reset(); + } + + private void item_slot8_textblock_MouseDown(object sender, MouseButtonEventArgs e) + { + RecordSingleKey("Dota 2 - Item Slot 8 Key", sender as TextBlock, item8_keys_callback); + } + + private void item8_keys_callback(DeviceKeys[] resulting_keys) + { + Global.key_recorder.FinishedRecording -= item8_keys_callback; + + Dispatcher.Invoke(() => + { + item_slot6_textblock.Background = new SolidColorBrush(Color.FromArgb(0, 0, 0, 0)); + + if (resulting_keys.Length > 0) + { + if (IsLoaded) + (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys[7] = resulting_keys[0]; + + UIUtils.SetSingleKey(this.item_slot6_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 7); + } + }); + + Global.key_recorder.Reset(); + } + + private void item_slot9_textblock_MouseDown(object sender, MouseButtonEventArgs e) + { + RecordSingleKey("Dota 2 - Item Slot 9 Key", sender as TextBlock, item9_keys_callback); + } + + private void item9_keys_callback(DeviceKeys[] resulting_keys) + { + Global.key_recorder.FinishedRecording -= item9_keys_callback; + + Dispatcher.Invoke(() => + { + item_slot6_textblock.Background = new SolidColorBrush(Color.FromArgb(0, 0, 0, 0)); + + if (resulting_keys.Length > 0) + { + if (IsLoaded) + (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys[8] = resulting_keys[0]; + + UIUtils.SetSingleKey(this.item_slot6_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 8); + } + }); + + Global.key_recorder.Reset(); + } + private void stash_slot1_textblock_MouseDown(object sender, MouseButtonEventArgs e) { RecordSingleKey("Dota 2 - Stash Slot 1 Key", sender as TextBlock, stash1_keys_callback); @@ -242,9 +321,9 @@ private void stash1_keys_callback(DeviceKeys[] resulting_keys) if (resulting_keys.Length > 0) { if (IsLoaded) - (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys[6] = resulting_keys[0]; + (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys[9] = resulting_keys[0]; - UIUtils.SetSingleKey(this.stash_slot1_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 6); + UIUtils.SetSingleKey(this.stash_slot1_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 9); } }); @@ -267,9 +346,9 @@ private void stash2_keys_callback(DeviceKeys[] resulting_keys) if (resulting_keys.Length > 0) { if (IsLoaded) - (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys[7] = resulting_keys[0]; + (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys[10] = resulting_keys[0]; - UIUtils.SetSingleKey(this.stash_slot2_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 7); + UIUtils.SetSingleKey(this.stash_slot2_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 10); } }); @@ -292,9 +371,9 @@ private void stash3_keys_callback(DeviceKeys[] resulting_keys) if (resulting_keys.Length > 0) { if (IsLoaded) - (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys[8] = resulting_keys[0]; + (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys[11] = resulting_keys[0]; - UIUtils.SetSingleKey(this.stash_slot3_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 8); + UIUtils.SetSingleKey(this.stash_slot3_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 11); } }); @@ -317,9 +396,9 @@ private void stash4_keys_callback(DeviceKeys[] resulting_keys) if (resulting_keys.Length > 0) { if (IsLoaded) - (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys[9] = resulting_keys[0]; + (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys[12] = resulting_keys[0]; - UIUtils.SetSingleKey(this.stash_slot4_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 9); + UIUtils.SetSingleKey(this.stash_slot4_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 12); } }); @@ -342,9 +421,9 @@ private void stash5_keys_callback(DeviceKeys[] resulting_keys) if (resulting_keys.Length > 0) { if (IsLoaded) - (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys[10] = resulting_keys[0]; + (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys[13] = resulting_keys[0]; - UIUtils.SetSingleKey(this.stash_slot5_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 10); + UIUtils.SetSingleKey(this.stash_slot5_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 13); } }); @@ -367,9 +446,9 @@ private void stash6_keys_callback(DeviceKeys[] resulting_keys) if (resulting_keys.Length > 0) { if (IsLoaded) - (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys[11] = resulting_keys[0]; + (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys[14] = resulting_keys[0]; - UIUtils.SetSingleKey(this.stash_slot6_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 11); + UIUtils.SetSingleKey(this.stash_slot6_textblock, (this.DataContext as Dota2ItemLayerHandler).Properties._ItemKeys, 14); } }); diff --git a/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Dota2ItemLayerHandler.cs b/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Dota2ItemLayerHandler.cs index 9f3b70a04..42bf24043 100644 --- a/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Dota2ItemLayerHandler.cs +++ b/Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Dota2ItemLayerHandler.cs @@ -59,7 +59,7 @@ public override void Default() this._ItemCooldownColor = Color.FromArgb(0, 0, 0); this._ItemNoChargersColor = Color.FromArgb(150, 150, 150); this._UseItemColors = true; - this._ItemKeys = new List() { Devices.DeviceKeys.Z, Devices.DeviceKeys.X, Devices.DeviceKeys.C, Devices.DeviceKeys.V, Devices.DeviceKeys.B, Devices.DeviceKeys.N, Devices.DeviceKeys.INSERT, Devices.DeviceKeys.HOME, Devices.DeviceKeys.PAGE_UP, Devices.DeviceKeys.DELETE, Devices.DeviceKeys.END, Devices.DeviceKeys.PAGE_DOWN }; + this._ItemKeys = new List() { Devices.DeviceKeys.Z, Devices.DeviceKeys.X, Devices.DeviceKeys.C, Devices.DeviceKeys.V, Devices.DeviceKeys.B, Devices.DeviceKeys.N, Devices.DeviceKeys.INSERT, Devices.DeviceKeys.HOME, Devices.DeviceKeys.PAGE_UP, Devices.DeviceKeys.NUM_ONE, Devices.DeviceKeys.NUM_TWO, Devices.DeviceKeys.NUM_THREE, Devices.DeviceKeys.NUM_FOUR, Devices.DeviceKeys.NUM_FIVE , Devices.DeviceKeys.NUM_SIX }; } } @@ -350,9 +350,9 @@ public override EffectLayer Render(IGameState state) { GameState_Dota2 dota2state = state as GameState_Dota2; - if (Properties.ItemKeys.Count >= 12) + if (Properties.ItemKeys.Count >= 6) { - for (int index = 0; index < 6; index++) + for (int index = 0; index < dota2state.Items.InventoryCount; index++) { Item item = dota2state.Items.GetInventoryAt(index); Devices.DeviceKeys key = Properties.ItemKeys[index]; @@ -383,10 +383,10 @@ public override EffectLayer Render(IGameState state) } } - for (int index = 0; index < 6; index++) + for (int index = 0; index < dota2state.Items.StashCount; index++) { Item item = dota2state.Items.GetStashAt(index); - Devices.DeviceKeys key = Properties.ItemKeys[6 + index]; + Devices.DeviceKeys key = Properties.ItemKeys[9 + index]; if (item.Name.Equals("empty")) { diff --git a/Project-Aurora/Project-Aurora/Profiles/Rust/Control_Rust.xaml b/Project-Aurora/Project-Aurora/Profiles/Rust/Control_Rust.xaml new file mode 100644 index 000000000..9626f833b --- /dev/null +++ b/Project-Aurora/Project-Aurora/Profiles/Rust/Control_Rust.xaml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + diff --git a/Project-Aurora/Project-Aurora/Profiles/Rust/Control_Rust.xaml.cs b/Project-Aurora/Project-Aurora/Profiles/Rust/Control_Rust.xaml.cs new file mode 100644 index 000000000..6b485eac0 --- /dev/null +++ b/Project-Aurora/Project-Aurora/Profiles/Rust/Control_Rust.xaml.cs @@ -0,0 +1,47 @@ +using Aurora.Settings; +using System.IO; +using System.Windows; +using System.Windows.Controls; + +namespace Aurora.Profiles.Rust +{ + /// + /// Interaction logic for Control_Rust.xaml + /// + public partial class Control_Rust : UserControl + { + private Application profile_manager; + + public Control_Rust(Application profile) + { + InitializeComponent(); + + profile_manager = profile; + + SetSettings(); + } + + private void SetSettings() + { + this.game_enabled.IsChecked = profile_manager.Settings.IsEnabled; + } + + + private void UserControl_Loaded(object sender, RoutedEventArgs e) + { + } + + private void UserControl_Unloaded(object sender, RoutedEventArgs e) + { + } + + private void game_enabled_Checked(object sender, RoutedEventArgs e) + { + if (IsLoaded) + { + profile_manager.Settings.IsEnabled = (this.game_enabled.IsChecked.HasValue) ? this.game_enabled.IsChecked.Value : false; + profile_manager.SaveProfiles(); + } + } + } +} diff --git a/Project-Aurora/Project-Aurora/Profiles/Rust/RustApplication.cs b/Project-Aurora/Project-Aurora/Profiles/Rust/RustApplication.cs new file mode 100644 index 000000000..808b11ff7 --- /dev/null +++ b/Project-Aurora/Project-Aurora/Profiles/Rust/RustApplication.cs @@ -0,0 +1,22 @@ +using Aurora.Settings.Layers; + +namespace Aurora.Profiles.Rust +{ + public class Rust : Application + { + public Rust() + : base(new LightEventConfig { + Name = "Rust", + ID = "rust", + ProcessNames = new[] { "RustClient.exe" }, + ProfileType = typeof(RazerChromaProfile), + OverviewControlType = typeof(Control_Rust), + GameStateType = typeof(GameState_Wrapper), + Event = new GameEvent_Generic(), + IconURI = "Resources/rust_icon.png" + }) + { + AllowLayer(); + } + } +} diff --git a/Project-Aurora/Project-Aurora/Project-Aurora.csproj b/Project-Aurora/Project-Aurora/Project-Aurora.csproj index 5e686d109..866ae76a7 100644 --- a/Project-Aurora/Project-Aurora/Project-Aurora.csproj +++ b/Project-Aurora/Project-Aurora/Project-Aurora.csproj @@ -170,6 +170,7 @@ + @@ -180,4 +181,10 @@ + + + $(DefaultXamlRuntime) + + + \ No newline at end of file diff --git a/Project-Aurora/Project-Aurora/Properties/Resources.Designer.cs b/Project-Aurora/Project-Aurora/Properties/Resources.Designer.cs index 960ee1d36..89fa7ed7b 100644 --- a/Project-Aurora/Project-Aurora/Properties/Resources.Designer.cs +++ b/Project-Aurora/Project-Aurora/Properties/Resources.Designer.cs @@ -549,7 +549,20 @@ internal static System.Drawing.Bitmap overwatch_icon { return ((System.Drawing.Bitmap)(obj)); } } - + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap rust_icon + { + get + { + object obj = ResourceManager.GetObject("rust_icon", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// /// Looks up a localized resource of type System.Byte[]. /// diff --git a/Project-Aurora/Project-Aurora/Properties/Resources.resx b/Project-Aurora/Project-Aurora/Properties/Resources.resx index 212d719d8..8fee5ee4a 100755 --- a/Project-Aurora/Project-Aurora/Properties/Resources.resx +++ b/Project-Aurora/Project-Aurora/Properties/Resources.resx @@ -178,6 +178,9 @@ ..\resources\overwatch_icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\rust_icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\resources\pd2_64x64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/Project-Aurora/Project-Aurora/Resources/rust_icon.png b/Project-Aurora/Project-Aurora/Resources/rust_icon.png new file mode 100644 index 000000000..6c4f65d43 Binary files /dev/null and b/Project-Aurora/Project-Aurora/Resources/rust_icon.png differ diff --git a/Project-Aurora/Project-Aurora/Utils/JSONUtils.cs b/Project-Aurora/Project-Aurora/Utils/JSONUtils.cs index e1471be3d..4f7c24f9a 100755 --- a/Project-Aurora/Project-Aurora/Utils/JSONUtils.cs +++ b/Project-Aurora/Project-Aurora/Utils/JSONUtils.cs @@ -41,6 +41,7 @@ public override Type BindToType(string assemblyName, string typeName) case "Aurora.Profiles.TheDivision.TheDivisionSettings": return typeof(Settings.ApplicationProfile); case "Aurora.Profiles.Overwatch.OverwatchProfile": + case "Aurora.Profiles.Rust.RustProfile": case "Aurora.Profiles.WormsWMD.WormsWMDProfile": case "Aurora.Profiles.Blade_and_Soul.BnSProfile": case "Aurora.Profiles.Magic_Duels_2012.MagicDuels2012Profile":