The4codeblocks/farming

Fork 0

forked from tenplus1/farming

Code Pull requests 1 Activity

master #3

Open

The4codeblocks wants to merge 42 commits from tenplus1/farming:master into master

pull from: tenplus1/farming:master

merge into: The4codeblocks:master

The4codeblocks:master

The4codeblocks:fixhoerecipe

The4codeblocks:fixapi

Conversation 0 Commits 42 Files changed 56 +1011 -345

The4codeblocks commented

2026年06月27日 15:16:09 +02:00

Owner

Copy link

No description provided.

The4codeblocks added 42 commits

2026年06月27日 15:16:11 +02:00

fix api.txt hoe recipe, add check for register_hoe recipe (thx the4codeblocks) 0f07c2975c

lower weed chance de98fae58a

add {food=[1=other,2=food,3=drink} groups to food items for additional mod support. 61cd1f43d3

lil tweak 2816ba5c4c

how bomb can also remove weeds 8ea0df6603

Add 'farming_floodable_crops' setting for floodable crops. b74249a6f0

add farming.grow_plant() function and missing next_plant names 7133692e5a

replace anyhoo 439f6e12a0

add {rope} group to hemp rope 649f41a050

tweak n tidy code, add lucky blocks 560d0cd88d

tidy reg_plant_stages and place_seed functions bbe0b032c4

fix typo in French locale (thx CrazyladMT) 8b57afa799

new cooking utensil textures (thx SkyBuilder1717) 3d83d8c99b

update utensil textures d5c8dd12b7

tweak hoe_on_use and mithril scythe 90627c8b6d

hoe compatibility with mineclonia 88b221119c

add kiwi vine to savanna (prairie in ethereal) 85f22643c5

increase kiwi chance 80a8ac32e9

add kiwi sorbet bd3389dd5d

kiwi sorbet - 8hp 24254a55ec

add lb 130be756ff

kiwi sorbet texture e102dd773a

add certain crops to ebiomes 61d9e67732

add kiwi to conf example a343f532e2

add crop spawn ratio into settingtypes.txt ba87119fca

make sure grass doesnt drop disabled seeds 6478137513

fix nil 2d8a6d3c68

better under 75155b8278

add new indian foods and rolling pin c17dc0318f

tweak chapathi and samosa recipes 4bb65ae1b1

add tortang talong 8d76749967

tweak tortang texture and description 7cc6c9c3ec

tweak kiwi schem 7f12a2a667

Fox rogue T and use l. 98c8b6e667

add vegan egg substitute 1b3e80b8bd

add {vine} group to kiwi vines for chainsaw support, sunflower min light is now 13 c5fc57f218

vine > vines edf552cdb2

tweak food recipes, add acv 028a7b6ea1

fix a few mineclonia recipes beccb59a77

make acv into node, change recipe if Wine mod found ed96177248

add cinnamon powder/roll f6a98ea0fd

fix acv typo da0a4f2ffd

This pull request has changes conflicting with the target branch.

api.txt
hoes.lua

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'master' (#3) from tenplus1/farming:master into master

Merge commit body

Reviewed-on: https://codeberg.org/The4codeblocks/farming/pulls/3

Merge pull request 'master' (#3) from tenplus1/farming:master into master
Reviewed-on: https://codeberg.org/The4codeblocks/farming/pulls/3

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u master:tenplus1-master

git switch tenplus1-master

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master

git merge --no-ff tenplus1-master

git switch tenplus1-master

git rebase master

git switch master

git merge --ff-only tenplus1-master

git switch tenplus1-master

git rebase master

git switch master

git merge --no-ff tenplus1-master

git switch master

git merge --squash tenplus1-master

git switch master

git merge --ff-only tenplus1-master

git switch master

git merge tenplus1-master

git push origin master

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

The4codeblocks/farming!3

No description provided.

Delete branch "tenplus1/farming:master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?