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

feat: campfire respawning #346

Merged
merged 13 commits into from
Jul 16, 2024
Merged

feat: campfire respawning #346

merged 13 commits into from
Jul 16, 2024

Commits on Jul 4, 2024

  1. improv: rework portal overlay code; apply to loading screen

    @bconlon1
    bconlon1 committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    19e2fe8 View commit details
    Browse the repository at this point in the history

  2. feat: fall out of aether

    @bconlon1
    bconlon1 committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    2e93f5f View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. feat: wip respawn stuff doesnt work yet

    @bconlon1
    bconlon1 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    4fb3fdb View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2024

  1. improv: basic outpost respawn system works; needs polishing

    @bconlon1
    bconlon1 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    c5433f6 View commit details
    Browse the repository at this point in the history

  2. refactor: polish campfire respawning

    @bconlon1
    bconlon1 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    5f58271 View commit details
    Browse the repository at this point in the history

  3. Merge branch '1.21.0-develop' into feat/bconlon/outpost-respawn-work 

    # Conflicts:
#	src/generated/resources/assets/aether_ii/lang/en_us.json
#	src/main/java/com/aetherteam/aetherii/AetherII.java
#	src/main/java/com/aetherteam/aetherii/attachment/player/PortalTeleportationAttachment.java
#	src/main/java/com/aetherteam/aetherii/client/AetherIIClient.java
#	src/main/java/com/aetherteam/aetherii/data/generators/AetherIILanguageData.java
#	src/main/java/com/aetherteam/aetherii/event/hooks/DimensionTeleportationHooks.java
#	src/main/java/com/aetherteam/aetherii/event/hooks/PortalTeleportationHooks.java
#	src/main/java/com/aetherteam/aetherii/event/hooks/attachment/PortalTeleportationHooks.java
#	src/main/java/com/aetherteam/aetherii/event/listeners/DimensionTeleportationListener.java
#	src/main/java/com/aetherteam/aetherii/event/listeners/PortalTeleportationListener.java
#	src/main/java/com/aetherteam/aetherii/event/listeners/attachment/AerbunnyMountListener.java
#	src/main/java/com/aetherteam/aetherii/event/listeners/attachment/PortalTeleportationListener.java
    @bconlon1
    bconlon1 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    2019af2 View commit details
    Browse the repository at this point in the history

  4. fix: sleeping

    @bconlon1
    bconlon1 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    6001aeb View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2024

  1. improv: move lit handling to block entity

    @bconlon1
    bconlon1 committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    da998ee View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. feat: outpost campfire logic rewrite

    @bconlon1
    bconlon1 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    896de5a View commit details
    Browse the repository at this point in the history

  2. improv: restore respawn function, make generation work

    @bconlon1
    bconlon1 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    dc88508 View commit details
    Browse the repository at this point in the history

  3. Merge branch '1.21.0-develop' into feat/bconlon/outpost-respawn-work

    @bconlon1
    bconlon1 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    64bd41e View commit details
    Browse the repository at this point in the history

  4. feat: item model, temp texture

    @bconlon1
    bconlon1 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    ed2863b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feat/bconlon/outpost-respawn-work' of https://github.co… 

    …m/The-Aether-Team/The-Aether-II into feat/bconlon/outpost-respawn-work
    @bconlon1
    bconlon1 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    2f1b5d3 View commit details
    Browse the repository at this point in the history