Open
Conversation
Contributor
|
This pull request has conflicts, please resolve those before the pull request can be reviewed. |
# Conflicts: # versions/1.21.5/api/1.21.5.api # versions/1.21.8/api/1.21.8.api
Contributor
|
Conflicts have been resolved! |
ThatGravyBoat
requested changes
Feb 3, 2026
src/main/kotlin/tech/thatgravyboat/skyblockapi/platform/GuiGraphicsPlatform.kt
Outdated
Show resolved
Hide resolved
Contributor
|
This pull request has conflicts, please resolve those before the pull request can be reviewed. |
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
# Conflicts: # src/main/kotlin/tech/thatgravyboat/skyblockapi/api/area/hub/ElectionAPI.kt # versions/1.21.5/api/1.21.5.api # versions/1.21.8/api/1.21.8.api
Contributor
|
Conflicts have been resolved! |
ThatGravyBoat
requested changes
Mar 12, 2026
src/main/java/tech/thatgravyboat/skyblockapi/mixins/events/ClientPacketListenerMixin.java
Outdated
Show resolved
Hide resolved
src/main/java/tech/thatgravyboat/skyblockapi/mixins/features/ItemStackExtensionMixin.java
Outdated
Show resolved
Hide resolved
src/main/java/tech/thatgravyboat/skyblockapi/mixins/features/ItemStackExtensionMixin.java
Show resolved
Hide resolved
src/main/java/tech/thatgravyboat/skyblockapi/mixins/GuiGraphicsVisualItemMixin.java
Show resolved
Hide resolved
src/main/kotlin/tech/thatgravyboat/skyblockapi/api/data/stored/ForgeStorage.kt
Outdated
Show resolved
Hide resolved
src/main/kotlin/tech/thatgravyboat/skyblockapi/api/remote/api/SkyBlockId.kt
Show resolved
Hide resolved
src/main/kotlin/tech/thatgravyboat/skyblockapi/platform/GuiGraphicsPlatform.kt
Show resolved
Hide resolved
src/main/kotlin/tech/thatgravyboat/skyblockapi/utils/builders/ItemBuilder.kt
Outdated
Show resolved
Hide resolved
src/main/kotlin/tech/thatgravyboat/skyblockapi/utils/codecs/IncludedCodecs.kt
Outdated
Show resolved
Hide resolved
ThatGravyBoat
previously approved these changes
Mar 12, 2026
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
Contributor
|
This pull request has conflicts, please resolve those before the pull request can be reviewed. |
Contributor
|
Conflicts have been resolved! |
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Contributor
|
This pull request has conflicts, please resolve those before the pull request can be reviewed. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
No description provided.