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

Thorns enchantment #553

Merged
merged 23 commits into from
Jul 16, 2022
Merged

Thorns enchantment #553

merged 23 commits into from
Jul 16, 2022

Commits on Jul 4, 2022

  1. e

    @HashimTheArab
    HashimTheArab committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    fc8942c View commit details
    Browse the repository at this point in the history

  2. e 2

    @HashimTheArab
    HashimTheArab committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    5db9322 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2022

  1. Merge branch 'df-mc:master' into master

    @HashimTheArab
    HashimTheArab committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    794e5b9 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2022

  1. Merge branch 'df-mc:master' into master

    @HashimTheArab
    HashimTheArab committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    6e8538a View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2022

  1. Merge https://github.com/df-mc/dragonfly

    @HashimTheArab
    HashimTheArab committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    b58bd50 View commit details
    Browse the repository at this point in the history

  2. pog

    @HashimTheArab
    HashimTheArab committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    0f0bfc1 View commit details
    Browse the repository at this point in the history

  3. fix

    @HashimTheArab
    HashimTheArab committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    90235e3 View commit details
    Browse the repository at this point in the history

  4. forgot to add the thorns enchant!

    @HashimTheArab
    HashimTheArab committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    a51301c View commit details
    Browse the repository at this point in the history

  5. fix import cycle

    @HashimTheArab
    HashimTheArab committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    3fae4bc View commit details
    Browse the repository at this point in the history

  6. Merge branch 'df-mc:master' into master

    @HashimTheArab
    HashimTheArab committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    6c57b86 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into enchantment/thorns

    @HashimTheArab
    HashimTheArab committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    530a19c View commit details
    Browse the repository at this point in the history

  8. Update player.go

    @HashimTheArab
    HashimTheArab committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    5acef99 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'enchantment/thorns' of https://github.com/grapedevs/dra… 

    …gonfly into enchantment/thorns
    @HashimTheArab
    HashimTheArab committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    40b4cfb View commit details
    Browse the repository at this point in the history

  10. Update thorns.go

    @HashimTheArab
    HashimTheArab committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    893a78f View commit details
    Browse the repository at this point in the history

  11. Update source.go

    @HashimTheArab
    HashimTheArab committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    0f99ddb View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2022

  1. Merge branch 'df-mc:master' into master

    @HashimTheArab
    HashimTheArab committed Jul 14, 2022
    Configuration menu
    Copy the full SHA
    91f302d View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2022

  1. Update server/player/player.go 

    Co-authored-by: DaPigGuy <mcpepig123@gmail.com>
    @HashimTheArab @DaPigGuy
    HashimTheArab and DaPigGuy committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    7ef4dc6 View commit details
    Browse the repository at this point in the history

  2. Update server/player/player.go 

    Co-authored-by: DaPigGuy <mcpepig123@gmail.com>
    @HashimTheArab @DaPigGuy
    HashimTheArab and DaPigGuy committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    6bdff3e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'df-mc:master' into master

    @HashimTheArab
    HashimTheArab committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    99353e8 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/grapedevs/dragonfly into … 

    …enchantment/thorns
    @HashimTheArab
    HashimTheArab committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    8fa670c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'enchantment/thorns' of https://github.com/grapedevs/dra… 

    …gonfly into enchantment/thorns
    @HashimTheArab
    HashimTheArab committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    8c88b9e View commit details
    Browse the repository at this point in the history

  6. fixes

    @HashimTheArab
    HashimTheArab committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    ec67700 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2022

  1. more stuff

    @HashimTheArab
    HashimTheArab committed Jul 16, 2022
    Configuration menu
    Copy the full SHA
    f11dddb View commit details
    Browse the repository at this point in the history