Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Power system should react on changes to powerValue #506

Merged
merged 7 commits into from
Aug 22, 2016
Merged

Power system should react on changes to powerValue #506

merged 7 commits into from
Aug 22, 2016

Conversation

Grenkin1988
Copy link
Contributor

#502

Related to #436

@WardBenjamin WardBenjamin changed the title [Enhancement] Power system should react on changes to poawerValue Power system should react on changes to poawerValue Aug 21, 2016
@WardBenjamin WardBenjamin changed the title Power system should react on changes to poawerValue Power system should react on changes to powerValue Aug 21, 2016
@vogonistic
Copy link
Collaborator

This PR has merge conflicts

@Grenkin1988
Copy link
Contributor Author

That's rude. If all the time new PR's are going to be merged before more old one...

@vogonistic
Copy link
Collaborator

I can understand it feels that way, but it's doesn't make it true.

@Grenkin1988
Copy link
Contributor Author

So right now I would do like this #558 and style all the files for everyone, that's OK?

@vogonistic
Copy link
Collaborator

Please stick to the issue at hand. If you have complaint at how things are done, you can either send an email to that person, open an issue or email quill. I'm online now in Discord if you want to chat about it.

@Grenkin1988
Copy link
Contributor Author

Resolved conflicts

@Grenkin1988
Copy link
Contributor Author

Now there is a bug...

@vogonistic vogonistic merged commit 67479b1 into TeamPorcupine:master Aug 22, 2016
@Grenkin1988 Grenkin1988 deleted the power-update branch August 22, 2016 06:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants