Skip to content

Dev > Live merge #1798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
z16 merged 4 commits into from
Oct 20, 2019
Merged

Dev > Live merge #1798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b6bc5e4
EasyNuke fix
RubenatorX Oct 14, 2019
563f187
Merge pull request #1796 from RubenatorX/patch-2
alphaONE2 Oct 14, 2019
018b0c5
Gearswap: Filter enchanted items with duplicate names.
Ivaar Oct 19, 2019
5fb6968
Merge pull request #1797 from Ivaar/dev
z16 Oct 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions addons/EasyNuke/EasyNuke.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ windower.register_event("unhandled command", function (command, arg)
execute_spell_cast("ra", arg)
elseif command == "boomhelix" or command == "bhelix" then
execute_spell_cast("helix", arg)
elseif command = "boomam" or command == "bam" then
elseif command == "boomam" or command == "bam" then
execute_spell_cast("am", arg)
end
end)
Expand All @@ -154,7 +154,7 @@ windower.register_event('addon command', function (command, arg)
execute_spell_cast("ra", arg)
elseif command == "boomhelix" or command == "bhelix" then
execute_spell_cast("helix", arg)
elseif command = "boomam" or command == "bam" then
elseif command == "boomam" or command == "bam" then
execute_spell_cast("am", arg)

elseif command == "target" then
Expand Down
2 changes: 1 addition & 1 deletion addons/GearSwap/gearswap.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
--SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

_addon.name = 'GearSwap'
_addon.version = '0.934'
_addon.version = '0.935'
_addon.author = 'Byrth'
_addon.commands = {'gs','gearswap'}

Expand Down
4 changes: 3 additions & 1 deletion addons/GearSwap/statics.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@ end

for i,v in pairs(res.items) do
v.prefix = '/item'
make_entry(v,i)
if not validabils['english'][v.prefix][v.english:lower()] or v.cast_delay then
make_entry(v,i)
end
end

-- Should transition these slot maps to be based off res.slots, but it's very unlikely to change.
Expand Down
3 changes: 2 additions & 1 deletion addons/GearSwap/version_history.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
-------------------------------------------------

GearSwap 0.935 - Filter enchanted items with duplicate names.
-------------------------------------------------
GearSwap 0.934 - Fixed /item command handling.
-------------------------------------------------
GearSwap 0.933 - Adjusted how item use packets are chosen.
Expand Down