Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Openarl committed Dec 24, 2017
2 parents 30b53b3 + 276ad15 commit 228db93
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### 1.4.73 - 2017/12/25
* Fixed error that occured when changing some items to Shaper or Elder

### 1.4.72 - 2017/12/25
* Added 2 Abyssal Socket variants to the Abyss league uniques
* Cremation now correctly benefits from modifiers to Area Damage
Expand Down
10 changes: 6 additions & 4 deletions Classes/ItemsTab.lua
Original file line number Diff line number Diff line change
Expand Up @@ -327,10 +327,12 @@ If there's 2 slots an item can go in, holding Shift will put it in the second.]]
self.controls.displayItemShaperElder = common.New("DropDownControl", {"TOPLEFT",self.controls.displayItemSectionImplicit,"TOPLEFT"}, 0, 0, 100, 20, {"Normal","Shaper","Elder"}, function(index, value)
self.displayItem.shaper = (index == 2)
self.displayItem.elder = (index == 3)
for i = 1, 6 do
-- Force affix selectors to update
local drop = self.controls["displayItemAffix"..i]
drop.selFunc(drop.selIndex, drop.list[drop.selIndex])
if self.displayItem.crafted then
for i = 1, 6 do
-- Force affix selectors to update
local drop = self.controls["displayItemAffix"..i]
drop.selFunc(drop.selIndex, drop.list[drop.selIndex])
end
end
end)
self.controls.displayItemShaperElder.shown = function()
Expand Down
2 changes: 2 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
VERSION[1.4.73][2017/12/25]
* Fixed error that occured when changing some items to Shaper or Elder
VERSION[1.4.72][2017/12/25]
* Added 2 Abyssal Socket variants to the Abyss league uniques
* Cremation now correctly benefits from modifiers to Area Damage
Expand Down
6 changes: 3 additions & 3 deletions manifest.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<PoBVersion>
<Version number="1.4.72"/>
<Version number="1.4.73"/>
<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="f46d80b42dfa037cf46004590a49d9aa6d0abd13" name="Launch.lua" part="program"/>
<File sha1="72b9bea1871e94a643e4471fd84bbedbc7810336" name="UpdateCheck.lua" part="program"/>
<File sha1="4f17937f2b37784e169a3792b235f2a0a3961e61" name="UpdateApply.lua" part="program"/>
<File sha1="4b3f406251afebab238ae24c5cc0cd0e1b28a80d" name="changelog.txt" part="program"/>
<File sha1="f63a4308cf1bce265f3407ccac03c83a7f2b4bdf" name="changelog.txt" part="program"/>
<File sha1="51a3c1027381bb36666568aaceec843164f8c957" name="Classes/BuildListControl.lua" part="program"/>
<File sha1="f85e8b60ff9bb41a3cc4ba8044f7a49163fdedd3" name="Classes/ButtonControl.lua" part="program"/>
<File sha1="0ec9422fd657e2c594458726e066d0bbd1a053aa" name="Classes/CalcBreakdownControl.lua" part="program"/>
Expand All @@ -26,7 +26,7 @@
<File sha1="871e86615455574024070657599aec2004b48b24" name="Classes/ItemListControl.lua" part="program"/>
<File sha1="b8b647d7ceeb6aad268a57be099ddd91194ab9f5" name="Classes/ItemSetListControl.lua" part="program"/>
<File sha1="f75539b022576ba1fd3b36402b6d7a766e453add" name="Classes/ItemSlotControl.lua" part="program"/>
<File sha1="b22a2878c1fbaf0b07eb3d829efb3460703ea479" name="Classes/ItemsTab.lua" part="program"/>
<File sha1="d930e6300a049d9d3287ce65766f68470dd5ba1c" name="Classes/ItemsTab.lua" part="program"/>
<File sha1="62138c7db82d57d638a16610a26acd0de75d3486" name="Classes/LabelControl.lua" part="program"/>
<File sha1="d04c75e81b9c1aec76e1bcd54e6c967f8b84b938" name="Classes/ListControl.lua" part="program"/>
<File sha1="e49ea5dbedf4ad0e71dc3331693636ac51e90ba5" name="Classes/MinionListControl.lua" part="program"/>
Expand Down

0 comments on commit 228db93

Please sign in to comment.