Merge branch 'master' into dev

Author: LocalIdentity

manifest.xml

@@ -23,9 +23,9 @@ return {
 	["FlaskChanceRechargeOnKill1"] = { type = "Suffix", affix = "of the Medic", "(21-25)% Chance to gain a Charge when you Kill an Enemy", statOrder = { 994 }, level = 8, group = "FlaskChanceRechargeOnKill", weightKey = { "flask", "default" }, weightVal = { 1, 0 }, modTags = { "flask" }, tradeHash = 828533480, },
 	["FlaskChanceRechargeOnKill2"] = { type = "Suffix", affix = "of the Doctor", "(26-30)% Chance to gain a Charge when you Kill an Enemy", statOrder = { 994 }, level = 26, group = "FlaskChanceRechargeOnKill", weightKey = { "flask", "default" }, weightVal = { 1, 0 }, modTags = { "flask" }, tradeHash = 828533480, },
 	["FlaskChanceRechargeOnKill3"] = { type = "Suffix", affix = "of the Surgeon", "(31-35)% Chance to gain a Charge when you Kill an Enemy", statOrder = { 994 }, level = 45, group = "FlaskChanceRechargeOnKill", weightKey = { "flask", "default" }, weightVal = { 1, 0 }, modTags = { "flask" }, tradeHash = 828533480, },
-	["FlaskFillChargesPerMinute1"] = { type = "Suffix", affix = "of the Foliage", "Gains 0.15 Charges per Second", statOrder = { 6796 }, level = 8, group = "FlaskGainChargePerMinute", weightKey = { "flask", "default" }, weightVal = { 1, 0 }, modTags = {  }, tradeHash = 1873752457, },
-	["FlaskFillChargesPerMinute2"] = { type = "Suffix", affix = "of the Verdant", "Gains 0.2 Charges per Second", statOrder = { 6796 }, level = 26, group = "FlaskGainChargePerMinute", weightKey = { "flask", "default" }, weightVal = { 1, 0 }, modTags = {  }, tradeHash = 1873752457, },
-	["FlaskFillChargesPerMinute3"] = { type = "Suffix", affix = "of the Sylvan", "Gains 0.25 Charges per Second", statOrder = { 6796 }, level = 45, group = "FlaskGainChargePerMinute", weightKey = { "flask", "default" }, weightVal = { 1, 0 }, modTags = {  }, tradeHash = 1873752457, },
+	["FlaskFillChargesPerMinute1"] = { type = "Suffix", affix = "of the Foliage", "Gains 0.15 Charges per Second", statOrder = { 6795 }, level = 8, group = "FlaskGainChargePerMinute", weightKey = { "flask", "default" }, weightVal = { 1, 0 }, modTags = {  }, tradeHash = 1873752457, },
+	["FlaskFillChargesPerMinute2"] = { type = "Suffix", affix = "of the Verdant", "Gains 0.2 Charges per Second", statOrder = { 6795 }, level = 26, group = "FlaskGainChargePerMinute", weightKey = { "flask", "default" }, weightVal = { 1, 0 }, modTags = {  }, tradeHash = 1873752457, },
+	["FlaskFillChargesPerMinute3"] = { type = "Suffix", affix = "of the Sylvan", "Gains 0.25 Charges per Second", statOrder = { 6795 }, level = 45, group = "FlaskGainChargePerMinute", weightKey = { "flask", "default" }, weightVal = { 1, 0 }, modTags = {  }, tradeHash = 1873752457, },
 	["CharmIncreasedDuration1"] = { type = "Prefix", affix = "Investigator's", "(16-20)% increased Duration", statOrder = { 898 }, level = 1, group = "CharmIncreasedDuration", weightKey = { "utility_flask", "default" }, weightVal = { 1, 0 }, modTags = {  }, tradeHash = 2541588185, },
 	["CharmIncreasedDuration2"] = { type = "Prefix", affix = "Analyst's", "(21-25)% increased Duration", statOrder = { 898 }, level = 20, group = "CharmIncreasedDuration", weightKey = { "utility_flask", "default" }, weightVal = { 1, 0 }, modTags = {  }, tradeHash = 2541588185, },
 	["CharmIncreasedDuration3"] = { type = "Prefix", affix = "Examiner's", "(26-30)% increased Duration", statOrder = { 898 }, level = 42, group = "CharmIncreasedDuration", weightKey = { "utility_flask", "default" }, weightVal = { 1, 0 }, modTags = {  }, tradeHash = 2541588185, },

src/Data/ModCharm.lua

@@ -23,9 +23,9 @@ return {
 	["FlaskChanceRechargeOnKill1"] = { type = "Suffix", affix = "of the Medic", "(21-25)% Chance to gain a Charge when you Kill an Enemy", statOrder = { 994 }, level = 8, group = "FlaskChanceRechargeOnKill", weightKey = { "flask", "default" }, weightVal = { 1, 0 }, modTags = { "flask" }, tradeHash = 828533480, },
 	["FlaskChanceRechargeOnKill2"] = { type = "Suffix", affix = "of the Doctor", "(26-30)% Chance to gain a Charge when you Kill an Enemy", statOrder = { 994 }, level = 26, group = "FlaskChanceRechargeOnKill", weightKey = { "flask", "default" }, weightVal = { 1, 0 }, modTags = { "flask" }, tradeHash = 828533480, },
 	["FlaskChanceRechargeOnKill3"] = { type = "Suffix", affix = "of the Surgeon", "(31-35)% Chance to gain a Charge when you Kill an Enemy", statOrder = { 994 }, level = 45, group = "FlaskChanceRechargeOnKill", weightKey = { "flask", "default" }, weightVal = { 1, 0 }, modTags = { "flask" }, tradeHash = 828533480, },
-	["FlaskFillChargesPerMinute1"] = { type = "Suffix", affix = "of the Foliage", "Gains 0.15 Charges per Second", statOrder = { 6796 }, level = 8, group = "FlaskGainChargePerMinute", weightKey = { "flask", "default" }, weightVal = { 1, 0 }, modTags = {  }, tradeHash = 1873752457, },
-	["FlaskFillChargesPerMinute2"] = { type = "Suffix", affix = "of the Verdant", "Gains 0.2 Charges per Second", statOrder = { 6796 }, level = 26, group = "FlaskGainChargePerMinute", weightKey = { "flask", "default" }, weightVal = { 1, 0 }, modTags = {  }, tradeHash = 1873752457, },
-	["FlaskFillChargesPerMinute3"] = { type = "Suffix", affix = "of the Sylvan", "Gains 0.25 Charges per Second", statOrder = { 6796 }, level = 45, group = "FlaskGainChargePerMinute", weightKey = { "flask", "default" }, weightVal = { 1, 0 }, modTags = {  }, tradeHash = 1873752457, },
+	["FlaskFillChargesPerMinute1"] = { type = "Suffix", affix = "of the Foliage", "Gains 0.15 Charges per Second", statOrder = { 6795 }, level = 8, group = "FlaskGainChargePerMinute", weightKey = { "flask", "default" }, weightVal = { 1, 0 }, modTags = {  }, tradeHash = 1873752457, },
+	["FlaskFillChargesPerMinute2"] = { type = "Suffix", affix = "of the Verdant", "Gains 0.2 Charges per Second", statOrder = { 6795 }, level = 26, group = "FlaskGainChargePerMinute", weightKey = { "flask", "default" }, weightVal = { 1, 0 }, modTags = {  }, tradeHash = 1873752457, },
+	["FlaskFillChargesPerMinute3"] = { type = "Suffix", affix = "of the Sylvan", "Gains 0.25 Charges per Second", statOrder = { 6795 }, level = 45, group = "FlaskGainChargePerMinute", weightKey = { "flask", "default" }, weightVal = { 1, 0 }, modTags = {  }, tradeHash = 1873752457, },
 	["FlaskIncreasedRecoverySpeed1"] = { type = "Prefix", affix = "Dense", "(41-45)% increased Recovery rate", statOrder = { 908 }, level = 1, group = "FlaskIncreasedRecoverySpeed", weightKey = { "flask", "default" }, weightVal = { 1, 0 }, modTags = { "flask" }, tradeHash = 173226756, },
 	["FlaskIncreasedRecoverySpeed2"] = { type = "Prefix", affix = "Undiluted", "(46-50)% increased Recovery rate", statOrder = { 908 }, level = 15, group = "FlaskIncreasedRecoverySpeed", weightKey = { "flask", "default" }, weightVal = { 1, 0 }, modTags = { "flask" }, tradeHash = 173226756, },
 	["FlaskIncreasedRecoverySpeed3_"] = { type = "Prefix", affix = "Hearty", "(51-55)% increased Recovery rate", statOrder = { 908 }, level = 31, group = "FlaskIncreasedRecoverySpeed", weightKey = { "flask", "default" }, weightVal = { 1, 0 }, modTags = { "flask" }, tradeHash = 173226756, },