Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
TannerShmoog committed Sep 26, 2022
2 parents 1e50956 + d5237be commit ef0d4e6
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 6 deletions.
1 change: 1 addition & 0 deletions Globals.lua
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,7 @@ addon.GroupieDevs = {
["Player-4408-03D2C5E2"] = L["TeamMember"], -- Gogoshaman-Faerlina
["Player-4408-03D2C21E"] = L["TeamMember"], -- Gogowarlock-Faerlina
["Player-4408-03D2C4C4"] = L["TeamMember"], -- Gogowarrior-Faerlina
["Player-4408-04867AC4"] = L["TeamMember"], -- Jarsjarsdk-Faerlina
["Player-4408-03AA25B2"] = L["TeamMember"], -- Kattz-Faerlina
["Player-4647-023571C6"] = L["TeamMember"], -- Kynura-Grobbulus
["Player-4467-02AB80C7"] = L["TeamMember"], -- Raegen-Firemaw
Expand Down
36 changes: 30 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ A better LFG tool for Classic WoW.

### :gem: **KEY FEATURES**

<br>

* Quickly find the groups you actually want to be in. You can filter groups by group-size, loot rules type, language, and more. Groupie is smart enough to hide dungeons out of your level range, and heroics or raids that you're already saved to.

* One-click ability to share your character's role, key stats, and relevant achievement link with the group's leader. For group leaders, this means no more context-less "wants to join" pop-ups from the Blizzard LFG Tool, or random "inv" responses to your posts.
Expand All @@ -32,6 +34,8 @@ Some other stuff worth mentioning...

### :link: **LINKS**

<br>

Download from CurseForge : https://www.curseforge.com/wow/addons/groupie

Discord : https://discord.gg/p68QgZ8uqF
Expand All @@ -44,6 +48,8 @@ Reddit Announcement Post : TODO

### :hand: **CURRENT NEEDS**

<br>

As a new add-on, we can use a hand raising awarenss. Telling your friends about Groupie will really help us get traction. (=

If you're a Streamer, please feel free to plug or review Groupie on your channel.
Expand All @@ -68,12 +74,30 @@ We can also use help translating the add-on. Reach out on Discord if you want to

### 🆒 **OTHER STUFF**

Groupie pairs really nicely with WIM!
<br>

**WoW Instant Messenger**
>
> Groupie pairs really nicely with WIM!
>
> Download from CurseForge : https://www.curseforge.com/wow/addons/wim-3
<br>

#### Other Projects from the Groupie Team

<br>

> **WoW Instant Messenger**
> https://www.curseforge.com/wow/addons/wim-3
**GDKPd** by Gogo & LemonDrake
>
> Automate Your GDKP Auctions, Bids, & Payouts in Classic WoW.
>
> Download from CurseForge : https://www.curseforge.com/wow/addons/gdkpdclassic
Help your team put their best foot forward.
<br>

> **RankSentinel** by @SabreValkyrn
> https://www.curseforge.com/wow/addons/ranksentinel
**RankSentinel** by Kynura & Gogo
>
> Help your team put their best foot forward.
>
> Download from CurseForge : https://www.curseforge.com/wow/addons/ranksentinel

0 comments on commit ef0d4e6

Please sign in to comment.