Hekili / hekili

Hekili Priority Helper for DPS and Tanks (WoW Retail)
298 stars 162 forks source link

[Cataclysm] Update and Fix Feral Druid #3307

Closed SergioRt1 closed 1 week ago

SergioRt1 commented 1 week ago

Changes:

Supernuss commented 1 week ago

@Hekili Some, but not all of these changes are also in https://github.com/Hekili/hekili/pull/3298. I'm not sure if @SergioRt1 based his changes on my branch, if not we will probably get merge conflicts/duplicates when his PR goes before mine, since we changed similar parts.

SergioRt1 commented 1 week ago

Oh, I didn't notice. My implementation was done independently, based on the WoWSims code. @Supernuss Would you like me to pull the changes from your branch to resolve any conflicts and redirect this to your branch?

Supernuss commented 1 week ago

No Idea how Hekili wants to proceed. It would be great if he'd merge my PR so I could stop working over multiple Branches.^^ If you'd merge your code into my cata_dk branch I'd also include it in my pre-releases that most (casual players) are using for cata for now. It would also be automatically merged here as long as my PR is still open. @Hekili is currently working on TWW beta, so he'd probably don't have time to review my larger pull requests - least thats what I tell myself :D

Feel free to proceed how you like, I'm open to merging it at a later time if needed - appreciate all work done on Cata 👍

SergioRt1 commented 1 week ago

Moved to https://github.com/Supernuss/hekili/pull/26