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

Bump farming from 32ae94e to f7524e1 #997

Closed
wants to merge 1 commit into from

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Sep 6, 2020

Bumps farming from 32ae94e to f7524e1.

Commits
  • f7524e1 update recipes to use water/river-water buckets, also support for wooden buck...
  • a7a7a55 Change blueberries to Wild Blueberries
  • See full diff in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Bumps [farming](https://github.com/minetest-mirrors/farming) from `32ae94e` to `f7524e1`.
- [Release notes](https://github.com/minetest-mirrors/farming/releases)
- [Commits](minetest-mirrors/farming@32ae94e...f7524e1)

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot added the dependencies Pull requests that update a dependency file label Sep 6, 2020
@OgelGames
Copy link
Contributor

Change blueberries to Wild Blueberries

This will make things confusing with canned food, blueberry jam will be made from wild blueberries (farming:blueberries), and wild blueberry jam from blueberries (default:blueberries)... 😕

default:blueberries should be wild, because they grow on bushes, and farming:blueberries should not be wild because they grow as a small plant 😖

Maybe names should be overridden in pandorabox_custom?

@BuckarooBanzay
Copy link
Contributor

default:blueberries should be wild, because they grow on bushes, and farming:blueberries should not be wild because they grow as a small plant confounded

Ugh 🤦
The name change sounds good 👍 it should even be possible to use the existing translations, i'll look into it and merge this when the names are swapped

BuckarooBanzay added a commit to pandorabox-io/pandorabox_custom that referenced this pull request Sep 7, 2020
BuckarooBanzay added a commit that referenced this pull request Sep 7, 2020
@BuckarooBanzay
Copy link
Contributor

superseeded by #1005 (wow, lots of pr's... 😲)

@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Sep 7, 2020

OK, I won't notify you again about this release, but will get in touch when a new version is available.

If you change your mind, just re-open this PR and I'll resolve any conflicts on it.

@dependabot dependabot bot deleted the dependabot/submodules/farming-f7524e1 branch September 7, 2020 06:27
BuckarooBanzay added a commit that referenced this pull request Sep 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants