Merge branch 'patch/6.0.7' into dev

This commit is contained in:
Cooldude2606 committed 2020-05-28 17:08:13 +01:00
commit a71ab19208
5 files changed
+13 -12

No files matched your search

+2 -2
View File
@@ -159,7 +159,7 @@ local warp_icon_button
local confirm_edit =
Gui.element{
type = 'sprite-button',
sprite = 'utility/downloaded',
sprite = 'utility/confirm_slot',
tooltip = {'warp-list.confirm-tooltip'},
style = 'shortcut_bar_button_green'
}
@@ -258,7 +258,7 @@ Gui.element(function(event_trigger, parent, warp)
type = 'sprite-button',
sprite = 'item/'..warp.icon,
tooltip = {'warp-list.goto-tooltip', warp_position.x, warp_position.y},
style = 'quick_bar_slot_button'
style = 'slot_sized_button'
}
end)
:style(Styles.sprite32)