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.

Sign up for GitHub

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

Devolvement of issues #145 + missing signs #536

Merged
merged 10 commits into from
May 7, 2024
Merged

Devolvement of issues #145 + missing signs #536

merged 10 commits into from
May 7, 2024

Conversation

TyBraniff
Copy link
Contributor

Added Cherry and Bamboo signs.

@TyBraniff
Create cherry.json
0be4bca
@TyBraniff
Create bamboo.json
7f3b6db
@TyBraniff
Create wall_cherry.json
2e257e7
@TyBraniff
Create wall_bamboo.json
6fbd40d
@TyBraniff
Merging project
59f42da 
Merging TysFixes resource pack with main Bluemap
@TyBraniff
Update blockColors.json
7330870 
Merging TysFixes Phase3
@TyBraniff
Merging projects
269b1f7 
Adding everything from TysFixes Resource pack to core bluemap
@TyBraniff
Copy link
Contributor Author

Updated to include everything from my fixes resource pack which should satisfy most of #145

Not sure I'm doing these pull requests right, hopefully its all copasetic.

Live Examples

@TyBraniff TyBraniff changed the title Added missing signs Devolvement of issues #145 + missing signs May 3, 2024
TBlueF
TBlueF requested changes May 4, 2024
View reviewed changes
Copy link
Member

@TBlueF TBlueF left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work! Thanks a ton for this :)
And yes, you are doing these pull requests perfectly right :D

...pCore/src/main/resourceExtensions/mc1_20_3/assets/minecraft/models/entity/decorated_pot.json Outdated Show resolved Hide resolved
...MapCore/src/main/resourceExtensions/mc1_20_3/assets/minecraft/models/entity/dragon_head.json Outdated Show resolved Hide resolved
...re/src/main/resourceExtensions/mc1_20_3/assets/minecraft/models/entity/dragon_wall_head.json Outdated Show resolved Hide resolved
@TyBraniff
Copy link
Contributor Author

Was hopeful that would fix the decorated_pot not loading right. However it didn't. Edits are made. Thanks for the catch.

@TBlueF TBlueF changed the base branch from master to wip/v5 May 7, 2024 14:47
@TBlueF TBlueF merged commit a311fc1 into BlueMap-Minecraft:wip/v5 May 7, 2024
2 checks passed
@TBlueF
Copy link
Member

TBlueF commented May 7, 2024 •
edited
Loading

(Squash-) Merged this into my v5 branch so github retains you as the commit-author :)
I will be restructuring the resource-extensions a bit, but like this you won't have to do anything and it will be included in BlueMap v5 which i am rn working towards :)

@TyBraniff Again, awesome work, thanks a lot for this PR!

@Phoenix616
Copy link

Phoenix616 commented Jun 11, 2024 •
edited
Loading

All the non-full rotations of the hanging signs have a 0.5 offset to the true values :S (e.g. 22 should be 22.5 here as it's 45/2 or 360/16)

@TBlueF
Copy link
Member

TBlueF commented Jun 11, 2024

@Phoenix616 Good catch!
If you think the effort is worth it for half a degree, please PR a fix :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TBlueF TBlueF TBlueF requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@TyBraniff @TBlueF @Phoenix616