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

Add missing blocks from 1.10/1.11/1.12 #352

Open
wants to merge 3 commits into
base: development
Choose a base branch
from
Open

Add missing blocks from 1.10/1.11/1.12 #352

wants to merge 3 commits into from

Conversation

Gloorf
Copy link

@Gloorf Gloorf commented Sep 23, 2017

Also removes duplicates & trailing whitespace in the blocks definitions

@TonyGravagno
Copy link
Collaborator

I'd take it but @walter is strongly adverse to whitespace changes, so you'll have to wait for his decision on a few of the lines.

@Gloorf
Copy link
Author

Gloorf commented Sep 27, 2017

I'm just removing a couple of trailing whitespaces (because usually there is none in the file), i'm not changing the whole indentation scheme of the document :)

@walterhiggins
Copy link
Owner

Hi @Gloorf
If you can reinstate stone and fence I'm happy to merge this.

@Gloorf
Copy link
Author

Gloorf commented Oct 1, 2017

stone (actually it's slab.stone) is already defined line 98 : https://github.com/walterhiggins/ScriptCraft/blob/development/src/main/js/modules/blocks.js#L98
and fence is actually overwritten by the fence object on line 323 : https://github.com/walterhiggins/ScriptCraft/blob/development/src/main/js/modules/blocks.js#L323 so it was never used anyway. I fixed the fence object itself (correct data value for oak, added dark oak & nether brick fence)

@jonathanperret
Copy link
Contributor

Looks fine to me, although I'd have picked fence.netherbrick over fence.nether_brick since we already have slab.netherbrick.

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.

4 participants