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

Jump to bottom

Adds alternate recipe to craft caltrops from wire or barbed wire. #4047

Merged
merged 4 commits into from Nov 3, 2013
Merged

Adds alternate recipe to craft caltrops from wire or barbed wire. #4047

merged 4 commits into from Nov 3, 2013

Conversation

Rivet-the-Zombie
Copy link
Member

No description provided.

@kevingranade
Copy link
Member

Tried merging, this blows up when it tries to load the JSON:
DEBUG: data/json/recipes.json: EOF: expecting string but got 'M-<'

@Rivet-the-Zombie
Copy link
Member Author

Works fine now. Sorry about that!

@kevingranade kevingranade merged commit 86bd8e5 into CleverRaven:master Nov 3, 2013
@Rivet-the-Zombie Rivet-the-Zombie deleted the Alternate-caltrops-recipe! branch November 3, 2013 17:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Rivet-the-Zombie @kevingranade