Skip to content

Conversation

@gregboiczyk
Copy link

No description provided.

gmlaxfanatic and others added 2 commits August 5, 2013 15:59
Added some other potion IDs to material list
Adds animal husbandry factory (also includes Matta's factory changes)
@pruby
Copy link
Owner

pruby commented Aug 26, 2013

Hi, can't merge this one automatically. Ideally you'd rebase this one commit and resolve any conflicts:

git reset --hard 99780fc
git remote add pruby https://github.com/pruby/FactoryMod-1
git fetch pruby
git rebase pruby/master

You'll then need to resolve conflicts, add the files and "git rebase --continue" to finish.

Added hay bale recipe to wood cauldron that costs 143 hay bales and 24
glass bottles for 24 xp bottles.  Uses slightly more wheat than wheat
recipe
pruby pushed a commit that referenced this pull request Feb 10, 2014
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.

3 participants