-
Notifications
You must be signed in to change notification settings - Fork 3.2k
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
Some new hairstyles! #31010
Open
Futuristic-OK
wants to merge
18
commits into
space-wizards:master
Choose a base branch
from
Futuristic-OK:new-hairs
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Some new hairstyles! #31010
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
34765dd
Add files via upload
Futuristic-OK 39935e2
Update meta.json
Futuristic-OK a9dfb60
Update human_hair.yml
Futuristic-OK 5b04b1d
Update human-hair.ftl
Futuristic-OK b45bc09
second try
Futuristic-OK 7315c7b
fix meta
Futuristic-OK dd12e7b
Add files via upload
Futuristic-OK cf90385
Add files via upload
Futuristic-OK 0b7b538
Add files via upload
Futuristic-OK d776a42
Add files via upload
Futuristic-OK 7130b63
Add files via upload
Futuristic-OK a22dfc7
Add files via upload
Futuristic-OK 3448dff
Add files via upload
Futuristic-OK 6730b01
Merge branch 'master' into new-hairs
Futuristic-OK c48db3c
dd
Futuristic-OK 8766424
Add files via upload
Futuristic-OK 9c38aae
Add files via upload
Futuristic-OK 91ea756
Update human-hair.ftl
Futuristic-OK File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+2.01 KB
Resources/Textures/Mobs/Customization/human_hair.rsi/capsdaughter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Needs commas here after the names
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed