Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/TekNoLogic/Panda
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kaboca
Kaboca committed Nov 8, 2014
2 parents 4245f34 + ed4d2a3 commit 7e6f350
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 66 deletions.
2 changes: 1 addition & 1 deletion ButtonFactory.lua
View file
Expand Up @@ -25,7 +25,7 @@ local UNK, ICONS = "Interface\\Icons\\INV_Misc_QuestionMark", {

local function OnEvent(self)
if not self.id then return end
local count = GetItemCount(self.id)
local count = GetItemCount(self.id, true)
if self.craftqty then
self.count:SetText(count .. "/".. self.craftqty)
else
Expand Down
3 changes: 1 addition & 2 deletions GemCutting.lua
View file
Expand Up @@ -15,7 +15,7 @@ panel:RegisterFrame(L["Panda Rare"], Panda.PanelFactory(25229,
[[90401 76131 76693 76692 76694 76695 76696 0 0 0 76670 76669 76668 76667 76666 76665 76671
90400 76140 76675 76663 76661 76660 76659 76658 76677 76678 76679 76676 76662 76664 76674 76673 76672
90398 76142 76701 76697 76698 76699 76700 0 0 0 0 0 0 0 76641 76640 76642
90397 76139 76647 76651 76652 76653 76654 76655 76656 76657 76648 76649 76650 76646 76645 76644 76643
90397 76139 76647 76651 76652 76653 76654 93705 76656 76657 76648 76649 76650 76646 76645 76644 76643
90395 76138 76636 76637 76638 76639
90399 76141 76680 76681 89680 89674 76691 76690 76689 76687 76688 76686 76685 76684 76683 76682
]]))
Expand Down Expand Up @@ -112,4 +112,3 @@ panel:RegisterFrame(L["Wrath Meta"], Panda.PanelFactory(25229,
[[41334 41380 41381 41382 41385 41389 41395 41396 41397 41398 41401
41266 41285 41307 41333 41335 41339 41375 41376 41377 41378 41379 41400
]]))

111 changes: 49 additions & 62 deletions Glyphs.lua
View file
Expand Up @@ -19,47 +19,33 @@ CreateFrame("Frame", nil, panel):SetScript("OnShow", function() if GetReagentCos


panel:RegisterFrame(MAJOR_GLYPHS, Panda.PanelFactory(45357,
[[79251 79254 83096 83107 0 0 0 79514 0 85684 0 85691 85692 84652 0 79731
0 0 0 81956 0 0 0 79515 0 0 82345 85685 85687 85689
61979 61978 63481 0 0 0 0 0 0 0 0 0 0 0 0 44680
39343 43126 43425 41110 42745 42969 41539 42409 42454 42909 40906 87897 43534
0 0 43421 45744 42753 42954 41524 42407 42464 42915 40915 87898 43542
0 0 43415 43869 44684 45767 41529 42403 42472 42914 40912 87899 43547
0 0 43419 41102 42739 42958 41526 42414 50077 42901 45603 87900 43533
0 0 43431 41109 63539 42957 41517 42412 42460 42902 45604 87896 43552
0 0 43430 41097 42752 42959 41538 42405 45782 42899 40920 87901 43537
0 0 45793 41101 42748 42968 41518 42396 45783 42913 40908 85695
0 0 0 41107 42754 42971 45777 42404 0 42917 40899 85696
0 0 0 43867 44920 45766 41534 42417 0 0 40921 85697 85697
0 0 0 43868 69773 0 41552 45757 0 0 44928 87892 85700
0 0 0 45745 0 0 71155 0 0 0 0 85695 85696
0 0 0 66918 0 0 0 0 0 0 0 87892 85699
39342 43124 45795 45741 45737 45769 45770 45758 45780 42906 45602 87894 45800 68793
0 0 45792 45742 50045 63420 45772 42401 45779 45731 40896 87895 45799 43825
0 0 43428 45743 42736 42955 45771 45756 45781 45625 40903 0 43554 43553
0 0 45790 41105 45736 42963 41527 45755 0 42911 67484 0 43826
0 0 43432 0 44955 45764 41542 45753 0 0 45601 0 43549
0 0 0 0 42749 45761 0 42406 0 0 0 0 43548
39341 43122 67482 41103 0 42974 45776 45760 0 42905 45622 87893 43541 43536
0 0 43416 0 0 0 41541 42399 0 0 40901 0 45804 43546
0 0 0 0 0 0 0 87902 0 0 0 0 43543
39340 43120 43414 45746 45740 42972 41535 42397 42470 42904 40902 87880
0 0 0 41098 42744 42973 41533 42416 42466 42903 40916
0 0 0 41099 0 0 0 79513 0 0 45623
39339 43118 67483 41104 42746 42970 41547 42411 43392 45733 40909 87891
0 0 43422 0 42738 64493 0 42415 0 42910
0 0 43424 0 0 42966 0 43370 0 43674
0 0 0 0 0 0 0 43372
39338 43116 43423 41106 42737 42961 41532 42400 42465 42898 40923
0 0 43417 41092 0 42962 41536 42398 42458 42908 67487
0 0 45797 45747 0 42964 43725 42402 0 45734 40924
0 0 43427 41108 0 0 41530 0 0 42900 40914
0 0 0 0 0 0 43344 0 0 0 43331
0 0 0 0 0 0 0 0 0 0 67485
39334 39774 43418 41095 42741 42960 45778 42410 45785 45735 40922
0 0 43413 41096 0 0 41531 42408 42455 42907 40913
0 0 43397 41094 0 0 0 0 42462 0 40897
0 0 43399 43367 0 0 0 0 43390 0 48720
[[79251 79254 43425 0 42744 45769 43725 79514 42465 42901 45622 43553 87901 0 0 79731
0 0 43421 0 42746 42974 0 42403 0 0 43331 43554
0 0 0 0 0 42964 0 42408 0 0 40916
61979 61978 43414 83107 45740 63420 45776 42404 43390 45735 45623
0 0 0 45741 0 0 0 42410 43390
0 0 0 41108
39343 43126 43419 41101 42753 42971 41518 42407 45785 42898 40903 0 87893
0 0 0 0 42736 0 0 0 42466
39342 43124 43430 41094 44920 42957 41524 42409 42470 42908 0 45800 85699
0 0 0 0 44955 42966 0 0 0 104270 0 43533 85696
39341 43122 43399 81956 0 0 41527 42412 0 42905 40920 43536
0 0 43428 41099 0 0 41517 45755 0 104276 0 43537
39340 43120 43432 41110 63539 64493 41526 45758 42472 45731 45604 43546 85700
0 0 43417 0 0 0 41542 45760 0 42915 0 43826
0 0 0 0 0 0 0 0 0 0 0 43547
39339 43118 0 43869 0 42960 45771 42415 0 42903 40912 104046 85695
0 0 0 41102 0 42970 45778 42396 0 42902 0 45799 85691
0 0 0 41096 0 42968 41529 87902
0 0 0 0 0 0 104052
39338 43116 43422 66918 42739 42973 41538 42397 45783 42904 0 43552 87897
0 0 45790 41095 0 0 45772 42405 0 42910 0 104048 87895
0 0 0 0 0 0 41530 0 0 0 0 0 84652
39334 39774 45792 104050 42745 45761 41532 79513 42454 42917 40921 45804 87900
0 0 67483 0 50045 42963 41552 42417 45782 0 45601 0 87894
0 0 0 0 0 0 41533 45757
39151 39469 45795 104051 42748 42961 41541 79515 50077 42906 45602 43548 87899
0 0 45793 0 42754 0 0 42399 0 45733 0 43549 87880
]], nil, function(frame)
frame:SetAttribute("type", "macro")
if frame.id == 44680 then
Expand All @@ -72,27 +58,28 @@ end))


panel:RegisterFrame(MINOR_GLYPHS, Panda.PanelFactory(45357,
[[79251 79254 80588 80586 80584 0 86541 79538 0 87278 87883 87884 87887 0 0 44680
0 0 80587 80581 0 0 87276 87277 0 87279 0 87885 87889
0 0 85221 80585 0 0 87392 0 0 0 0 85698 87890
39343 43126 45794 0 45739 42965 44923 43374 43394 45732 44922 87881 43550
0 0 49084 0 42751 42967 0 0 42457 85683 40900 87888
0 0 43412 0 0 0 0 0 42459 0 0 87882
0 0 0 0 0 0 0 0 42463 42456 0 90715
39342 43124 43400 0 45738 45762 0 0 42471 0 0 43671 43539 43672 43673 45806
0 0 0 0 0 0 0 0 42453 0 0 43535 43544 43827 43551
39341 43122 0 0 0 45768 45775
39340 43120 0 0 0 43378 0 0 0 43355
39339 43118 0 43369 63416 0 43388 0 43393 43351 43334
0 0 0 41100 0 0 43381 0 42473 42897 68039 89868
0 0 0 0 0 41540 43385 0 42467 0 40919 67486
39338 43116 43398 43365 43360 43376 43386 43373 43389 87393 43316
0 0 0 43368 42735 43377 0 0 43391
0 0 0 0 0 43380 0 93202 42461 45789
39334 39774 43395 43366 43339 43379 41537 43342 0 43338 43335
0 0 43396 43340 43359 43343 0 43371 0 43350 43332
0 0 0 0 43364 42956 0 0 0 43356
0 0 0 42743 43361 0 0 0 0 42912
[[79251 79254 45794 104108 43359 0 45775 87277 0 43350 0 0 87890
0 0 0 80586 0 0 104130
61979 61978 80588 0 42751 45768 104131 79538 42453 45732 43334 43544 87889
0 0 49084 0 0 43376 41540 87392 43393 0 43335 43673 87881
39343 43126 43395 43365 0 43380 104133 43342 42456 85683 67486 43671 87888
0 0 104135 0 0 0 43381 86541 0 0 40919 43672 87883
0 0 0 0 0 0 0 104109
39342 43124 104136 43368 42743 43378 104134 43371 42461 0 68039 43827 87884
0 0 43396 0 0 0 43385 104120 42459 0 43316
39341 43122 104137 41100 63416 42965 104129 43373 43389 87393 89868 45806 87885
0 0 0 0 0 43377 43388 0 42463
39340 43120 43412 104107 43364 42967 41537 0 43391 42897 40900 0 87882
0 0 104138 43369 0 42956 44923
39339 43118 43398 0 104104 104123 0 0 45789 43351 104102 43550 87887
0 0 43400 0 0 0 0 0 43394
0 0 80587
39338 43116 85221 80581 104105 104124 104126 43374 93202 43338 104103 43535
0 0 0 0 0 43379 0 0 0 0 43332
39334 39774 0 43366 104106 43343 104127 0 42467 42912 0 104099
0 0 0 80584 0 0 0 0 0 43355 0 43539
39151 39469 0 80585 45738 45762 104128 104122 42457 43356 44922 43551
0 0 0 43340 0 0 43386 87276 42473
]], nil, function(frame)
frame:SetAttribute("type", "macro")
if frame.id == 44680 then
Expand Down
2 changes: 1 addition & 1 deletion Panda.toc
View file
@@ -1,4 +1,4 @@
## Interface: 50200
## Interface: 60000

## Title: Panda
## Notes: Prospecting and Disenchanting Aide
Expand Down
5 changes: 5 additions & 0 deletions changelog.txt
View file
@@ -1,3 +1,8 @@
6.0.0.47-Beta
New glyphs!
Show bank counts for reagentbank
Fix DE panel for folks with a single profession

5.2.0.46-Beta
Add reagents to the enchanting panda panel

Expand Down

0 comments on commit 7e6f350

Please sign in to comment.