search

Civcraft / JukeAlert

Do not open issues here; open them on the maintained fork @ DevotedMC
https://github.com/DevotedMC/JukeAlert
BSD 3-Clause "New" or "Revised" License
5 stars 15 forks source link

Mercury Updated #32

Closed suirad closed 9 years ago

suirad commented 9 years ago

Added a bit of code to update mercury functionality of JukeAlert. Added a configurable option to enable/disable cross server snitch alerts.

suirad commented 9 years ago

@rourke750 @ttk2 @drjawa Good to merge

rourke750 commented 9 years ago

You got the wrong import for chatcolor

@rourke750 https://github.com/rourke750 @ttk2 https://github.com/ttk2 @drjawa https://github.com/drjawa Good to merge, this probably needs a CLA

— Reply to this email directly or view it on GitHub https://github.com/Civcraft/JukeAlert/pull/32#issuecomment-114597873.

suirad commented 9 years ago

@rourke750 good catch, want me to submit another pull or not worry about it?

jjj5311 commented 9 years ago

you should't need a new pull just fix it in your master and it will be added here as another commit... nevermind its already merged

rourke750 commented 9 years ago

@drjawa ...................

@suirad looks like you need to do a new pull

suirad commented 9 years ago

Ah okay, wasnt sure it would pick it up since its already merged. Actually if jawa/rourke wants to revert i can squash that new commit no problem

ghost commented 9 years ago

Oh you said it was good to merge. Missed the chat color. I reverted.

ghost commented 9 years ago

Though it seems once a pull is closed it doesn't reopen so a new pull might be needed away.

rourke750 commented 9 years ago

Well the revert wasn't needed. It'll just complicate things. On Jun 23, 2015 2:58 PM, "Dr. Andrew Jawa" notifications@github.com wrote:

Oh you said it was good to merge. Missed the chat color. I reverted.

— Reply to this email directly or view it on GitHub https://github.com/Civcraft/JukeAlert/pull/32#issuecomment-114608264.

suirad commented 9 years ago

Updated my commit, want me to make another pull?

rourke750 commented 9 years ago

Yes pls On Jun 23, 2015 3:01 PM, "Darius Scott" notifications@github.com wrote:

Updated my commit, want me to make another pull?

— Reply to this email directly or view it on GitHub https://github.com/Civcraft/JukeAlert/pull/32#issuecomment-114609807.

suirad commented 9 years ago

https://github.com/Civcraft/JukeAlert/pull/34