Skip to content

merges pr 45 and 46 resolving conflicts #47

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
Merged
quiquelhappy merged 22 commits into from
Jan 25, 2026
Merged

merges pr 45 and 46 resolving conflicts #47

quiquelhappy merged 22 commits into from
Jan 25, 2026

Conversation

@quiquelhappy
Copy link
Collaborator

@quiquelhappy quiquelhappy commented Jan 25, 2026

quiquelhappy and others added 22 commits October 26, 2025 11:02
@quiquelhappy
add 1.21.10 support
f8a9454
@quiquelhappy
bump version
32c4f8c
@quiquelhappy
fix invui dep
e8e4257
@quiquelhappy
fix onDisable failing
2c46440
@quiquelhappy
update deprecated sound methods
f4900b2
@quiquelhappy
Revert "fix onDisable failing"
d4f2cea 
This reverts commit 2c46440.
@quiquelhappy
use external CommandAPI dependency
93a2404
@quiquelhappy
bump version again
62c553d
@quiquelhappy
add missing output stuff
0bd9c46
@Leahcimkrob
-relocate uniform_lib
1b123f5
@Leahcimkrob
Revert "-relocate uniform_lib"
b89c15c 
This reverts commit 1b123f5.
@Leahcimkrob
Revert "use external CommandAPI dependency"
d4f5f31 
This reverts commit 93a2404.
@Leahcimkrob
Revert "bump version again"
6b5e6dd 
This reverts commit 62c553d.
@Leahcimkrob
Reapply "use external CommandAPI dependency"
465483f 
This reverts commit d4f5f31.
@Leahcimkrob
Reapply "-relocate uniform_lib"
97b95d4 
This reverts commit b89c15c.
@Leahcimkrob
Udapte to MC 1.21.11
360fe97
@quiquelhappy
re-order imports
10ba751
@quiquelhappy
add commandapi-spigot-core and test toolkits dependencies
1f0976e
@quiquelhappy
Merge branch 'main' into pr-45
56a4f29 
# Conflicts:
#	.gitignore
#	build.gradle
@quiquelhappy
add SayanVanish to plugin dependencies
22f5085
@quiquelhappy
update dependencies and add JSON serialization tests
2672280
@quiquelhappy
downgrade Lombok version from 1.18.36 to 1.18.34 in plugin.yml
825bbc5
@quiquelhappy quiquelhappy merged commit 921d972 into main Jan 25, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@quiquelhappy @Leahcimkrob