-
-
Notifications
You must be signed in to change notification settings - Fork 30
TARDIS Database for Player Identification and Player Tracking #1655
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
Draft
Loqor
wants to merge
58
commits into
main
Choose a base branch
from
feat/tardis-database
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # src/main/java/dev/amble/ait/client/models/decoration/WoodenSeatModel.java # src/main/java/dev/amble/ait/client/renderers/decoration/WoodenSeatRenderer.java # src/main/java/dev/amble/ait/core/blocks/decoration/WoodenSeatBlock.java
feat: made the wooden chairs render in the inventory
…eat/handlesflightevents
# Conflicts: # src/main/java/dev/amble/ait/client/AITModClient.java
# Conflicts: # src/main/java/dev/amble/ait/client/AITModClient.java # src/main/java/dev/amble/ait/client/screens/MonitorScreen.java
# Conflicts: # src/main/java/dev/amble/ait/core/tardis/Tardis.java
5bf894b to
427c00d
Compare
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
A: Datagen
Area: Datagen implementation & API.
A: Tardis Components
Area: Tardis components & manager.
C: Textures
Changes: Might require knowledge of spriting or visual design.
S: Draft
Status: This is a draft and might need to be retriaged upon opening.
S: Merge Conflict
Status: Needs to resolve merge conflicts before it can be accepted.
S: Needs Review
Status: Requires additional reviews before being fully accepted.
size/M
Denotes a PR that changes 100-999 lines.
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.
About the PR
Adding a database with info about different players and danger levels.
Why / Balance
Technical details
Media
Requirements
Breaking changes
Changelog