From db258de11e040acf04d68784e6d8608c234debd7 Mon Sep 17 00:00:00 2001 From: azakhi Date: Mon, 11 Mar 2019 19:43:28 +0300 Subject: [PATCH 1/7] Change default border color to transparent (#128) --- Filtration.ObjectModel/ItemFilterBlock.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Filtration.ObjectModel/ItemFilterBlock.cs b/Filtration.ObjectModel/ItemFilterBlock.cs index d501693..4ff92ea 100644 --- a/Filtration.ObjectModel/ItemFilterBlock.cs +++ b/Filtration.ObjectModel/ItemFilterBlock.cs @@ -279,7 +279,7 @@ namespace Filtration.ObjectModel get { var borderColorBlockItem = BlockItems.OfType().FirstOrDefault(); - return borderColorBlockItem?.Color ?? new Color { A = 240, R = 0, G = 0, B = 0 }; + return borderColorBlockItem?.Color ?? new Color { A = 0, R = 255, G = 255, B = 255 }; } } From 4862452188e5d19969d2bf7a33e52ae235373aaa Mon Sep 17 00:00:00 2001 From: azakhi Date: Mon, 11 Mar 2019 19:44:40 +0300 Subject: [PATCH 2/7] Fix copied visuals not affecting preview (#129) --- Filtration/ViewModels/ItemFilterBlockViewModel.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Filtration/ViewModels/ItemFilterBlockViewModel.cs b/Filtration/ViewModels/ItemFilterBlockViewModel.cs index d4dc7d0..7c8053b 100644 --- a/Filtration/ViewModels/ItemFilterBlockViewModel.cs +++ b/Filtration/ViewModels/ItemFilterBlockViewModel.cs @@ -351,6 +351,10 @@ namespace Filtration.ViewModels private void OnPasteBlockStyleCommand() { _parentScriptViewModel.PasteBlockStyle(this); + foreach (var blockItem in Block.BlockItems.OfType()) + { + blockItem.PropertyChanged += OnBlockItemChanged; + } } private void OnAddBlockCommand() From dea0378a167382ba77473bb38478f147b0850cd3 Mon Sep 17 00:00:00 2001 From: azakhi Date: Mon, 18 Mar 2019 20:27:08 +0300 Subject: [PATCH 3/7] Fix Show/Hide parsing (#133) * Fix Show/Hide parsing * Improve disabled block test --- .../Services/TestItemFilterScriptTranslator.cs | 16 ++++++++++++++-- .../Services/ItemFilterScriptTranslator.cs | 7 +++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs b/Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs index 13a2f93..d11f0db 100644 --- a/Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs +++ b/Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs @@ -322,7 +322,13 @@ namespace Filtration.Parser.Tests.Services Environment.NewLine + "Show" + Environment.NewLine + " ItemLevel > 20" + Environment.NewLine + - " SetTextColor 255 255 0"; + " SetTextColor 255 255 0" + Environment.NewLine + + Environment.NewLine + + "#Show $Recipes->Glassblower->15% %D1" + Environment.NewLine + + "# SetTextColor 255 255 0" + Environment.NewLine + + Environment.NewLine + + "#Hide simple text without any special character" + Environment.NewLine + + "# SetTextColor 255 255 0"; var blockTranslator = new ItemFilterBlockTranslator(Mock.Of()); @@ -332,15 +338,21 @@ namespace Filtration.Parser.Tests.Services var result = translator.TranslateStringToItemFilterScript(testInputScript); // Assert - Assert.AreEqual(3, result.ItemFilterBlocks.Count); + Assert.AreEqual(5, result.ItemFilterBlocks.Count); var firstBlock = result.ItemFilterBlocks.OfType().First(); var secondBlock = result.ItemFilterBlocks.OfType().Skip(1).First(); var thirdBlock = result.ItemFilterBlocks.OfType().Skip(2).First(); + var fourthBlock = result.ItemFilterBlocks.OfType().Skip(3).First(); + var fifthBlock = result.ItemFilterBlocks.OfType().Skip(4).First(); Assert.AreEqual(3, firstBlock.BlockItems.Count); Assert.AreEqual(5, secondBlock.BlockItems.Count); Assert.AreEqual(3, thirdBlock.BlockItems.Count); + Assert.AreEqual(2, fourthBlock.BlockItems.Count); + Assert.AreEqual(2, fifthBlock.BlockItems.Count); + Assert.AreEqual(false, fourthBlock.Enabled); + Assert.AreEqual(false, fifthBlock.Enabled); } [Test] diff --git a/Filtration.Parser/Services/ItemFilterScriptTranslator.cs b/Filtration.Parser/Services/ItemFilterScriptTranslator.cs index c125432..2040872 100644 --- a/Filtration.Parser/Services/ItemFilterScriptTranslator.cs +++ b/Filtration.Parser/Services/ItemFilterScriptTranslator.cs @@ -61,8 +61,7 @@ namespace Filtration.Parser.Services lines[i] = lines[i].Trim(); if(!lines[i].StartsWith("#")) { - string curLine = Regex.Replace(lines[i], @"\s+", ""); - if ((curLine.StartsWith("Show") || curLine.StartsWith("Hide")) && (curLine.Length == 4 || curLine[4] == '#')) // found + if ((lines[i].StartsWith("Show") || lines[i].StartsWith("Hide")) && (lines[i].Length == 4 || lines[i][4] == ' ')) // found { inBlock[i] = true; break; @@ -98,8 +97,8 @@ namespace Filtration.Parser.Services { if (!inDisabledBlock && lines[i].StartsWith("#")) { - string curLine = Regex.Replace(lines[i].Substring(1), @"\s+", ""); - if ((curLine.StartsWith("Show") || curLine.StartsWith("Hide")) && (curLine.Length == 4 || curLine[4] == '#') && !inBlock[i]) + string curLine = lines[i].Substring(1).Trim(); + if ((curLine.StartsWith("Show") || curLine.StartsWith("Hide")) && (curLine.Length == 4 || curLine[4] == ' ') && !inBlock[i]) { inDisabledBlock = true; lines[i] = lines[i].Substring(1).TrimStart(' '); From 1f9a1c519616ad424ce98a9952403a0aac91f92d Mon Sep 17 00:00:00 2001 From: azakhi Date: Mon, 18 Mar 2019 20:27:21 +0300 Subject: [PATCH 4/7] Support for Path of Exile 3.6 and Synthesis League (#131) * Add new block types * Add new base types --- .../BlockItemTypes/AnyEnchantmentBlockItem.cs | 23 +++++++++++ .../BlockItemTypes/FracturedItemBlockItem.cs | 23 +++++++++++ .../BlockItemTypes/HasEnchantmentBlockItem.cs | 39 +++++++++++++++++++ .../SynthesisedItemBlockItem.cs | 23 +++++++++++ .../Enums/BlockItemOrdering.cs | 4 ++ .../Filtration.ObjectModel.csproj | 4 ++ .../Services/ItemFilterBlockTranslator.cs | 20 ++++++++++ Filtration/Filtration.csproj | 1 + Filtration/Properties/Resources.Designer.cs | 13 ++++++- Filtration/Properties/Resources.resx | 3 ++ Filtration/Resources/Enchantments.txt | 1 + Filtration/Resources/ItemBaseTypes.txt | 25 ++++++++++++ Filtration/Services/StaticDataService.cs | 4 ++ Filtration/UserControls/BlockItemControl.xaml | 5 +++ .../DesignTimeItemFilterBlockViewModel.cs | 6 ++- .../ViewModels/ItemFilterBlockViewModel.cs | 8 +++- 16 files changed, 199 insertions(+), 3 deletions(-) create mode 100644 Filtration.ObjectModel/BlockItemTypes/AnyEnchantmentBlockItem.cs create mode 100644 Filtration.ObjectModel/BlockItemTypes/FracturedItemBlockItem.cs create mode 100644 Filtration.ObjectModel/BlockItemTypes/HasEnchantmentBlockItem.cs create mode 100644 Filtration.ObjectModel/BlockItemTypes/SynthesisedItemBlockItem.cs create mode 100644 Filtration/Resources/Enchantments.txt diff --git a/Filtration.ObjectModel/BlockItemTypes/AnyEnchantmentBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/AnyEnchantmentBlockItem.cs new file mode 100644 index 0000000..cf3659d --- /dev/null +++ b/Filtration.ObjectModel/BlockItemTypes/AnyEnchantmentBlockItem.cs @@ -0,0 +1,23 @@ +using System.Windows.Media; +using Filtration.ObjectModel.BlockItemBaseTypes; +using Filtration.ObjectModel.Enums; + +namespace Filtration.ObjectModel.BlockItemTypes +{ + public sealed class AnyEnchantmentBlockItem : BooleanBlockItem + { + public AnyEnchantmentBlockItem() + { + } + + public AnyEnchantmentBlockItem(bool booleanValue) : base(booleanValue) + { + } + + public override string PrefixText => "AnyEnchantment"; + public override string DisplayHeading => "Any Enchantment"; + public override Color SummaryBackgroundColor => Colors.YellowGreen; + public override Color SummaryTextColor => Colors.Black; + public override BlockItemOrdering SortOrder => BlockItemOrdering.AnyEnchantment; + } +} diff --git a/Filtration.ObjectModel/BlockItemTypes/FracturedItemBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/FracturedItemBlockItem.cs new file mode 100644 index 0000000..b64bba6 --- /dev/null +++ b/Filtration.ObjectModel/BlockItemTypes/FracturedItemBlockItem.cs @@ -0,0 +1,23 @@ +using System.Windows.Media; +using Filtration.ObjectModel.BlockItemBaseTypes; +using Filtration.ObjectModel.Enums; + +namespace Filtration.ObjectModel.BlockItemTypes +{ + public sealed class FracturedItemBlockItem : BooleanBlockItem + { + public FracturedItemBlockItem() + { + } + + public FracturedItemBlockItem(bool booleanValue) : base(booleanValue) + { + } + + public override string PrefixText => "FracturedItem"; + public override string DisplayHeading => "Fractured Item"; + public override Color SummaryBackgroundColor => Colors.Salmon; + public override Color SummaryTextColor => Colors.Black; + public override BlockItemOrdering SortOrder => BlockItemOrdering.FracturedItem; + } +} diff --git a/Filtration.ObjectModel/BlockItemTypes/HasEnchantmentBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/HasEnchantmentBlockItem.cs new file mode 100644 index 0000000..3f4a897 --- /dev/null +++ b/Filtration.ObjectModel/BlockItemTypes/HasEnchantmentBlockItem.cs @@ -0,0 +1,39 @@ +using System.Linq; +using System.Windows.Media; +using Filtration.ObjectModel.BlockItemBaseTypes; +using Filtration.ObjectModel.Enums; + +namespace Filtration.ObjectModel.BlockItemTypes +{ + public class HasEnchantmentBlockItem : StringListBlockItem + { + public override string PrefixText => "HasEnchantment"; + public override int MaximumAllowed => 1; + public override string DisplayHeading => "Has Enchantment"; + + public override string SummaryText + { + get + { + if (Items.Count > 0 && Items.Count < 4) + { + return "Enchantments: " + + Items.Aggregate(string.Empty, (current, i) => current + i + ", ").TrimEnd(' ').TrimEnd(','); + } + if (Items.Count >= 4) + { + var remaining = Items.Count - 3; + return "Enchantments: " + Items.Take(3) + .Aggregate(string.Empty, (current, i) => current + i + ", ") + .TrimEnd(' ') + .TrimEnd(',') + " (+" + remaining + " more)"; + } + return "Enchantments: (none)"; + } + } + + public override Color SummaryBackgroundColor => Colors.PaleGreen; + public override Color SummaryTextColor => Colors.Black; + public override BlockItemOrdering SortOrder => BlockItemOrdering.HasEnchantment; + } +} diff --git a/Filtration.ObjectModel/BlockItemTypes/SynthesisedItemBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/SynthesisedItemBlockItem.cs new file mode 100644 index 0000000..4407a93 --- /dev/null +++ b/Filtration.ObjectModel/BlockItemTypes/SynthesisedItemBlockItem.cs @@ -0,0 +1,23 @@ +using System.Windows.Media; +using Filtration.ObjectModel.BlockItemBaseTypes; +using Filtration.ObjectModel.Enums; + +namespace Filtration.ObjectModel.BlockItemTypes +{ + public sealed class SynthesisedItemBlockItem : BooleanBlockItem + { + public SynthesisedItemBlockItem() + { + } + + public SynthesisedItemBlockItem(bool booleanValue) : base(booleanValue) + { + } + + public override string PrefixText => "SynthesisedItem"; + public override string DisplayHeading => "Synthesised Item"; + public override Color SummaryBackgroundColor => Colors.Salmon; + public override Color SummaryTextColor => Colors.Black; + public override BlockItemOrdering SortOrder => BlockItemOrdering.SynthesisedItem; + } +} diff --git a/Filtration.ObjectModel/Enums/BlockItemOrdering.cs b/Filtration.ObjectModel/Enums/BlockItemOrdering.cs index a9fcd08..a9ec310 100644 --- a/Filtration.ObjectModel/Enums/BlockItemOrdering.cs +++ b/Filtration.ObjectModel/Enums/BlockItemOrdering.cs @@ -12,6 +12,9 @@ namespace Filtration.ObjectModel.Enums Corrupted, ElderItem, ShaperItem, + SynthesisedItem, + FracturedItem, + AnyEnchantment, MapTier, ShapedMap, ElderMap, @@ -27,6 +30,7 @@ namespace Filtration.ObjectModel.Enums BaseType, Prophecy, HasExplicitMod, + HasEnchantment, SetTextColor, SetBackgroundColor, SetBorderColor, diff --git a/Filtration.ObjectModel/Filtration.ObjectModel.csproj b/Filtration.ObjectModel/Filtration.ObjectModel.csproj index 04b58ef..b6fd981 100644 --- a/Filtration.ObjectModel/Filtration.ObjectModel.csproj +++ b/Filtration.ObjectModel/Filtration.ObjectModel.csproj @@ -81,8 +81,11 @@ + + + @@ -95,6 +98,7 @@ + diff --git a/Filtration.Parser/Services/ItemFilterBlockTranslator.cs b/Filtration.Parser/Services/ItemFilterBlockTranslator.cs index 21d8d8c..372e766 100644 --- a/Filtration.Parser/Services/ItemFilterBlockTranslator.cs +++ b/Filtration.Parser/Services/ItemFilterBlockTranslator.cs @@ -184,6 +184,21 @@ namespace Filtration.Parser.Services AddBooleanItemToBlockItems(block, trimmedLine); break; } + case "SynthesisedItem": + { + AddBooleanItemToBlockItems(block, trimmedLine); + break; + } + case "FracturedItem": + { + AddBooleanItemToBlockItems(block, trimmedLine); + break; + } + case "AnyEnchantment": + { + AddBooleanItemToBlockItems(block, trimmedLine); + break; + } case "ShapedMap": { AddBooleanItemToBlockItems(block, trimmedLine); @@ -317,6 +332,11 @@ namespace Filtration.Parser.Services AddStringListItemToBlockItems(block, trimmedLine); break; } + case "HasEnchantment": + { + AddStringListItemToBlockItems(block, trimmedLine); + break; + } case "ElderMap": { AddBooleanItemToBlockItems(block, trimmedLine); diff --git a/Filtration/Filtration.csproj b/Filtration/Filtration.csproj index cd85216..24ea0ba 100644 --- a/Filtration/Filtration.csproj +++ b/Filtration/Filtration.csproj @@ -463,6 +463,7 @@ Settings.settings True + diff --git a/Filtration/Properties/Resources.Designer.cs b/Filtration/Properties/Resources.Designer.cs index 2ac594b..013aaa0 100644 --- a/Filtration/Properties/Resources.Designer.cs +++ b/Filtration/Properties/Resources.Designer.cs @@ -388,7 +388,18 @@ namespace Filtration.Properties { return ResourceManager.GetString("Prophecies", resourceCulture); } } - + + /// + /// Looks up a localized string similar to Enchantment Decree of Force. + /// + internal static string Enchantments + { + get + { + return ResourceManager.GetString("Enchantments", resourceCulture); + } + } + /// /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. /// diff --git a/Filtration/Properties/Resources.resx b/Filtration/Properties/Resources.resx index 89e5bc4..87f7089 100644 --- a/Filtration/Properties/Resources.resx +++ b/Filtration/Properties/Resources.resx @@ -214,4 +214,7 @@ ..\Resources\Prophecies.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + ..\Resources\Enchantments.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + \ No newline at end of file diff --git a/Filtration/Resources/Enchantments.txt b/Filtration/Resources/Enchantments.txt new file mode 100644 index 0000000..c9e3ed4 --- /dev/null +++ b/Filtration/Resources/Enchantments.txt @@ -0,0 +1 @@ +Enchantment Decree of Force \ No newline at end of file diff --git a/Filtration/Resources/ItemBaseTypes.txt b/Filtration/Resources/ItemBaseTypes.txt index adf0281..018f155 100644 --- a/Filtration/Resources/ItemBaseTypes.txt +++ b/Filtration/Resources/ItemBaseTypes.txt @@ -22,6 +22,7 @@ Alira's Amulet Alleyways Map Allflame Alloyed Spiked Shield +Alone in the Darkness Alteration Shard Amber Amulet Ambush Boots @@ -76,6 +77,7 @@ Armageddon Brand Arming Axe Armourer's Scrap Armoury Map +Arrogance of the Vaal Arsenal Map Ashen Wood Map Ashscale Talisman @@ -96,6 +98,7 @@ Avian Twins Talisman Awl Baleful Gem Ball Lightning +Bane Bane of the Loyal Barbed Club Barbute Helmet @@ -172,6 +175,7 @@ Bone Offering Bone Spirit Shield Bonechill Support Bonespire Talisman +Boon of Justice Boon of the First Ones Boot Blade Boot Knife @@ -389,6 +393,7 @@ Dagger Axe Damage on Full Life Support Dark Forest Map Dark Pact +Dark Temptation Darkwood Sceptre Deadhand Talisman Deadly Ailments Support @@ -450,6 +455,7 @@ Diamond Ring Dig Map Discharge Discipline +Divine Ire Divine Life Flask Divine Mana Flask Divine Orb @@ -510,6 +516,7 @@ Enchanted Fossil Encrusted Fossil Endurance Charge on Melee Stun Support Enduring Cry +Energy Leech Support Enfeeble Engineer's Orb Engineer's Shard @@ -820,7 +827,9 @@ Infernal Axe Infernal Blow Infernal Sword Infested Valley Map +Infused Channelling Support Innervate Support +Intensify Support Invasion Leaguestone Inya's Key Iron Circlet @@ -949,6 +958,7 @@ Majestic Plate Malachai's Entrails Malachai's Heart Malachai's Lungs +Malevolence Malformation Map Maligaro's Map Maligaro's Spike @@ -1009,6 +1019,7 @@ Molten Shell Molten Strike Monkey Paw Talisman Monkey Twins Talisman +Monochrome Moon Orb Moon Staff Moon Temple Map @@ -1183,6 +1194,7 @@ Prophet Crown Prosperity Puncture Punishment +Purifying Flame Purity of Elements Purity of Fire Purity of Ice @@ -1295,6 +1307,7 @@ Saint's Hauberk Saintly Chainmail Sallet Sambar Sceptre +Sambodhi's Vow Samite Gloves Samite Helmet Samite Slippers @@ -1357,6 +1370,7 @@ Serpentscale Gauntlets Serrated Arrow Quiver Serrated Foil Serrated Fossil +Seven Years Bad Luck Shabby Jerkin Shackled Boots Shadow Axe @@ -1457,6 +1471,7 @@ Soldier Helmet Soldier's Brigandine Sorcerer Boots Sorcerer Gloves +Soulrend Sovereign Spiked Shield Spark Sparkling Claw @@ -1628,6 +1643,7 @@ The Garish Power The Gemcutter The Gentleman The Gladiator +The Golden Era The Hale Heart The Harvester The Hermit @@ -1642,19 +1658,24 @@ The Inventor The Iron Bard The Jester The Jeweller's Boon +The Journey The King's Blade The King's Heart +The Landing The Last One Standing The Lich The Life Thief The Lion The Lord in Black +The Lord of Celebration The Lover The Lunaris Priestess +The Mad King The Master The Master Artisan The Mayor The Mercenary +The Messenger The Metalsmith's Gift The Nurse The Oath @@ -1684,6 +1705,7 @@ The Samurai's Eye The Scarred Meadow The Scavenger The Scholar +The Seeker The Sephirot The Shaper's Key The Shaper's Realm @@ -1800,6 +1822,7 @@ Underground River Map Underground Sea Map Undying Flesh Talisman Unearth +Unleash Support Unset Ring Unshaping Orb Ursine Pelt @@ -1924,6 +1947,7 @@ Warlord's Mark Waste Pool Map Wasteland Map Waterways Map +Wave of Conviction Waxed Garb Wealth and Power Weeping Essence @@ -1978,4 +2002,5 @@ Yriel's Key Zealot Boots Zealot Gloves Zealot Helmet +Zealotry Zodiac Leather \ No newline at end of file diff --git a/Filtration/Services/StaticDataService.cs b/Filtration/Services/StaticDataService.cs index 5591306..1e73f42 100644 --- a/Filtration/Services/StaticDataService.cs +++ b/Filtration/Services/StaticDataService.cs @@ -12,6 +12,7 @@ namespace Filtration.Services IEnumerable ItemClasses { get; } IEnumerable ItemMods { get; } IEnumerable Prophecies { get; } + IEnumerable Enchantments { get; } } internal class StaticDataService : IStaticDataService @@ -29,12 +30,15 @@ namespace Filtration.Services public IEnumerable Prophecies { get; private set; } + public IEnumerable Enchantments { get; private set; } + private void PopulateStaticData() { ItemBaseTypes = new LineReader(() => new StringReader(Resources.ItemBaseTypes)).ToList(); ItemClasses = new LineReader(() => new StringReader(Resources.ItemClasses)).ToList(); ItemMods = new LineReader(() => new StringReader(Resources.ItemMods)).ToList(); Prophecies = new LineReader(() => new StringReader(Resources.Prophecies)).ToList(); + Enchantments = new LineReader(() => new StringReader(Resources.Enchantments)).ToList(); } } } diff --git a/Filtration/UserControls/BlockItemControl.xaml b/Filtration/UserControls/BlockItemControl.xaml index 5be1988..f6d77e6 100644 --- a/Filtration/UserControls/BlockItemControl.xaml +++ b/Filtration/UserControls/BlockItemControl.xaml @@ -87,6 +87,11 @@ + + + + + diff --git a/Filtration/ViewModels/DesignTime/DesignTimeItemFilterBlockViewModel.cs b/Filtration/ViewModels/DesignTime/DesignTimeItemFilterBlockViewModel.cs index 817a01d..47f9c90 100644 --- a/Filtration/ViewModels/DesignTime/DesignTimeItemFilterBlockViewModel.cs +++ b/Filtration/ViewModels/DesignTime/DesignTimeItemFilterBlockViewModel.cs @@ -131,12 +131,16 @@ namespace Filtration.ViewModels.DesignTime typeof (CorruptedBlockItem), typeof (ElderItemBlockItem), typeof (ShaperItemBlockItem), + typeof (SynthesisedItemBlockItem), + typeof (FracturedItemBlockItem), + typeof (AnyEnchantmentBlockItem), typeof (MapTierBlockItem), typeof (ShapedMapBlockItem), typeof (ElderMapBlockItem), typeof (GemLevelBlockItem), typeof (StackSizeBlockItem), - typeof (HasExplicitModBlockItem) + typeof (HasExplicitModBlockItem), + typeof (HasEnchantmentBlockItem) }; public List AudioVisualBlockItemTypesAvailable { get; } public Color DisplayTextColor => Colors.Red; diff --git a/Filtration/ViewModels/ItemFilterBlockViewModel.cs b/Filtration/ViewModels/ItemFilterBlockViewModel.cs index 7c8053b..32fc0de 100644 --- a/Filtration/ViewModels/ItemFilterBlockViewModel.cs +++ b/Filtration/ViewModels/ItemFilterBlockViewModel.cs @@ -208,6 +208,8 @@ namespace Filtration.ViewModels public IEnumerable AutocompleteItemMods => _staticDataService.ItemMods; + public IEnumerable AutocompleteEnchantments => _staticDataService.Enchantments; + public List BlockItemTypesAvailable => new List { typeof (ItemLevelBlockItem), @@ -226,12 +228,16 @@ namespace Filtration.ViewModels typeof (CorruptedBlockItem), typeof (ElderItemBlockItem), typeof (ShaperItemBlockItem), + typeof (SynthesisedItemBlockItem), + typeof (FracturedItemBlockItem), + typeof (AnyEnchantmentBlockItem), typeof (MapTierBlockItem), typeof (ShapedMapBlockItem), typeof (ElderMapBlockItem), typeof (GemLevelBlockItem), typeof (StackSizeBlockItem), - typeof (HasExplicitModBlockItem) + typeof (HasExplicitModBlockItem), + typeof (HasEnchantmentBlockItem) }; public List AudioVisualBlockItemTypesAvailable => new List From 717a0a83a954a78fe205af0019016cf22703427a Mon Sep 17 00:00:00 2001 From: Ben Wallis Date: Mon, 18 Mar 2019 17:48:16 +0000 Subject: [PATCH 5/7] * Bumped version to 1.2.0 * Added enchantments to Enchantments.txt * Updated nuspec --- Filtration/Filtration.nuspec | 26 +- Filtration/Properties/AssemblyInfo.cs | 4 +- Filtration/Resources/Enchantments.txt | 1108 ++++++++++++++++++++++++- 3 files changed, 1115 insertions(+), 23 deletions(-) diff --git a/Filtration/Filtration.nuspec b/Filtration/Filtration.nuspec index e746602..5ea06d8 100644 --- a/Filtration/Filtration.nuspec +++ b/Filtration/Filtration.nuspec @@ -8,26 +8,12 @@ Ben Wallis A Path of Exile loot filter script editor false - Copyright 2018 - * Added support for new Prophecies block item type -* Added Betrayal League Item Base Types and Item Classes to static data -* All open filter scripts are now remembered on exit and reopened when the application is started rather than just the last opened one (#95) -* Filter sections are once again now expanded by default when scripts are opened, unless the new "Auto-expand all sections when opening scripts" setting is disabled -* A new Clear Styles button has been added which removes all styles from the selected block (#96) -* New buttons for adding/removing DisableDropSound from selected blocks have been added (#110) -* Added a new indicator for blocks with a DisableDropSound block present (#113) -* The Enable/Disable Block toggle button is now visible on both the Regular Block Items and Appearance Block Items views -* When there are too many block items to fit horizontally in a block a horizontal scrollbar will now appear -* Fixed an issue with MinimapIcon block items causing an "Unused Theme Components" message box to erroneously be shown when saving (#116) -* Fixed the Advanced tab in the Color Picker in the Theme Editor not being clickable (#115) -* Fixed the previously incorrect handling of DisableDropSound as a true/false value when in fact it is enabled/disabled purely by its presence or lack thereof in a block (#111) -* Fixed the application freezing for a long period of time when Ctrl+A (Select All) is performed -* Fixed the Switch to Appearance/Regular Block Items text overlapping block items -* Fixed theme saving (blank theme files were being saved) (#83) -* Fixed checkboxes in Block Group Browser (#97) -* Fixed the Select Path of Exile data directory dialog appearing after every upgrade (#94) -* Fixed an issue where custom sounds were only populated from the default Path of Exile data directory rather than the configured directory -* Clean installs no longer prompt to select the Path of Exile data directory if the default directory exists + Copyright 2019 + * Added support for AnyEnchantment block item type +* Added support for HasEnchantment block item type +* Added support for FracturedItem block item type +* Added support for SynthesisedItem block item type +* Fixed parsing of disabled Show/Hide blocks with extra information following the Show/Hide keyword (#133) diff --git a/Filtration/Properties/AssemblyInfo.cs b/Filtration/Properties/AssemblyInfo.cs index af2e9f7..edcb61e 100644 --- a/Filtration/Properties/AssemblyInfo.cs +++ b/Filtration/Properties/AssemblyInfo.cs @@ -10,8 +10,8 @@ using System.Runtime.CompilerServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("1.1.0")] -[assembly: AssemblyInformationalVersion("1.1.0")] +[assembly: AssemblyVersion("1.2.0")] +[assembly: AssemblyInformationalVersion("1.2.0")] [assembly: InternalsVisibleTo("Filtration.Tests")] [assembly: InternalsVisibleTo("Filtration.ItemFilterPreview.Tests")] diff --git a/Filtration/Resources/Enchantments.txt b/Filtration/Resources/Enchantments.txt index c9e3ed4..6bbeb21 100644 --- a/Filtration/Resources/Enchantments.txt +++ b/Filtration/Resources/Enchantments.txt @@ -1 +1,1107 @@ -Enchantment Decree of Force \ No newline at end of file +Armageddon Brand Attached Target Fire Penetration 1 +Armageddon Brand Attached Target Fire Penetration 2 +Armageddon Brand Repeat Frequency 1 +Armageddon Brand Repeat Frequency 2 +Enchantment Abyssal Cry Damage 1 +Enchantment Abyssal Cry Damage 2 +Enchantment Abyssal Cry Duration 1 +Enchantment Abyssal Cry Duration 2 +Enchantment Ancestor Warchief Area Of Effect 1 +Enchantment Ancestor Warchief Area Of Effect 2 +Enchantment Ancestor Warchief Melee Damage 1 +Enchantment Ancestor Warchief Melee Damage 2 +Enchantment Ancestral Protector Attack Speed 1 +Enchantment Ancestral Protector Attack Speed 2 +Enchantment Ancestral Protector Damage 1 +Enchantment Ancestral Protector Damage 2 +Enchantment Ancestral Protector Placement Speed 1 +Enchantment Ancestral Protector Placement Speed 2 +Enchantment Ancestral Protector Resistances 1 +Enchantment Ancestral Protector Resistances 2 +Enchantment Ancestral Warchief Damage 1 +Enchantment Ancestral Warchief Damage 2 +Enchantment Anger Reservation 1 +Enchantment Anger Reservation 2 +Enchantment Animate Guardian Damage 1 +Enchantment Animate Guardian Damage 2 +Enchantment Animate Guardian Elemental Resistances 1 +Enchantment Animate Guardian Elemental Resistances 2 +Enchantment Animate Weapon Chance To Create Additional Copy 1 +Enchantment Animate Weapon Chance To Create Additional Copy 2 +Enchantment Animate Weapon Damage 1 +Enchantment Animate Weapon Damage 2 +Enchantment Animate Weapon Duration 1 +Enchantment Animate Weapon Duration 2 +Enchantment Arc Damage 1 +Enchantment Arc Damage 2 +Enchantment Arc Damage Per Chain 1 +Enchantment Arc Damage Per Chain 2 +Enchantment Arc Num Of Additional Projectiles In Chain 1 +Enchantment Arc Shock Chance 1 +Enchantment Arc Shock Chance 2 +Enchantment Arctic Armour Buff Effect 1 +Enchantment Arctic Armour Buff Effect 2 +Enchantment Arctic Armour Mana Reservation 1 +Enchantment Arctic Armour Mana Reservation 2 +Enchantment Arctic Breath Area Of Effect 1 +Enchantment Arctic Breath Area Of Effect 2 +Enchantment Arctic Breath Chilling Area Movement Velocity 1 +Enchantment Arctic Breath Damage 1 +Enchantment Arctic Breath Damage 2 +Enchantment Arctic Breath Duration 1 +Enchantment Arctic Breath Duration 2 +Enchantment Armageddon Brand Damage 1 +Enchantment Armageddon Brand Damage 2 +Enchantment Assassins Mark Curse Effect 1 +Enchantment Assassins Mark Curse Effect 2 +Enchantment Assassins Mark Duration 1 +Enchantment Assassins Mark Duration 2 +Enchantment Attack and Cast Speed 1 +Enchantment Attack and Cast Speed 2 +Enchantment Attack and Cast Speed 3 +Enchantment Attack Dodge 1 +Enchantment Attack Dodge 2 +Enchantment Attack Dodge 3 +Enchantment Ball Lightning Additional Projectiles 1 +Enchantment Ball Lightning Area Of Effect 1 +Enchantment Ball Lightning Area Of Effect 2 +Enchantment Ball Lightning Damage 1 +Enchantment Ball Lightning Damage 2 +Enchantment Bane Area Of Effect 1 +Enchantment Bane Area Of Effect 2 +Enchantment Bane Damage 1 +Enchantment Bane Damage 2 +Enchantment Bane Linked Curse Effect 1 +Enchantment Bane Linked Curse Effect 2 +Enchantment Barrage Attack Speed 1 +Enchantment Barrage Attack Speed 2 +Enchantment Barrage Damage 1 +Enchantment Barrage Damage 2 +Enchantment Barrage Num Of Additional Projectiles 1 +Enchantment Bear Trap Cooldown Speed 1 +Enchantment Bear Trap Cooldown Speed 2 +Enchantment Bear Trap Damage 1 +Enchantment Bear Trap Damage 2 +Enchantment Bear Trap Damage Taken 1 +Enchantment Bear Trap Damage Taken 2 +Enchantment Blade Flurry Area Of Effect 1 +Enchantment Blade Flurry Area Of Effect 2 +Enchantment Blade Flurry Damage 1 +Enchantment Blade Flurry Damage 2 +Enchantment Blade Flurry Dodge Per Stack 1 +Enchantment Blade Flurry Dodge Per Stack 2 +Enchantment Blade Vortex Area Of Effect 1 +Enchantment Blade Vortex Area Of Effect 2 +Enchantment Blade Vortex Crit Multi Per Blade 1 +Enchantment Blade Vortex Crit Multi Per Blade 2 +Enchantment Blade Vortex Damage 1 +Enchantment Blade Vortex Damage 2 +Enchantment Blade Vortex Duration 1 +Enchantment Blade Vortex Duration 2 +Enchantment Bladefall Additional Volley +Enchantment Bladefall Area Of Effect 1 +Enchantment Bladefall Area Of Effect 2 +Enchantment Bladefall Critical Strike Chance 1 +Enchantment Bladefall Critical Strike Chance 2 +Enchantment Bladefall Damage 1 +Enchantment Bladefall Damage 2 +Enchantment Blast Rain Additional Blast 1 +Enchantment Blast Rain Additional Blast 2 +Enchantment Blast Rain Area Of Effect 1 +Enchantment Blast Rain Area Of Effect 2 +Enchantment Blast Rain Damage 1 +Enchantment Blast Rain Damage 2 +Enchantment Blight Area Of Effect 1 +Enchantment Blight Area Of Effect 2 +Enchantment Blight Damage 1 +Enchantment Blight Damage 2 +Enchantment Blight Secondary Skill Duration 1 +Enchantment Blight Secondary Skill Duration 2 +Enchantment Blink Arrow Attack Speed 1 +Enchantment Blink Arrow Attack Speed 2 +Enchantment Blink Arrow Cooldown Speed 1 +Enchantment Blink Arrow Cooldown Speed 2 +Enchantment Blink Arrow Damage 1 +Enchantment Blink Arrow Damage 2 +Enchantment Blood Rage Attack Speed 1 +Enchantment Blood Rage Attack Speed 2 +Enchantment Blood Rage Frenzy On Kill 1 +Enchantment Blood Rage Frenzy On Kill 2 +Enchantment Body Swap Cast Speed 1 +Enchantment Body Swap Cast Speed 2 +Enchantment Body Swap Damage 1 +Enchantment Body Swap Damage 2 +Enchantment Bone Offering Block Chance 1 +Enchantment Bone Offering Block Chance 2 +Enchantment Bone Offering Duration 1 +Enchantment Bone Offering Duration 2 +Enchantment Burning Arrow Damage 1 +Enchantment Burning Arrow Damage 2 +Enchantment Burning Arrow Ignite Chance 1 +Enchantment Burning Arrow Ignite Chance 2 +Enchantment Burning Arrow Physical Damage Percent To Add As Fire Damage 1 +Enchantment Burning Arrow Physical Damage Percent To Add As Fire Damage 2 +Enchantment Caustic Arrow Area Of Effect 1 +Enchantment Caustic Arrow Area Of Effect 2 +Enchantment Caustic Arrow Damage 1 +Enchantment Caustic Arrow Damage 2 +Enchantment Caustic Arrow Duration 1 +Enchantment Caustic Arrow Duration 2 +Enchantment Caustic Arrow Wither On Hit 1 +Enchantment Caustic Arrow Wither On Hit 2 +Enchantment Chaos Damage 1 +Enchantment Chaos Damage 2 +Enchantment Chaos Damage 3 +Enchantment Chaos Golem Elemental Resistances 1 +Enchantment Chaos Golem Elemental Resistances 2 +Enchantment Chaos Golem Percent Additional Physical Damage Reduction 1 +Enchantment Chaos Golem Percent Additional Physical Damage Reduction 2 +Enchantment Charged Dash Damage 1 +Enchantment Charged Dash Damage 2 +Enchantment Charged Dash Dodge When Finished Channelling 1 +Enchantment Charged Dash Dodge When Finished Channelling 2 +Enchantment Charged Dash Movement Speed 1 +Enchantment Charged Dash Movement Speed 2 +Enchantment Charged Dash Radius Final Explosion 1 +Enchantment Charged Dash Radius Final Explosion 2 +Enchantment Clarity Mana Reservation 1 +Enchantment Clarity Mana Reservation 2 +Enchantment Cleave Area Of Effect 1 +Enchantment Cleave Area Of Effect 2 +Enchantment Cleave Attack Speed 1 +Enchantment Cleave Attack Speed 2 +Enchantment Cleave Damage 1 +Enchantment Cleave Damage 2 +Enchantment Cold Damage 1 +Enchantment Cold Damage 2 +Enchantment Cold Damage 3 +Enchantment Cold Snap Area Of Effect 1 +Enchantment Cold Snap Area Of Effect 2 +Enchantment Cold Snap Cooldown Speed 1 +Enchantment Cold Snap Cooldown Speed 2 +Enchantment Cold Snap Damage 1 +Enchantment Cold Snap Damage 2 +Enchantment Commandment of Blades +Enchantment Commandment of Flames +Enchantment Commandment of Force +Enchantment Commandment of Frost +Enchantment Commandment of Fury +Enchantment Commandment of Inferno +Enchantment Commandment of Ire +Enchantment Commandment of Light +Enchantment Commandment of Reflection +Enchantment Commandment of Spite +Enchantment Commandment of the Grave +Enchantment Commandment of the Tempest +Enchantment Commandment of Thunder +Enchantment Commandment of War +Enchantment Commandment of Winter +Enchantment Conductivity Curse Effect 1 +Enchantment Conductivity Curse Effect 2 +Enchantment Conductivity Duration 1 +Enchantment Conductivity Duration 2 +Enchantment Consecrated Path Area Of Effect 1 +Enchantment Consecrated Path Area Of Effect 2 +Enchantment Consecrated Path Damage 1 +Enchantment Consecrated Path Damage 2 +Enchantment Consecrated Path Range 1 +Enchantment Consecrated Path Range 2 +Enchantment Contagion Damage 1 +Enchantment Contagion Damage 2 +Enchantment Contagion Duration 1 +Enchantment Contagion Duration 2 +Enchantment Contagion Radius 1 +Enchantment Contagion Radius 2 +Enchantment Conversion Trap Cooldown Speed 1 +Enchantment Conversion Trap Cooldown Speed 2 +Enchantment Conversion Trap Damage 1 +Enchantment Conversion Trap Damage 2 +Enchantment Convocation Cooldown Speed 1 +Enchantment Convocation Cooldown Speed 2 +Enchantment Convocation Life Regeneration 1 +Enchantment Convocation Life Regeneration 2 +Enchantment Cremation Cast Speed 1 +Enchantment Cremation Cast Speed 2 +Enchantment Cremation Damage 1 +Enchantment Cremation Damage 2 +Enchantment Cremation Maximum Geysers 1 +Enchantment Critical Strike Chance 1 +Enchantment Critical Strike Chance 2 +Enchantment Critical Strike Chance 3 +Enchantment Cyclone Attack Speed 1 +Enchantment Cyclone Attack Speed 2 +Enchantment Cyclone Damage 1 +Enchantment Cyclone Damage 2 +Enchantment Dack Pact Cast Speed 1 +Enchantment Dack Pact Cast Speed 2 +Enchantment Dark Pact Area Of Effect 1 +Enchantment Dark Pact Area Of Effect 2 +Enchantment Dark Pact Damage 1 +Enchantment Dark Pact Damage 2 +Enchantment Decoy Totem Area Of Effect 1 +Enchantment Decoy Totem Area Of Effect 2 +Enchantment Decoy Totem Life 1 +Enchantment Decoy Totem Life 2 +Enchantment Decree of Blades +Enchantment Decree of Flames +Enchantment Decree of Force +Enchantment Decree of Frost +Enchantment Decree of Fury +Enchantment Decree of Inferno +Enchantment Decree of Ire +Enchantment Decree of Light +Enchantment Decree of Reflection +Enchantment Decree of Spite +Enchantment Decree of the Grave +Enchantment Decree of the Tempest +Enchantment Decree of Thunder +Enchantment Decree of War +Enchantment Decree of Winter +Enchantment Desecrate Additional Corpse 1 +Enchantment Desecrate Additional Corpse 2 +Enchantment Desecrate Cooldown Speed 1 +Enchantment Desecrate Cooldown Speed 2 +Enchantment Despair Duration 1 +Enchantment Despair Duration 2 +Enchantment Despair Effect 1 +Enchantment Despair Effect 2 +Enchantment Determination Mana Reservation 1 +Enchantment Determination Mana Reservation 2 +Enchantment Detonate Dead Area Of Effect 1 +Enchantment Detonate Dead Area Of Effect 2 +Enchantment Detonate Dead Damage 1 +Enchantment Detonate Dead Damage 2 +Enchantment Detonate Dead Percent Chance To Detonate Additional Corpse 1 +Enchantment Detonate Dead Percent Chance To Detonate Additional Corpse 2 +Enchantment Devouring Totem Leech Per Second 1 +Enchantment Devouring Totem Leech Per Second 2 +Enchantment Devouring Totem Percent Chance To Consume Additional Corpse 1 +Enchantment Devouring Totem Percent Chance To Consume Additional Corpse 2 +Enchantment Discharge Area of Effect 1 +Enchantment Discharge Area of Effect 2 +Enchantment Discharge Consume Charges 1 +Enchantment Discharge Consume Charges 2 +Enchantment Discharge Damage 1 +Enchantment Discharge Damage 2 +Enchantment Discipline Mana Reservation 1 +Enchantment Discipline Mana Reservation 2 +Enchantment Divine Ire Beam Width 1 +Enchantment Divine Ire Beam Width 2 +Enchantment Divine Ire Damage 1 +Enchantment Divine Ire Damage 2 +Enchantment Divine Ire Number Of Additional Nearby Enemies To Zap 1 +Enchantment Divine Ire Number Of Additional Nearby Enemies To Zap 2 +Enchantment Dominating Blow Additional Magic 1 +Enchantment Dominating Blow Additional Magic 2 +Enchantment Dominating Blow Additional Rare 1 +Enchantment Dominating Blow Duration 1 +Enchantment Dominating Blow Duration 2 +Enchantment Double Slash Added Phys To Bleeding 1 +Enchantment Double Slash Added Phys To Bleeding 2 +Enchantment Double Slash Area Of Effect 1 +Enchantment Double Slash Area Of Effect 2 +Enchantment Double Slash Critical Strikes 1 +Enchantment Double Slash Critical Strikes 2 +Enchantment Double Strike Attack Speed 1 +Enchantment Double Strike Attack Speed 2 +Enchantment Double Strike Critical Strike Chance 1 +Enchantment Double Strike Critical Strike Chance 2 +Enchantment Double Strike Damage 1 +Enchantment Double Strike Damage 2 +Enchantment Double Strike Double Damage Vs Bleeding 1 +Enchantment Double Strike Double Damage Vs Bleeding 2 +Enchantment Dread Banner Effect 1 +Enchantment Dread Banner Effect 2 +Enchantment Dual Strike Attack Speed 1 +Enchantment Dual Strike Attack Speed 2 +Enchantment Dual Strike Critical Strike Chance 1 +Enchantment Dual Strike Critical Strike Chance 2 +Enchantment Dual Strike Damage 1 +Enchantment Dual Strike Damage 2 +Enchantment Earthquake Area Of Effect 1 +Enchantment Earthquake Area Of Effect 2 +Enchantment Earthquake Damage 1 +Enchantment Earthquake Damage 2 +Enchantment Earthquake Duration 1 +Enchantment Earthquake Duration 2 +Enchantment Edict of Blades +Enchantment Edict of Flames +Enchantment Edict of Force +Enchantment Edict of Frost +Enchantment Edict of Fury +Enchantment Edict of Inferno +Enchantment Edict of Ire +Enchantment Edict of Light +Enchantment Edict of Reflection +Enchantment Edict of Spite +Enchantment Edict of the Grave +Enchantment Edict of the Tempest +Enchantment Edict of Thunder +Enchantment Edict of War +Enchantment Edict of Winter +Enchantment Elemental Hit Attack Speed 1 +Enchantment Elemental Hit Attack Speed 2 +Enchantment Elemental Hit Chance To Freeze Shock Ignite 1 +Enchantment Elemental Hit Chance To Freeze Shock Ignite 2 +Enchantment Elemental Hit Damage 1 +Enchantment Elemental Hit Damage 2 +Enchantment Elemental Penetration 1 +Enchantment Elemental Penetration 2 +Enchantment Elemental Penetration 3 +Enchantment Elemental Weakness Curse Effect 1 +Enchantment Elemental Weakness Curse Effect 2 +Enchantment Elemental Weakness Duration 1 +Enchantment Elemental Weakness Duration 2 +Enchantment Enduring Cry Cooldown Speed 1 +Enchantment Enduring Cry Cooldown Speed 2 +Enchantment Enduring Cry Life Regeneration 1 +Enchantment Enduring Cry Life Regeneration 2 +Enchantment Enfeeble Curse Effect 1 +Enchantment Enfeeble Curse Effect 2 +Enchantment Enfeeble Duration 1 +Enchantment Enfeeble Duration 2 +Enchantment Essence Drain Damage 1 +Enchantment Essence Drain Damage 2 +Enchantment Essence Drain Duration 1 +Enchantment Essence Drain Duration 2 +Enchantment Ethereal Knives Damage 1 +Enchantment Ethereal Knives Damage 2 +Enchantment Ethereal Knives Number Of Targets To Pierce 1 +Enchantment Ethereal Knives Projectile Speed 1 +Enchantment Ethereal Knives Projectile Speed 2 +Enchantment Explosive Arrow Area Of Effect 1 +Enchantment Explosive Arrow Area Of Effect 2 +Enchantment Explosive Arrow Attack Speed 1 +Enchantment Explosive Arrow Attack Speed 2 +Enchantment Explosive Arrow Damage 1 +Enchantment Explosive Arrow Damage 2 +Enchantment Fire Beam Cast Speed 1 +Enchantment Fire Beam Cast Speed 2 +Enchantment Fire Beam Length 1 +Enchantment Fire Beam Length 2 +Enchantment Fire Damage 1 +Enchantment Fire Damage 2 +Enchantment Fire Damage 3 +Enchantment Fire Nova Mine Cast Speed 1 +Enchantment Fire Nova Mine Cast Speed 2 +Enchantment Fire Nova Mine Damage 1 +Enchantment Fire Nova Mine Damage 2 +Enchantment Fire Nova Mine Num Of Additional Repeats 1 +Enchantment Fire Nova Mine Num Of Additional Repeats 2 +Enchantment Fire Trap Burning Damage 1 +Enchantment Fire Trap Burning Damage 2 +Enchantment Fire Trap Burning Ground Duration 1 +Enchantment Fire Trap Burning Ground Duration 2 +Enchantment Fire Trap Damage 1 +Enchantment Fire Trap Damage 2 +Enchantment Fireball Cast Speed 1 +Enchantment Fireball Cast Speed 2 +Enchantment Fireball Damage 1 +Enchantment Fireball Damage 2 +Enchantment Fireball Ignite Chance 1 +Enchantment Fireball Ignite Chance 2 +Enchantment Firestorm Damage 1 +Enchantment Firestorm Damage 2 +Enchantment Firestorm Duration 1 +Enchantment Firestorm Duration 2 +Enchantment Firestorm Explosion Area Of Effect 1 +Enchantment Firestorm Explosion Area Of Effect 2 +Enchantment Flame Dash Cooldown Speed 1 +Enchantment Flame Dash Cooldown Speed 2 +Enchantment Flame Dash Damage 1 +Enchantment Flame Dash Damage 2 +Enchantment Flame Golem Elemental Resistances 1 +Enchantment Flame Golem Elemental Resistances 2 +Enchantment Flame Golem Granted Buff Effect 1 +Enchantment Flame Golem Granted Buff Effect 2 +Enchantment Flame Surge Critical Strike Chance 1 +Enchantment Flame Surge Critical Strike Chance 2 +Enchantment Flame Surge Damage 1 +Enchantment Flame Surge Damage 2 +Enchantment Flame Surge Vs Burning Enemies 1 +Enchantment Flame Surge Vs Burning Enemies 2 +Enchantment Flame Totem Consecrated Ground Enemy Damage Taken 1 +Enchantment Flame Totem Consecrated Ground Enemy Damage Taken 2 +Enchantment Flame Totem Damage 1 +Enchantment Flame Totem Damage 2 +Enchantment Flame Totem Num Of Additional Projectiles 1 +Enchantment Flame Totem Num Of Additional Projectiles 2 +Enchantment Flame Totem Projectile Speed 1 +Enchantment Flame Totem Projectile Speed 2 +Enchantment Flameblast Area Of Effect 1 +Enchantment Flameblast Area Of Effect 2 +Enchantment Flameblast Critical Strike Chance 1 +Enchantment Flameblast Critical Strike Chance 2 +Enchantment Flameblast Damage 1 +Enchantment Flameblast Damage 2 +Enchantment Flamethrower Additional Flamethrowers 1 +Enchantment Flamethrower Additional Flamethrowers 2 +Enchantment Flamethrower Trap Cast Speed 1 +Enchantment Flamethrower Trap Cast Speed 2 +Enchantment Flamethrower Trap Cooldown Speed 1 +Enchantment Flamethrower Trap Cooldown Speed 2 +Enchantment Flamethrower Trap Damage 1 +Enchantment Flamethrower Trap Damage 2 +Enchantment Flamethrower Trap Duration 1 +Enchantment Flamethrower Trap Duration 2 +Enchantment Flammability Curse Effect 1 +Enchantment Flammability Curse Effect 2 +Enchantment Flammability Duration 1 +Enchantment Flammability Duration 2 +Enchantment Flesh Offering Attack Speed 1 +Enchantment Flesh Offering Attack Speed 2 +Enchantment Flesh Offering Duration 1 +Enchantment Flesh Offering Duration 2 +Enchantment Flicker Strike Cooldown Speed 1 +Enchantment Flicker Strike Cooldown Speed 2 +Enchantment Flicker Strike Damage 1 +Enchantment Flicker Strike Damage 2 +Enchantment Flicker Strike Damage Per Frenzy Charge 1 +Enchantment Flicker Strike Damage Per Frenzy Charge 2 +Enchantment Freeze Mine Area Of Effect 1 +Enchantment Freeze Mine Area Of Effect 2 +Enchantment Freeze Mine Cold Penetration 1 +Enchantment Freeze Mine Cold Penetration 2 +Enchantment Freezing Pulse Cast Speed 1 +Enchantment Freezing Pulse Cast Speed 2 +Enchantment Freezing Pulse Damage 1 +Enchantment Freezing Pulse Damage 2 +Enchantment Freezing Pulse Projectile Speed 1 +Enchantment Freezing Pulse Projectile Speed 2 +Enchantment Frenzy Damage 1 +Enchantment Frenzy Damage 2 +Enchantment Frenzy Damage Per Frenzy Charge 1 +Enchantment Frenzy Damage Per Frenzy Charge 2 +Enchantment Frenzy Percent Chance To Gain Additional Frenzy Charge 1 +Enchantment Frenzy Percent Chance To Gain Additional Frenzy Charge 2 +Enchantment Frost Blades Damage 1 +Enchantment Frost Blades Damage 2 +Enchantment Frost Blades Projectile Speed 1 +Enchantment Frost Blades Projectile Speed 2 +Enchantment Frost Bolt Cast Speed 1 +Enchantment Frost Bolt Cast Speed 2 +Enchantment Frost Bolt Damage 1 +Enchantment Frost Bolt Damage 2 +Enchantment Frost Bolt Freeze Chance 1 +Enchantment Frost Bolt Freeze Chance 2 +Enchantment Frost Bomb Area Of Effect 1 +Enchantment Frost Bomb Area Of Effect 2 +Enchantment Frost Bomb Cooldown Speed 1 +Enchantment Frost Bomb Cooldown Speed 2 +Enchantment Frost Bomb Damage 1 +Enchantment Frost Bomb Damage 2 +Enchantment Frost Bomb Increased Duration 1 +Enchantment Frost Bomb Increased Duration 2 +Enchantment Frost Fury Additional Max Number Of Stages 1 +Enchantment Frost Fury Area Of Effect Per Stage 1 +Enchantment Frost Fury Area Of Effect Per Stage 2 +Enchantment Frost Wall Cooldown Speed 1 +Enchantment Frost Wall Cooldown Speed 2 +Enchantment Frost Wall Duration 1 +Enchantment Frost Wall Duration 2 +Enchantment Frostbite Curse Effect 1 +Enchantment Frostbite Curse Effect 2 +Enchantment Frostbite Duration 1 +Enchantment Frostbite Duration 2 +Enchantment Glacial Cascade Area Of Effect 1 +Enchantment Glacial Cascade Area Of Effect 2 +Enchantment Glacial Cascade Damage 1 +Enchantment Glacial Cascade Damage 2 +Enchantment Glacial Cascade Physical Damage Percent To Convert To Cold 1 +Enchantment Glacial Cascade Physical Damage Percent To Convert To Cold 2 +Enchantment Glacial Hammer Damage 1 +Enchantment Glacial Hammer Damage 2 +Enchantment Glacial Hammer Freeze Chance 1 +Enchantment Glacial Hammer Freeze Chance 2 +Enchantment Glacial Hammer Physical Damage Percent To Add As Cold Damage 1 +Enchantment Glacial Hammer Physical Damage Percent To Add As Cold Damage 2 +Enchantment Grace Mana Reservation 1 +Enchantment Grace Mana Reservation 2 +Enchantment Ground Slam Angle 1 +Enchantment Ground Slam Angle 2 +Enchantment Ground Slam Area Of Effect 1 +Enchantment Ground Slam Area Of Effect 2 +Enchantment Ground Slam Damage 1 +Enchantment Ground Slam Damage 2 +Enchantment Haste Mana Reservation 1 +Enchantment Haste Mana Reservation 2 +Enchantment Hatred Mana Reservation 1 +Enchantment Hatred Mana Reservation 2 +Enchantment Heavy Strike Attack Speed 1 +Enchantment Heavy Strike Attack Speed 2 +Enchantment Heavy Strike Damage 1 +Enchantment Heavy Strike Damage 2 +Enchantment Heavy Strike Double Damage 1 +Enchantment Heavy Strike Double Damage 2 +Enchantment Herald Of Agony Mana Reservation 1 +Enchantment Herald Of Agony Mana Reservation 2 +Enchantment Herald Of Agony Num Of Secondary Projectiles 1 +Enchantment Herald Of Ash Damage 1 +Enchantment Herald Of Ash Damage 2 +Enchantment Herald Of Ash Mana Reservation 1 +Enchantment Herald Of Ash Mana Reservation 2 +Enchantment Herald Of Ice Damage 1 +Enchantment Herald Of Ice Damage 2 +Enchantment Herald Of Ice Mana Reservation 1 +Enchantment Herald Of Ice Mana Reservation 2 +Enchantment Herald Of Purity Additional Minion 1 +Enchantment Herald Of Purity Mana Reservation 1 +Enchantment Herald Of Purity Mana Reservation 2 +Enchantment Herald Of Thunder Damage 1 +Enchantment Herald Of Thunder Damage 2 +Enchantment Herald Of Thunder Mana Reservation 1 +Enchantment Herald Of Thunder Mana Reservation 2 +Enchantment Holy Relic Area Of Effect 1 +Enchantment Holy Relic Area Of Effect 2 +Enchantment Holy Relic Buff Effect 1 +Enchantment Holy Relic Buff Effect 2 +Enchantment Holy Relic Damage 1 +Enchantment Holy Relic Damage 2 +Enchantment Ice Crash Area Of Effect 1 +Enchantment Ice Crash Area Of Effect 2 +Enchantment Ice Crash Damage 1 +Enchantment Ice Crash Damage 2 +Enchantment Ice Crash Physical Damage Percent To Add As Cold Damage 1 +Enchantment Ice Crash Physical Damage Percent To Add As Cold Damage 2 +Enchantment Ice Golem Elemental Resistances 1 +Enchantment Ice Golem Elemental Resistances 2 +Enchantment Ice Golem Grants Percent Additional Critical Strike Chance And +Enchantment Ice Golem Grants Percent Additional Critical Strike Chance And +Enchantment Ice Nova Area Of Effect 1 +Enchantment Ice Nova Area Of Effect 2 +Enchantment Ice Nova Damage 1 +Enchantment Ice Nova Damage 2 +Enchantment Ice Nova Freeze Chance 1 +Enchantment Ice Nova Freeze Chance 2 +Enchantment Ice Nova Minimum Chill 1 +Enchantment Ice Nova Minimum Chill 2 +Enchantment Ice Shot Area Of Effect 1 +Enchantment Ice Shot Area Of Effect 2 +Enchantment Ice Shot Damage 1 +Enchantment Ice Shot Damage 2 +Enchantment Ice Shot Duration 1 +Enchantment Ice Shot Duration 2 +Enchantment Ice Siphon Trap Chill Effect 1 +Enchantment Ice Siphon Trap Chill Effect 2 +Enchantment Ice Siphon Trap Damage 1 +Enchantment Ice Siphon Trap Damage 2 +Enchantment Ice Siphon Trap Damage Taken 1 +Enchantment Ice Siphon Trap Duration 1 +Enchantment Ice Siphon Trap Duration 2 +Enchantment Ice Spear Additional Projectile 1 +Enchantment Ice Spear Distance Before Form Change 1 +Enchantment Ice Spear Distance Before Form Change 2 +Enchantment Ice Spear Percent Chance To Gain Power Charge On Critical Strike 1 +Enchantment Ice Spear Percent Chance To Gain Power Charge On Critical Strike 2 +Enchantment Ice Spear Second Form Critical Strike Chance 1 +Enchantment Ice Spear Second Form Critical Strike Chance 2 +Enchantment Ice Trap Area Of Effect 1 +Enchantment Ice Trap Area Of Effect 2 +Enchantment Ice Trap Cold Penetration 1 +Enchantment Ice Trap Cold Penetration 2 +Enchantment Ice Trap Damage 1 +Enchantment Ice Trap Damage 2 +Enchantment Immortal Call Duration 1 +Enchantment Immortal Call Duration 2 +Enchantment Immortal Call Percent Chance To Not Consume Endurance Charges 1 +Enchantment Immortal Call Percent Chance To Not Consume Endurance Charges 2 +Enchantment Incinerate Area Of Effect 1 +Enchantment Incinerate Area Of Effect 2 +Enchantment Incinerate Damage 1 +Enchantment Incinerate Damage 2 +Enchantment Incinerate Damage Per Stage 3 +Enchantment Incinerate Maximum Stages 1 +Enchantment Incinerate Maximum Stages 2 +Enchantment Infernal Blow Area Of Effect 1 +Enchantment Infernal Blow Area Of Effect 2 +Enchantment Infernal Blow Damage 1 +Enchantment Infernal Blow Damage 2 +Enchantment Infernal Blow Increased Damage Per Stack 1 +Enchantment Infernal Blow Increased Damage Per Stack 2 +Enchantment Infernal Blow Physical Damage Percent To Add As Fire Damage 1 +Enchantment Infernal Blow Physical Damage Percent To Add As Fire Damage 2 +Enchantment Kinetic Blast Area Of Effect 1 +Enchantment Kinetic Blast Area Of Effect 2 +Enchantment Kinetic Blast Damage 1 +Enchantment Kinetic Blast Damage 2 +Enchantment Kinetic Blast Explosions 1 +Enchantment Kinetic Blast Explosions 2 +Enchantment Lacerate Damage 1 +Enchantment Lacerate Damage 2 +Enchantment Lancing Steel Damage 1 +Enchantment Lancing Steel Damage 2 +Enchantment Lancing Steel Impale Chance 1 +Enchantment Lancing Steel Impale Chance 2 +Enchantment Lancing Steel Primary Proj Pierce Num 1 +Enchantment Lancing Steel Primary Proj Pierce Num 2 +Enchantment Leap Slam Area Of Effect 1 +Enchantment Leap Slam Area Of Effect 2 +Enchantment Leap Slam Attack Speed 1 +Enchantment Leap Slam Attack Speed 2 +Enchantment Leap Slam Damage 1 +Enchantment Leap Slam Damage 2 +Enchantment Leech 1 +Enchantment Leech 2 +Enchantment Leech 3 +Enchantment Lightning Arrow Area Of Effect 1 +Enchantment Lightning Arrow Area Of Effect 2 +Enchantment Lightning Arrow Damage 1 +Enchantment Lightning Arrow Damage 2 +Enchantment Lightning Arrow Extra Targets 1 +Enchantment Lightning Arrow Extra Targets 2 +Enchantment Lightning Damage 1 +Enchantment Lightning Damage 2 +Enchantment Lightning Damage 3 +Enchantment Lightning Golem Elemental Resistances 1 +Enchantment Lightning Golem Elemental Resistances 2 +Enchantment Lightning Golem Granted Buff Effect 1 +Enchantment Lightning Golem Granted Buff Effect 2 +Enchantment Lightning Strike Additional Pierce 1 +Enchantment Lightning Strike Additional Pierce 2 +Enchantment Lightning Strike Damage 1 +Enchantment Lightning Strike Damage 2 +Enchantment Lightning Strike Num Of Additional Projectiles 1 +Enchantment Lightning Strike Num Of Additional Projectiles 2 +Enchantment Lightning Tendrils Area Of Effect 1 +Enchantment Lightning Tendrils Area Of Effect 2 +Enchantment Lightning Tendrils Critical Strike Chance 1 +Enchantment Lightning Tendrils Critical Strike Chance 2 +Enchantment Lightning Tendrils Damage 1 +Enchantment Lightning Tendrils Damage 2 +Enchantment Lightning Tower Trap Additional Beams 1 +Enchantment Lightning Tower Trap Cast Speed 1 +Enchantment Lightning Tower Trap Cast Speed 2 +Enchantment Lightning Tower Trap Cooldown Speed 1 +Enchantment Lightning Tower Trap Cooldown Speed 2 +Enchantment Lightning Tower Trap Damage 1 +Enchantment Lightning Tower Trap Damage 2 +Enchantment Lightning Tower Trap Duration 1 +Enchantment Lightning Tower Trap Duration 2 +Enchantment Lightning Trap Additional Pierce 1 +Enchantment Lightning Trap Additional Pierce 2 +Enchantment Lightning Trap Damage 1 +Enchantment Lightning Trap Damage 2 +Enchantment Lightning Trap Penetration 1 +Enchantment Lightning Trap Penetration 2 +Enchantment Lightning Trap Shock Effect 1 +Enchantment Lightning Trap Shock Effect 2 +Enchantment Lightning Warp Cast Speed 1 +Enchantment Lightning Warp Cast Speed 2 +Enchantment Lightning Warp Damage 1 +Enchantment Lightning Warp Damage 2 +Enchantment Lightning Warp Duration 1 +Enchantment Lightning Warp Duration 2 +Enchantment Magma Orb Area Of Effect 1 +Enchantment Magma Orb Area Of Effect 2 +Enchantment Magma Orb Damage 1 +Enchantment Magma Orb Damage 2 +Enchantment Magma Orb Num Of Additional Projectiles In Chain 1 +Enchantment Magma Orb Num Of Additional Projectiles In Chain 2 +Enchantment Malevolence Mana Reservation 1 +Enchantment Malevolence Mana Reservation 2 +Enchantment Mana Cost 1 +Enchantment Mana Cost 2 +Enchantment Mana Cost 3 +Enchantment Mirror Arrow Attack Speed 1 +Enchantment Mirror Arrow Attack Speed 2 +Enchantment Mirror Arrow Cooldown Speed 1 +Enchantment Mirror Arrow Cooldown Speed 2 +Enchantment Mirror Arrow Damage 1 +Enchantment Mirror Arrow Damage 2 +Enchantment Molten Shell Armour 1 +Enchantment Molten Shell Armour 2 +Enchantment Molten Shell Damage 1 +Enchantment Molten Shell Damage 2 +Enchantment Molten Strike Area Of Effect 1 +Enchantment Molten Strike Area Of Effect 2 +Enchantment Molten Strike Damage 1 +Enchantment Molten Strike Damage 2 +Enchantment Molten Strike Num Of Additional Projectiles 1 +Enchantment Molten Strike Num Of Additional Projectiles 2 +Enchantment Movement Speed 1 +Enchantment Movement Speed 2 +Enchantment Movement Speed 3 +Enchantment Orb of Storms Area Of Effect 1 +Enchantment Orb of Storms Area Of Effect 2 +Enchantment Orb Of Storms Cast Speed 1 +Enchantment Orb Of Storms Cast Speed 2 +Enchantment Orb of Storms Critical Strike Chance 1 +Enchantment Orb of Storms Critical Strike Chance 2 +Enchantment Orb Of Storms Damage 1 +Enchantment Orb Of Storms Damage 2 +Enchantment Phase Run Duration 1 +Enchantment Phase Run Duration 2 +Enchantment Phase Run Percent Chance To Not Consume Frenzy Charges 1 +Enchantment Phase Run Percent Chance To Not Consume Frenzy Charges 2 +Enchantment Physical Cascade Additional Cascades 1 +Enchantment Physical Cascade Cooldown Speed 1 +Enchantment Physical Cascade Cooldown Speed 2 +Enchantment Physical Cascade Trap Damage 1 +Enchantment Physical Cascade Trap Damage 2 +Enchantment Physical Cascade Trap Duration 1 +Enchantment Physical Cascade Trap Duration 2 +Enchantment Poachers Mark Curse Effect 1 +Enchantment Poachers Mark Curse Effect 2 +Enchantment Poachers Mark Duration 1 +Enchantment Poachers Mark Duration 2 +Enchantment Power Siphon Additional Projectiles 1 +Enchantment Power Siphon Additional Projectiles 2 +Enchantment Power Siphon Attack Speed 1 +Enchantment Power Siphon Attack Speed 2 +Enchantment Power Siphon Damage 1 +Enchantment Power Siphon Damage 2 +Enchantment Power Siphon Percent Chance To Gain Power Charge On Kill 1 +Enchantment Power Siphon Percent Chance To Gain Power Charge On Kill 2 +Enchantment Projectile Weakness Curse Effect 1 +Enchantment Projectile Weakness Curse Effect 2 +Enchantment Projectile Weakness Duration 1 +Enchantment Projectile Weakness Duration 2 +Enchantment Puncture Damage 1 +Enchantment Puncture Damage 2 +Enchantment Puncture Duration 1 +Enchantment Puncture Duration 2 +Enchantment Puncture Maim On Hit Percent Chance 1 +Enchantment Puncture Maim On Hit Percent Chance 2 +Enchantment Punishment Curse Effect 1 +Enchantment Punishment Curse Effect 2 +Enchantment Punishment Duration 1 +Enchantment Punishment Duration 2 +Enchantment Purifying Flame Area Of Effect When Targeting Consecrated Ground 1 +Enchantment Purifying Flame Area Of Effect When Targeting Consecrated Ground 2 +Enchantment Purifying Flame Consecrated Ground Enemy Damage Taken 1 +Enchantment Purifying Flame Consecrated Ground Enemy Damage Taken 2 +Enchantment Purifying Flame Damage 1 +Enchantment Purifying Flame Damage 2 +Enchantment Purity Of Elements Mana Reservation 1 +Enchantment Purity Of Elements Mana Reservation 2 +Enchantment Purity Of Fire Mana Reservation 1 +Enchantment Purity Of Fire Mana Reservation 2 +Enchantment Purity Of Ice Mana Reservation 1 +Enchantment Purity Of Ice Mana Reservation 2 +Enchantment Purity Of Lightning Mana Reservation 1 +Enchantment Purity Of Lightning Mana Reservation 2 +Enchantment Rain Of Arrows Area Of Effect 1 +Enchantment Rain Of Arrows Area Of Effect 2 +Enchantment Rain Of Arrows Attack Speed 1 +Enchantment Rain Of Arrows Attack Speed 2 +Enchantment Rain Of Arrows Damage 1 +Enchantment Rain Of Arrows Damage 2 +Enchantment Rain Of Arrows Repeat Count 1 +Enchantment Rain Of Arrows Repeat Count 2 +Enchantment Raise Spectre Damage 1 +Enchantment Raise Spectre Damage 2 +Enchantment Raise Zombie Damage 1 +Enchantment Raise Zombie Damage 2 +Enchantment Rallying Cry Buff Effect 1 +Enchantment Rallying Cry Buff Effect 2 +Enchantment Rallying Cry Duration 1 +Enchantment Rallying Cry Duration 2 +Enchantment Reave Area Of Effect 1 +Enchantment Reave Area Of Effect 2 +Enchantment Reave Damage 1 +Enchantment Reave Damage 2 +Enchantment Reckoning Cooldown Speed 1 +Enchantment Reckoning Cooldown Speed 2 +Enchantment Reckoning Damage 1 +Enchantment Reckoning Damage 2 +Enchantment Regeneration 1 +Enchantment Regeneration 2 +Enchantment Regeneration 3 +Enchantment Rejuvination Totem Life Regeneration 1 +Enchantment Rejuvination Totem Life Regeneration 2 +Enchantment Rejuvination Totem Percent Life Regeneration Added As Mana Regeneration 1 +Enchantment Rejuvination Totem Percent Life Regeneration Added As Mana Regeneration 2 +Enchantment Righteous Fire Area Of Effect 1 +Enchantment Righteous Fire Area Of Effect 2 +Enchantment Righteous Fire Damage 1 +Enchantment Righteous Fire Damage 2 +Enchantment Righteous Fire Spell Damage 1 +Enchantment Righteous Fire Spell Damage 2 +Enchantment Riposte Cooldown Speed 1 +Enchantment Riposte Cooldown Speed 2 +Enchantment Riposte Damage 1 +Enchantment Riposte Damage 2 +Enchantment Scorching Ray Damage 1 +Enchantment Scorching Ray Damage 2 +Enchantment Scourge Arrow Additional Spore 1 +Enchantment Scourge Arrow Chance To Poison 1 +Enchantment Scourge Arrow Chance To Poison 2 +Enchantment Scourge Arrow Damage 1 +Enchantment Scourge Arrow Damage 2 +Enchantment Searing Bond Damage 1 +Enchantment Searing Bond Damage 2 +Enchantment Searing Bond Totem Elemental Resistances 1 +Enchantment Searing Bond Totem Elemental Resistances 2 +Enchantment Searing Bond Totem Placement Speed 1 +Enchantment Searing Bond Totem Placement Speed 2 +Enchantment Shattering Steel Additional Projectile 1 +Enchantment Shattering Steel Damage 1 +Enchantment Shattering Steel Damage 2 +Enchantment Shattering Steel Fortify On Hit Close Range 1 +Enchantment Shield Charge Attack Speed 1 +Enchantment Shield Charge Attack Speed 2 +Enchantment Shield Charge Damage 1 +Enchantment Shield Charge Damage 2 +Enchantment Shock Nova Area Of Effect 1 +Enchantment Shock Nova Area Of Effect 2 +Enchantment Shock Nova Damage 1 +Enchantment Shock Nova Damage 2 +Enchantment Shock Nova Larger Ring Damage 1 +Enchantment Shock Nova Larger Ring Damage 2 +Enchantment Shockwave Totem Cast Speed 1 +Enchantment Shockwave Totem Cast Speed 2 +Enchantment Shockwave Totem Damage 1 +Enchantment Shockwave Totem Damage 2 +Enchantment Shockwave Totem Radius 1 +Enchantment Shockwave Totem Radius 2 +Enchantment Shrapnel Shot Damage 1 +Enchantment Shrapnel Shot Damage 2 +Enchantment Shrapnel Shot Physical Damage Percent To Add As Lightning Damage 1 +Enchantment Shrapnel Shot Physical Damage Percent To Add As Lightning Damage 2 +Enchantment Shrapnel Shot Radius 1 +Enchantment Shrapnel Shot Radius 2 +Enchantment Shrapnel Trap Damage 1 +Enchantment Shrapnel Trap Damage 2 +Enchantment Shrapnel Trap Radius 1 +Enchantment Shrapnel Trap Radius 2 +Enchantment Shrapnel Trap Secondary Explosions 1 +Enchantment Shrapnel Trap Secondary Explosions 2 +Enchantment Siege Ballista Attack Speed 1 +Enchantment Siege Ballista Attack Speed 2 +Enchantment Siege Ballista Damage 1 +Enchantment Siege Ballista Damage 2 +Enchantment Siege Ballista Totem Placement Speed 1 +Enchantment Siege Ballista Totem Placement Speed 2 +Enchantment Smite Additional Target Chance 1 +Enchantment Smite Additional Target Chance 2 +Enchantment Smite Aura Effect 1 +Enchantment Smite Aura Effect 2 +Enchantment Smite Damage 1 +Enchantment Smite Damage 2 +Enchantment Smoke Mine Duration 1 +Enchantment Smoke Mine Duration 2 +Enchantment Smoke Mine Movement Speed 1 +Enchantment Smoke Mine Movement Speed 2 +Enchantment Soulrend Applies Hinder Movement Speed 1 +Enchantment Soulrend Applies Hinder Movement Speed 2 +Enchantment Soulrend Damage 1 +Enchantment Soulrend Damage 2 +Enchantment Soulrend Number Of Additional Projectiles 1 +Enchantment Spark Damage 1 +Enchantment Spark Damage 2 +Enchantment Spark Num Of Additional Projectiles 1 +Enchantment Spark Num Of Additional Projectiles 2 +Enchantment Spark Projectile Speed 1 +Enchantment Spark Projectile Speed 2 +Enchantment Spectral Shield Throw Damage 1 +Enchantment Spectral Shield Throw Damage 2 +Enchantment Spectral Shield Throw Num Of Additional Projectiles 1 +Enchantment Spectral Shield Throw Num Of Additional Projectiles 2 +Enchantment Spectral Shield Throw Projectile Speed 1 +Enchantment Spectral Shield Throw Projectile Speed 2 +Enchantment Spectral Throw Damage 1 +Enchantment Spectral Throw Damage 2 +Enchantment Spectral Throw Projectile Deceleration 1 +Enchantment Spectral Throw Projectile Deceleration 2 +Enchantment Spectral Throw Projectile Speed 1 +Enchantment Spectral Throw Projectile Speed 2 +Enchantment Spectre Attack And Cast Speed 1 +Enchantment Spectre Attack And Cast Speed 2 +Enchantment Spectre Elemental Resistances 1 +Enchantment Spectre Elemental Resistances 2 +Enchantment Spell Dodge 1 +Enchantment Spell Dodge 2 +Enchantment Spell Dodge 3 +Enchantment Spirit Offering Duration 1 +Enchantment Spirit Offering Duration 2 +Enchantment Spirit Offering Physical Added As Chaos 1 +Enchantment Spirit Offering Physical Added As Chaos 2 +Enchantment Split Arrow Critical Strike Chance 1 +Enchantment Split Arrow Critical Strike Chance 2 +Enchantment Split Arrow Damage 1 +Enchantment Split Arrow Damage 2 +Enchantment Split Arrow Num Of Additional Projectiles 1 +Enchantment Split Arrow Num Of Additional Projectiles 2 +Enchantment Static Strike Area Of Effect 1 +Enchantment Static Strike Area Of Effect 2 +Enchantment Static Strike Damage 1 +Enchantment Static Strike Damage 2 +Enchantment Static Strike Duration 1 +Enchantment Static Strike Duration 2 +Enchantment Static Strike Maximum Beam Targets 1 +Enchantment Static Strike Maximum Beam Targets 2 +Enchantment Status Ailments 1 +Enchantment Status Ailments 2 +Enchantment Status Ailments 3 +Enchantment Stone Golem Elemental Resistances 1 +Enchantment Stone Golem Elemental Resistances 2 +Enchantment Stone Golem Granted Buff Effect 1 +Enchantment Stone Golem Granted Buff Effect 2 +Enchantment Storm Brand Damage 1 +Enchantment Storm Brand Damage 2 +Enchantment Storm Burst Additional Object Chance 1 +Enchantment Storm Burst Additional Object Chance 2 +Enchantment Storm Burst Area Of Effect 1 +Enchantment Storm Burst Area Of Effect 2 +Enchantment Storm Burst Damage 1 +Enchantment Storm Burst Damage 2 +Enchantment Storm Call Area Of Effect 1 +Enchantment Storm Call Area Of Effect 2 +Enchantment Storm Call Damage 1 +Enchantment Storm Call Damage 2 +Enchantment Storm Call Duration 1 +Enchantment Storm Call Duration 2 +Enchantment Stun Avoidance 1 +Enchantment Stun Avoidance 2 +Enchantment Stun Avoidance 3 +Enchantment Summon Flame Golem Damage 1 +Enchantment Summon Flame Golem Damage 2 +Enchantment Summon Ice Golem Damage 1 +Enchantment Summon Ice Golem Damage 2 +Enchantment Summon Lightning Golem Damage 1 +Enchantment Summon Lightning Golem Damage 2 +Enchantment Summon Raging Spirit Damage 1 +Enchantment Summon Raging Spirit Damage 2 +Enchantment Summon Skeletons Additional Warrior Skeletons 1 +Enchantment Summon Skeletons Additional Warrior Skeletons 2 +Enchantment Summon Skeletons Damage 1 +Enchantment Summon Skeletons Damage 2 +Enchantment Summon Stone Golem Damage 1 +Enchantment Summon Stone Golem Damage 2 +Enchantment Summoned Raging Spirit Additional 1 +Enchantment Summoned Raging Spirit Additional 2 +Enchantment Summoned Raging Spirit Duration 1 +Enchantment Summoned Raging Spirit Duration 2 +Enchantment Sumon Chaos Golem Damage 1 +Enchantment Sumon Chaos Golem Damage 2 +Enchantment Sunder Attack Speed 1 +Enchantment Sunder Attack Speed 2 +Enchantment Sunder Damage 1 +Enchantment Sunder Damage 2 +Enchantment Sunder Radius 1 +Enchantment Sunder Radius 2 +Enchantment Sweep Area Of Effect 1 +Enchantment Sweep Area Of Effect 2 +Enchantment Sweep Damage 1 +Enchantment Sweep Damage 2 +Enchantment Sweep Knockback Chance 1 +Enchantment Sweep Knockback Chance 2 +Enchantment Tectonic Slam Area Of Effect 1 +Enchantment Tectonic Slam Area Of Effect 2 +Enchantment Tectonic Slam Chance To Charged Slam 1 +Enchantment Tectonic Slam Chance To Charged Slam 2 +Enchantment Tectonic Slam Damage 1 +Enchantment Tectonic Slam Damage 2 +Enchantment Tempest Shield Damage 1 +Enchantment Tempest Shield Damage 2 +Enchantment Tempest Shield Num Of Additional Projectiles In Chain 1 +Enchantment Tempest Shield Num Of Additional Projectiles In Chain 2 +Enchantment Temporal Chains Curse Effect 1 +Enchantment Temporal Chains Curse Effect 2 +Enchantment Temporal Chains Duration 1 +Enchantment Temporal Chains Duration 2 +Enchantment Tornado Shot Critical Strike Chance 1 +Enchantment Tornado Shot Critical Strike Chance 2 +Enchantment Tornado Shot Damage 1 +Enchantment Tornado Shot Damage 2 +Enchantment Tornado Shot Num Of Secondary Projectiles 1 +Enchantment Tornado Shot Num Of Secondary Projectiles 2 +Enchantment Toxic Rain Damage 1 +Enchantment Toxic Rain Damage 2 +Enchantment Toxic Rain Num Of Additional Projectiles 1 +Enchantment Toxic Rain Physical Added As Chaos 1 +Enchantment Toxic Rain Physical Added As Chaos 2 +Enchantment Unearth Cast Speed 1 +Enchantment Unearth Cast Speed 2 +Enchantment Unearth Corpse Level 1 +Enchantment Unearth Corpse Level 2 +Enchantment Unearth Damage 1 +Enchantment Unearth Damage 2 +Enchantment Vengeance Cooldown Speed 1 +Enchantment Vengeance Cooldown Speed 2 +Enchantment Vengeance Damage 1 +Enchantment Vengeance Damage 2 +Enchantment Vigilant Strike Damage 1 +Enchantment Vigilant Strike Damage 2 +Enchantment Vigilant Strike Fortify Duration 1 +Enchantment Vigilant Strike Fortify Duration 2 +Enchantment Viper Strike Critical Strike Chance 1 +Enchantment Viper Strike Critical Strike Chance 2 +Enchantment Viper Strike Damage 1 +Enchantment Viper Strike Damage 2 +Enchantment Viper Strike Poison Duration 1 +Enchantment Viper Strike Poison Duration 2 +Enchantment Vitality Mana Reservation 1 +Enchantment Vitality Mana Reservation 2 +Enchantment Volatile Dead Cast Speed 1 +Enchantment Volatile Dead Cast Speed 2 +Enchantment Volatile Dead Damage 1 +Enchantment Volatile Dead Damage 2 +Enchantment Volatile Dead Orbs 3 +Enchantment Vortex AoE On Frostbolt 1 +Enchantment Vortex AoE On Frostbolt 2 +Enchantment Vortex Cooldown Recovery 1 +Enchantment Vortex Cooldown Recovery 2 +Enchantment Vortex Damage 1 +Enchantment Vortex Damage 2 +Enchantment Vortex Duration 1 +Enchantment Vortex Duration 2 +Enchantment Vulnerability Curse Effect 1 +Enchantment Vulnerability Curse Effect 2 +Enchantment Vulnerability Duration 1 +Enchantment Vulnerability Duration 2 +Enchantment War Banner Effect 1 +Enchantment War Banner Effect 2 +Enchantment Warlords Mark Curse Effect 1 +Enchantment Warlords Mark Curse Effect 2 +Enchantment Warlords Mark Duration 1 +Enchantment Warlords Mark Duration 2 +Enchantment Wave Of Conviction Additional Enemy Resistance 1 +Enchantment Wave Of Conviction Additional Enemy Resistance 2 +Enchantment Wave Of Conviction Damage 1 +Enchantment Wave Of Conviction Damage 2 +Enchantment Wave Of Conviction Duration 1 +Enchantment Wave Of Conviction Duration 2 +Enchantment Whirling Blades Attack Speed 1 +Enchantment Whirling Blades Attack Speed 2 +Enchantment Whirling Blades Damage 1 +Enchantment Whirling Blades Damage 2 +Enchantment Wild Strike Area Of Effect 1 +Enchantment Wild Strike Area Of Effect 2 +Enchantment Wild Strike Damage 1 +Enchantment Wild Strike Damage 2 +Enchantment Wild Strike Num Of Additional Projectiles In Chain 1 +Enchantment Wild Strike Num Of Additional Projectiles In Chain 2 +Enchantment Winter Orb Damage 1 +Enchantment Winter Orb Damage 2 +Enchantment Wither Area Of Effect 1 +Enchantment Wither Area Of Effect 2 +Enchantment Wither Duration 1 +Enchantment Wither Duration 2 +Enchantment Word of Blades +Enchantment Word of Flames +Enchantment Word of Force +Enchantment Word of Frost +Enchantment Word of Fury +Enchantment Word of Inferno +Enchantment Word of Ire +Enchantment Word of Light +Enchantment Word of Reflection +Enchantment Word of Spite +Enchantment Word of the Grave +Enchantment Word of the Tempest +Enchantment Word of Thunder +Enchantment Word of War +Enchantment Word of Winter +Enchantment Wrath Mana Reservation 1 +Enchantment Wrath Mana Reservation 2 +Enchantment Zealotry Mana Reservation 1 +Enchantment Zealotry Mana Reservation 2 +Enchantment Zombie Attack Speed 1 +Enchantment Zombie Attack Speed 2 +Enchantment Zombie Elemental Resistances 1 +Enchantment Zombie Elemental Resistances 2 +Storm Brand Additional Chain Chance 1 +Storm Brand Additional Chain Chance 2 +Storm Brand Attached Target Lightning Penetration 1 +Storm Brand Attached Target Lightning Penetration 2 \ No newline at end of file From c44d7b609513b86a1d2783b3f7edb10bb07336e6 Mon Sep 17 00:00:00 2001 From: Ben Wallis Date: Mon, 18 Mar 2019 17:49:21 +0000 Subject: [PATCH 6/7] Changed version to 1.2.0-beta1 --- Filtration/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Filtration/Properties/AssemblyInfo.cs b/Filtration/Properties/AssemblyInfo.cs index edcb61e..ca4309e 100644 --- a/Filtration/Properties/AssemblyInfo.cs +++ b/Filtration/Properties/AssemblyInfo.cs @@ -11,7 +11,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCulture("")] [assembly: AssemblyVersion("1.2.0")] -[assembly: AssemblyInformationalVersion("1.2.0")] +[assembly: AssemblyInformationalVersion("1.2.0-beta1")] [assembly: InternalsVisibleTo("Filtration.Tests")] [assembly: InternalsVisibleTo("Filtration.ItemFilterPreview.Tests")] From 85c215382b6b587d7059131b7db6f32de09917cb Mon Sep 17 00:00:00 2001 From: Ben Wallis Date: Wed, 10 Apr 2019 17:39:15 +0100 Subject: [PATCH 7/7] bumped version to 1.2.0 --- Filtration/Filtration.nuspec | 3 ++- Filtration/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Filtration/Filtration.nuspec b/Filtration/Filtration.nuspec index 5ea06d8..fbf1169 100644 --- a/Filtration/Filtration.nuspec +++ b/Filtration/Filtration.nuspec @@ -13,7 +13,8 @@ * Added support for HasEnchantment block item type * Added support for FracturedItem block item type * Added support for SynthesisedItem block item type -* Fixed parsing of disabled Show/Hide blocks with extra information following the Show/Hide keyword (#133) +* Fixed parsing of disabled Show/Hide blocks with extra information following the Show/Hide keyword (#133) +* Fixed copy/pasted block styles not affecting the preview (#126) diff --git a/Filtration/Properties/AssemblyInfo.cs b/Filtration/Properties/AssemblyInfo.cs index ca4309e..edcb61e 100644 --- a/Filtration/Properties/AssemblyInfo.cs +++ b/Filtration/Properties/AssemblyInfo.cs @@ -11,7 +11,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCulture("")] [assembly: AssemblyVersion("1.2.0")] -[assembly: AssemblyInformationalVersion("1.2.0-beta1")] +[assembly: AssemblyInformationalVersion("1.2.0")] [assembly: InternalsVisibleTo("Filtration.Tests")] [assembly: InternalsVisibleTo("Filtration.ItemFilterPreview.Tests")]