-
-
Notifications
You must be signed in to change notification settings - Fork 17
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.
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
feat: campfire respawning #346
Merged
Merged
Commits on Jul 4, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 19e2fe8 - Browse repository at this point
Copy the full SHA 19e2fe8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2e93f5f - Browse repository at this point
Copy the full SHA 2e93f5fView commit details
Commits on Jul 5, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 4fb3fdb - Browse repository at this point
Copy the full SHA 4fb3fdbView commit details
Commits on Jul 6, 2024
-
Configuration menu - View commit details
-
Copy full SHA for c5433f6 - Browse repository at this point
Copy the full SHA c5433f6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5f58271 - Browse repository at this point
Copy the full SHA 5f58271View commit details -
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
Configuration menu - View commit details
-
Copy full SHA for 2019af2 - Browse repository at this point
Copy the full SHA 2019af2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6001aeb - Browse repository at this point
Copy the full SHA 6001aebView commit details
Commits on Jul 14, 2024
-
Configuration menu - View commit details
-
Copy full SHA for da998ee - Browse repository at this point
Copy the full SHA da998eeView commit details
Commits on Jul 16, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 896de5a - Browse repository at this point
Copy the full SHA 896de5aView commit details -
Configuration menu - View commit details
-
Copy full SHA for dc88508 - Browse repository at this point
Copy the full SHA dc88508View commit details -
Configuration menu - View commit details
-
Copy full SHA for 64bd41e - Browse repository at this point
Copy the full SHA 64bd41eView commit details -
Configuration menu - View commit details
-
Copy full SHA for ed2863b - Browse repository at this point
Copy the full SHA ed2863bView commit details -
Merge branch 'feat/bconlon/outpost-respawn-work' of https://github.co…
…m/The-Aether-Team/The-Aether-II into feat/bconlon/outpost-respawn-work
Configuration menu - View commit details
-
Copy full SHA for 2f1b5d3 - Browse repository at this point
Copy the full SHA 2f1b5d3View commit details
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.