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

Implement blackstone and deepslate blocks and walls #611

Merged
merged 14 commits into from
Aug 1, 2022
Merged

Implement blackstone and deepslate blocks and walls #611

merged 14 commits into from
Aug 1, 2022

Commits on Jul 30, 2022

  1. block: Implement deepslate and blackstone blocks

    @TwistedAsylumMC
    TwistedAsylumMC committed Jul 30, 2022
    Configuration menu
    Copy the full SHA
    839f40f View commit details
    Browse the repository at this point in the history

  2. block/deepslate.go: Actually set the Axis field

    @TwistedAsylumMC
    TwistedAsylumMC committed Jul 30, 2022
    Configuration menu
    Copy the full SHA
    95d5635 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2022

  1. block/blackstone.go: hardness variable is no longer needed

    @TwistedAsylumMC
    TwistedAsylumMC committed Jul 31, 2022
    Configuration menu
    Copy the full SHA
    7777a86 View commit details
    Browse the repository at this point in the history

  2. block/deepslate_tiles.go: Implement Smeltable

    @TwistedAsylumMC
    TwistedAsylumMC committed Jul 31, 2022
    Configuration menu
    Copy the full SHA
    f66766b View commit details
    Browse the repository at this point in the history

  3. block/deepslate_bricks.go: Implement Smeltable

    @TwistedAsylumMC
    TwistedAsylumMC committed Jul 31, 2022
    Configuration menu
    Copy the full SHA
    1c0cd5c View commit details
    Browse the repository at this point in the history

  4. block/deepslate.go: Implement Smeltable

    @TwistedAsylumMC
    TwistedAsylumMC committed Jul 31, 2022
    Configuration menu
    Copy the full SHA
    5922c05 View commit details
    Browse the repository at this point in the history

  5. block/polished_blackstone_brick.go: Implement Smeltable and missing docs

    @TwistedAsylumMC
    TwistedAsylumMC committed Jul 31, 2022
    Configuration menu
    Copy the full SHA
    1b7ffde View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2022

  1. Merge branch 'master' into feature/blackstonedeepslate

    @JustTalDevelops
    JustTalDevelops committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    d968f87 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/blackstonedeepslate 

    # Conflicts:
#	server/block/register.go
    @TwistedAsylumMC
    TwistedAsylumMC committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    036fd79 View commit details
    Browse the repository at this point in the history

  3. block/stairs_type.go: Add blackstone and deepslate stairs

    @TwistedAsylumMC
    TwistedAsylumMC committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    7ef040f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into feature/blackstonedeepslate

    @TwistedAsylumMC
    TwistedAsylumMC committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    327b586 View commit details
    Browse the repository at this point in the history

  5. fix typo

    @DaPigGuy
    DaPigGuy committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    fea7724 View commit details
    Browse the repository at this point in the history

  6. block/slab_type.go: Add blackstone and deepslate slabs

    @TwistedAsylumMC
    TwistedAsylumMC committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    8b9e5db View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/feature/blackstonedeepslate' int… 

    …o feature/blackstonedeepslate
    @TwistedAsylumMC
    TwistedAsylumMC committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    19c61d6 View commit details
    Browse the repository at this point in the history