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

Starting weapons/armor #4143

Merged
merged 1 commit into from Nov 7, 2013

Conversation

Projects
None yet
3 participants
@John-Candlebury
Copy link
Contributor

commented Nov 4, 2013

Added 5 starting weapons and 3 armors they are all craft able from materials inside the starting shelter.

John-Candlebury
@KA101

This comment has been minimized.

Copy link
Contributor

commented Nov 4, 2013

FYI, it's better-practice to make a branch for (each of) your mods, and do all the work there. Saves having to rip your repo out and re-fork every time, and lets you work on more than one thing without having them all pile up in each others' PRs.

Looks good from my perspective, though.

@John-Candlebury

This comment has been minimized.

Copy link
Contributor Author

commented Nov 5, 2013

Hmm so i should fork my own master and then make changes to that one? Okay i dint knew that on thanks for the insight.

And well I guess i will divide the next items in item/recipe pair

@KA101

This comment has been minimized.

Copy link
Contributor

commented Nov 5, 2013

Not "fork": "branch". If you're using the Windows client, there's a button in the upper-right corner, probably says "master" and has a branchy-looking thing on it. Hit that and it'll let you create new branches and switch between them.

Save you making my mistake: switch back to "master" before making a new branch. Otherwise, you end up daisy-chaining and your changes show up in other PRs. And then, if you're me, you feel daft and you facepalm.

But I haven't made that mistake again!

@John-Candlebury

This comment has been minimized.

Copy link
Contributor Author

commented Nov 5, 2013

Ahh OK i get what you meant now! Thanks there's a clear branch button in the upper left

@kevingranade kevingranade merged commit 7781e3c into CleverRaven:master Nov 7, 2013

1 check passed

default Merged build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.