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

Adding rendering for shop=coffee #2386

Merged
merged 1 commit into from Jan 19, 2017
Merged

Conversation

kocio-pl
Copy link
Collaborator

Resolves #2227.

The number of uses is currently 1986, so very close to a safe 2k limit.

78ebfvb5

@micahcochran
Copy link
Contributor

shop=coffee is now at 2070 uses.

@matthijsmelissen
Copy link
Collaborator

@kocio-pl Could you rebase this?

@kocio-pl
Copy link
Collaborator Author

Done.

@nebulon42
Copy link
Contributor

The icon is ok. But I'm against merging this until the shop discussion has progressed further.

@kocio-pl
Copy link
Collaborator Author

Depends on #2444 then.

@kocio-pl
Copy link
Collaborator Author

kocio-pl commented Dec 4, 2016

There's no progress in the shop discussion, so I'm not sure what to do - I'm ready to rebase it, but it's tedious for me as a casual git user, so it makes sense only if merging probability is high.

@matthijsmelissen
Copy link
Collaborator

I think we need to give the shop discussion some more time.

@nebulon42
Copy link
Contributor

I would say let's merge that one in since it is already proposed. It makes a round 50 of shop icons. But I would be reluctant to accept new proposals.

@matthijsmelissen
Copy link
Collaborator

Yes, good idea.

@kocio-pl
Copy link
Collaborator Author

kocio-pl commented Dec 5, 2016

Done. I hope that SVG code is proper.

@kocio-pl
Copy link
Collaborator Author

Is there any problem left to solve here?

@nebulon42
Copy link
Contributor

Sorry for the long delay. I would merge it right away, but I saw that you are using a transform to rotate the bean. If you could clean this up (remove the transform) this would be great. If this is too much work I would also merge it as is.

@kocio-pl
Copy link
Collaborator Author

I have used file from @Jotam and I don't know how to fix this problem. If you or him (or anybody else) could fix the icon, I would simply update the code.

@nebulon42
Copy link
Contributor

Turned out to be quite easy. Can you check for the last time? Then I will merge this.

@kocio-pl
Copy link
Collaborator Author

Ready. I've checked and it works as expected. I made it to be just one commit.

Copy link
Contributor

@nebulon42 nebulon42 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rendering test ok.

@nebulon42 nebulon42 merged commit a392f9c into gravitystorm:master Jan 19, 2017
@kocio-pl kocio-pl deleted the coffee branch January 19, 2017 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Icon for shop=coffee
5 participants