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

Add new mobs to transformation powder #2150

Closed
wants to merge 8 commits into from
Closed

Add new mobs to transformation powder #2150

wants to merge 8 commits into from

Commits on Jun 27, 2024

  1. Add new mobs to transformation powder

    @Sleepy-Horse
    Sleepy-Horse committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    b3ebcbb View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. Merge branch 'TeamTwilight:1.21.x' into 1.21.x-transformation-powder

    @Sleepy-Horse
    Sleepy-Horse committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    682342c View commit details
    Browse the repository at this point in the history

  2. Remove golems from transformation powder

    @Sleepy-Horse
    Sleepy-Horse committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    429f7c0 View commit details
    Browse the repository at this point in the history

  3. Remove duplication of hedge spider

    @Sleepy-Horse
    Sleepy-Horse committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    dfc9d87 View commit details
    Browse the repository at this point in the history

  4. Change SWARM_SPIDER to CARMINITE_BROODLING for cave spider in transfo… 

    …rmation powder
    @Sleepy-Horse
    Sleepy-Horse committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    a3823ea View commit details
    Browse the repository at this point in the history

  5. Run datagen

    @Sleepy-Horse
    Sleepy-Horse committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    ece3a30 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. Merge branch 'refs/heads/1.21.x' into 1.21.x-transformation-powder 

    # Conflicts:
#	src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f
    @Sleepy-Horse
    Sleepy-Horse committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    af8bb96 View commit details
    Browse the repository at this point in the history

  2. Resolve merge conflict

    @Sleepy-Horse
    Sleepy-Horse committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    c8956ee View commit details
    Browse the repository at this point in the history