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.

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

Migrate all packages from dev.onyxstudios to org.ladysnake #165

Merged
merged 4 commits into from
Feb 4, 2024

Conversation

forgetmenot13579
Copy link
Contributor

This PR acts as a base to a potential v6 update as per this discussion. Note: currently based on the 1.20 branch, but should be merged into a new v6 branch once one has been created.

- Update documentation and licenses to reflect package change
Updated in GitHub editor because I could not change it locally.
@Pyrofab
Copy link
Member

Pyrofab commented Oct 28, 2023

Great work, though I probably won't merge this soon due to the obvious breaking changes.

@Pyrofab Pyrofab changed the base branch from 1.20 to 1.20.5 February 4, 2024 15:10
@Pyrofab Pyrofab self-requested a review February 4, 2024 15:11
# Conflicts:
#	cardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/component/ComponentKey.java
#	cardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/component/ComponentProvider.java
#	cardinal-components-base/src/main/java/org/ladysnake/cca/internal/base/asm/CcaClientInternals.java
#	cardinal-components-base/src/main/java/org/ladysnake/cca/internal/base/asm/ComponentUpdatePayload.java
#	cardinal-components-base/src/main/java/org/ladysnake/cca/internal/base/asm/MorePacketCodecs.java
#	cardinal-components-block/src/main/java/org/ladysnake/cca/internal/BlockEntityAddress.java
#	cardinal-components-block/src/main/java/org/ladysnake/cca/internal/CardinalComponentsBlock.java
#	cardinal-components-block/src/main/java/org/ladysnake/cca/internal/CcaBlockClient.java
#	cardinal-components-block/src/main/java/org/ladysnake/cca/mixin/block/common/MixinBlockEntity.java
#	cardinal-components-chunk/src/main/java/org/ladysnake/cca/internal/chunk/CardinalComponentsChunk.java
#	cardinal-components-chunk/src/main/java/org/ladysnake/cca/internal/chunk/CcaChunkClient.java
#	cardinal-components-chunk/src/main/java/org/ladysnake/cca/internal/chunk/CcaLevelUpdatePayload.java
#	cardinal-components-chunk/src/main/java/org/ladysnake/cca/mixin/chunk/common/MixinWorldChunk.java
#	cardinal-components-entity/src/main/java/org/ladysnake/cca/internal/entity/CardinalComponentsEntity.java
#	cardinal-components-entity/src/main/java/org/ladysnake/cca/internal/entity/CcaEntityClient.java
#	cardinal-components-entity/src/main/java/org/ladysnake/cca/mixin/entity/common/MixinEntity.java
#	cardinal-components-level/src/main/java/org/ladysnake/cca/internal/level/CardinalComponentsLevel.java
#	cardinal-components-level/src/main/java/org/ladysnake/cca/internal/level/CcaLevelClient.java
#	cardinal-components-level/src/main/java/org/ladysnake/cca/mixin/level/common/MixinLevelProperties.java
#	cardinal-components-scoreboard/src/main/java/org/ladysnake/cca/internal/scoreboard/CardinalComponentsScoreboard.java
#	cardinal-components-scoreboard/src/main/java/org/ladysnake/cca/internal/scoreboard/CcaScoreboardClient.java
#	cardinal-components-scoreboard/src/main/java/org/ladysnake/cca/mixin/scoreboard/MixinServerScoreboard.java
#	cardinal-components-scoreboard/src/main/java/org/ladysnake/cca/mixin/scoreboard/MixinTeam.java
#	cardinal-components-world/src/main/java/org/ladysnake/cca/internal/world/CardinalComponentsWorld.java
#	cardinal-components-world/src/main/java/org/ladysnake/cca/internal/world/CcaWorldClient.java
#	cardinal-components-world/src/main/java/org/ladysnake/cca/mixin/world/common/MixinServerWorld.java
#	src/testmod/java/org/ladysnake/componenttest/content/vita/ItemVita.java
.idea/copyright/profiles_settings.xml Outdated Show resolved Hide resolved
.travis.yml Outdated Show resolved Hide resolved
CONTRIBUTING.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
Copy link
Member

@Pyrofab Pyrofab left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the side cleanup, quite appreciated

@Pyrofab Pyrofab merged commit e95fc4a into Ladysnake:1.20.5 Feb 4, 2024
0 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants