Merge remote-tracking branch 'origin/dev'

This commit is contained in:
Dayve
2016-10-25 22:35:13 +10:00
4 changed files with 25 additions and 3 deletions

View File

@@ -216,6 +216,7 @@ Prefixes:
{inc ES}
{range:.75}+(0 to 72) to maximum Energy Shield
{range:.75}+(0 to 99) to maximum Life
{range:0}+(0 to 73) to maximum Mana
{range:0}+(0 to 2) to Level of Socketed Minion Gems
Suffixes:
{range:0}+(0 to 400) to Accuracy Rating
@@ -244,6 +245,7 @@ Prefixes:
{range:0}+(0 to 138) to Armour
{range:0}+(0 to 72) to maximum Energy Shield
{range:.75}+(0 to 99) to maximum Life
{range:0}+(0 to 73) to maximum Mana
{range:0}+(0 to 2) to Level of Socketed Minion Gems
Suffixes:
{range:0}+(0 to 400) to Accuracy Rating
@@ -259,6 +261,7 @@ Prefixes:
{range:0}+(0 to 138) to Armour
{range:0}+(0 to 72) to maximum Energy Shield
{range:.75}+(0 to 99) to maximum Life
{range:0}+(0 to 73) to maximum Mana
{range:0}+(0 to 2) to Level of Socketed Minion Gems
Suffixes:
{range:0}+(0 to 400) to Accuracy Rating
@@ -273,6 +276,7 @@ Prefixes:
{range:0}+(0 to 138) to Evasion Rating
{range:0}+(0 to 72) to maximum Energy Shield
{range:.75}+(0 to 99) to maximum Life
{range:0}+(0 to 73) to maximum Mana
{range:0}+(0 to 2) to Level of Socketed Minion Gems
Suffixes:
{range:0}+(0 to 400) to Accuracy Rating
@@ -332,6 +336,7 @@ Prefixes:
{inc ES}
{range:.75}+(0 to 48) to maximum Energy Shield
{range:.75}+(0 to 89) to maximum Life
{range:0}+(0 to 73) to maximum Mana
{gloves}
{dex}
{int}
@@ -344,6 +349,7 @@ Prefixes:
{inc ES}
{range:.75}+(0 to 48) to maximum Energy Shield
{range:.75}+(0 to 89) to maximum Life
{range:0}+(0 to 73) to maximum Mana
{gloves}
{dex}
{int}
@@ -368,6 +374,7 @@ Prefixes:
{range:0}+(0 to 80) to Armour
{range:0}+(0 to 48) to maximum Energy Shield
{range:.75}+(0 to 89) to maximum Life
{range:0}+(0 to 73) to maximum Mana
{gloves}
{str}
{dex}
@@ -381,6 +388,7 @@ Prefixes:
{range:0}+(0 to 80) to Evasion Rating
{range:0}+(0 to 48) to maximum Energy Shield
{range:.75}+(0 to 89) to maximum Life
{range:0}+(0 to 73) to maximum Mana
{gloves}
{dex}
{int}
@@ -415,6 +423,7 @@ Prefixes:
{inc ES}
{range:.75}+(0 to 145) to maximum Energy Shield
{range:.75}+(0 to 119) to maximum Life
{range:0}+(0 to 73) to maximum Mana
Suffixes:
{int}
{res}
@@ -438,6 +447,7 @@ Prefixes:
{range:0}+(0 to 400) to Armour
{range:0}+(0 to 145) to maximum Energy Shield
{range:.75}+(0 to 119) to maximum Life
{range:0}+(0 to 73) to maximum Mana
Suffixes:
{str}
{int}
@@ -451,6 +461,7 @@ Prefixes:
{range:0}+(0 to 400) to Evasion Rating
{range:0}+(0 to 145) to maximum Energy Shield
{range:.75}+(0 to 119) to maximum Life
{range:0}+(0 to 73) to maximum Mana
Suffixes:
{dex}
{int}
@@ -486,6 +497,7 @@ Prefixes:
{inc ES}
{range:0}+(0 to 48) to maximum Energy Shield
{range:.75}+(0 to 89) to maximum Life
{range:0}+(0 to 73) to maximum Mana
{range:1}(0 to 30)% increased Movement Speed
Suffixes:
{int}
@@ -511,6 +523,7 @@ Prefixes:
{range:0}+(0 to 80) to Armour
{range:0}+(0 to 48) to maximum Energy Shield
{range:.75}+(0 to 89) to maximum Life
{range:0}+(0 to 73) to maximum Mana
{range:1}(0 to 30)% increased Movement Speed
Suffixes:
{str}
@@ -524,6 +537,7 @@ Prefixes:
{range:0}+(0 to 80) to Evasion Rating
{range:0}+(0 to 48) to maximum Energy Shield
{range:.75}+(0 to 89) to maximum Life
{range:0}+(0 to 73) to maximum Mana
{range:1}(0 to 30)% increased Movement Speed
Suffixes:
{dex}
@@ -558,6 +572,7 @@ Prefixes:
{inc ES}
{range:.75}+(0 to 135) to maximum Energy Shield
{range:.75}+(0 to 109) to maximum Life
{range:0}+(0 to 73) to maximum Mana
{range:0}(0 to 79)% increased Spell Damage
Suffixes:
{int}
@@ -584,6 +599,7 @@ Prefixes:
{range:0}+(0 to 400) to Armour
{range:0}+(0 to 135) to maximum Energy Shield
{range:.75}+(0 to 109) to maximum Life
{range:0}+(0 to 73) to maximum Mana
Suffixes:
{str}
{int}
@@ -597,6 +613,7 @@ Prefixes:
{range:0}+(0 to 400) to Evasion Rating
{range:0}+(0 to 135) to maximum Energy Shield
{range:.75}+(0 to 109) to maximum Life
{range:0}+(0 to 73) to maximum Mana
Suffixes:
{dex}
{int}

View File

@@ -48,6 +48,9 @@ Head over to the [Releases](https://github.com/Openarl/PathOfBuilding/releases)
![ss3](https://cloud.githubusercontent.com/assets/19189971/18089780/f0ff234a-6f04-11e6-8c88-6193fe59a5c4.png)
## Changelog
### 1.1.11 - 2016/10/25
* Added flat mana to ES armour rare templates
### 1.1.10 - 2016/10/23
* Added support for the poison-at-max-frenzy modifier on Snakebite

View File

@@ -1,3 +1,5 @@
VERSION[1.1.11][2016/10/25]
* Added flat mana to ES armour rare templates
VERSION[1.1.10][2016/10/23]
* Added support for the poison-at-max-frenzy modifier on Snakebite
VERSION[1.1.9][2016/10/07]

View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<PoBVersion>
<Version number="1.1.10"/>
<Version number="1.1.11"/>
<Source part="program" url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/"/>
<Source part="tree" url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/tree.zip"/>
<Source url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/runtime-win32.zip" part="runtime" platform="win32"/>
<File sha1="889ff24936021c18a2b2d6893fc087cb3bc7018a" name="Launch.lua" part="program"/>
<File sha1="cb07c8d4819eb81df9e98ab9039e0c9adf74c150" name="UpdateCheck.lua" part="program"/>
<File sha1="4f17937f2b37784e169a3792b235f2a0a3961e61" name="UpdateApply.lua" part="program"/>
<File sha1="e29409e12bf0e9244354c8660c8f381c1b27ff56" name="changelog.txt" part="program"/>
<File sha1="9f47b426d807d0b10b3901d34cfe3d07534640ba" name="changelog.txt" part="program"/>
<File sha1="aef7145f378d0a1d5dc6f5f2d3c08d2a1b6ef264" name="Classes/BuildListControl.lua" part="program"/>
<File sha1="34fdf53db3b3231ce446749227e178847b982771" name="Classes/ButtonControl.lua" part="program"/>
<File sha1="edc1ebdb3ad5ddbd9ae688ca93c0326c3d18b554" name="Classes/CalcsTab.lua" part="program"/>
@@ -50,7 +50,7 @@
<File sha1="e7ee7e5b6388facb7bf568517ecc401590757df7" name="Assets/ring.png" part="program"/>
<File sha1="9a320bfe629b1cf3f14fc77fbbf2508d0a5b2841" name="Assets/small_ring.png" part="program"/>
<File sha1="698c46ec242133014f6904d276b27106580ea392" name="Data/New.lua" part="program"/>
<File sha1="9f0d5d55c62bb1e2e36ff1b9170bc7e5ea5789e1" name="Data/Rares.lua" part="program"/>
<File sha1="4bda866bb45169b51bd193039a87d7bcc6cbacaa" name="Data/Rares.lua" part="program"/>
<File sha1="05013d888ce08082426ba80d2ca05e2927cb8cf9" name="Data/Gems/act_dex.lua" part="program"/>
<File sha1="8b7bc28d84bff9202257f05297ff71dfc77ad408" name="Data/Gems/act_int.lua" part="program"/>
<File sha1="a55b64f148573e6872cb947d8cf0acb8a9ef1cd9" name="Data/Gems/act_str.lua" part="program"/>