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

Implemented brewing stands #632

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Implemented brewing stands #632

wants to merge 15 commits into from

Commits on Aug 7, 2022

  1. dragonfly: Started implementing brewing stands.

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

Commits on Aug 8, 2022

  1. recipe: Load and send brewing recipes.

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

  2. block/brewing_stand.go: Full brewing functionality.

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

  3. block/brewer.go: Added missing docs.

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

  4. Merge branch 'master' into feature/brewing-stands

    @JustTalDevelops
    JustTalDevelops authored Aug 8, 2022
    Configuration menu
    Copy the full SHA
    40208b6 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2022

  1. undo doc refactor

    @DaPigGuy
    DaPigGuy authored Aug 21, 2022
    Configuration menu
    Copy the full SHA
    f6d2c6a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/brewing-stands 

    # Conflicts:
#	server/server.go
#	server/session/player.go
#	server/world/sound/block.go
    @DaPigGuy
    DaPigGuy committed Aug 21, 2022
    Configuration menu
    Copy the full SHA
    c52bb8f View commit details
    Browse the repository at this point in the history

  3. block/brewing_stand.go: make water loggable

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

  4. block/brewing_stand.go: implement Breakable

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

  5. block/brewing_stand.go: implement LightEmitter

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

  6. block/brewing_stand.go: implement LightDiffuser

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

  7. session/player.go: fixed bad merge

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

Commits on Dec 16, 2022

  1. Merge branch 'master' into feature/brewing-stands 

    # Conflicts:
#	server/internal/sliceutil/sliceutil.go
#	server/server.go
#	server/session/player.go
#	server/session/world.go
#	server/world/viewer.go
    @DaPigGuy
    DaPigGuy committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    57331d4 View commit details
    Browse the repository at this point in the history

  2. fix merge issues

    @DaPigGuy
    DaPigGuy committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    3242ecf View commit details
    Browse the repository at this point in the history

  3. fix formatting issue

    @DaPigGuy
    DaPigGuy committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    933a2cd View commit details
    Browse the repository at this point in the history