Uh oh!
There was an error while loading. Please reload this page.
This repository was archived by the owner on May 10, 2024. It is now read-only.
Merge development into main - #339
Merged
Merged
Conversation
Fix beds exploding in the Nether & End dimensions with explosions off
* Break cancelled blocks on interact * Cancel master blocks * Add Scissors maven repository * Remove Scissors repo (it is already included in the AMG repo) * Remove unused import & add TODO for the 1.19 port
Bumps [junit-jupiter](https://github.com/junit-team/junit5) from 5.8.2 to 5.9.0. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](junit-team/junit-framework@r5.8.2...r5.9.0) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps worldedit-bukkit from 7.2.10 to 7.2.12. --- updated-dependencies: - dependency-name: com.sk89q.worldedit:worldedit-bukkit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [javassist](https://github.com/jboss-javassist/javassist) from 3.29.0-GA to 3.29.1-GA. - [Release notes](https://github.com/jboss-javassist/javassist/releases) - [Changelog](https://github.com/jboss-javassist/javassist/blob/master/Changes.md) - [Commits](https://github.com/jboss-javassist/javassist/commits) --- updated-dependencies: - dependency-name: org.javassist:javassist dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [EssentialsX](https://github.com/EssentialsX/Essentials) from 2.19.4 to 2.19.6. - [Release notes](https://github.com/EssentialsX/Essentials/releases) - [Commits](EssentialsX/Essentials@2.19.4...2.19.6) --- updated-dependencies: - dependency-name: net.essentialsx:EssentialsX dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
….essentialsx-EssentialsX-2.19.6' into megabranch
….javassist-javassist-3.29.1-GA' into megabranch
….junit.jupiter-junit-jupiter-5.9.0' into megabranch
…n the right branch)
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.3.0 to 3.5.1. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](actions/setup-java@v3.3.0...v3.5.1) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Remove guard clause causing unintended side effects in interact blocker
Merge Main --> Development for 2022.06 Release.
TFGuilds was shitcanned the other day (good riddence), so there's no point in bridging it anymore. Co-authored-by: Allink <44676012+allinkdev@users.noreply.github.com> Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
Removes /nh and code associated with it
…d-from-tfm [FS-460] Remove /sit command
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.5.1 to 3.6.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](actions/setup-java@v3.5.1...v3.6.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This never worked, let's just remove it.
…scord bridge (#280) * Fix player names not being deformatted * Remove unused imports and variables * Rectify usage of deprecated methods * Clarify comment * Update JDA plugin warning repository URL * Fix possible NPEs Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
Bumps [codacy/codacy-analysis-cli-action](https://github.com/codacy/codacy-analysis-cli-action) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/codacy/codacy-analysis-cli-action/releases) - [Commits](codacy/codacy-analysis-cli-action@v4.1.0...v4.2.0) --- updated-dependencies: - dependency-name: codacy/codacy-analysis-cli-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
Author
Local Testing TODO:
|
ghost
force-pushed
the
merge/development/main
branch
4 times, most recently
from
July 25, 2023 01:57
a9d9749 to
29f8705Compare(cherry picked from commit a03ecfd)
ghost
force-pushed
the
merge/development/main
branch
from
July 25, 2023 02:05
29f8705 to
eb99dcdCompare
added 13 commits
July 25, 2023 03:45
Fixes a SQLException thrown when adding admins to an older table schema version.
ghost
marked this pull request as ready for review
July 25, 2023 18:29
Paldiu
approved these changes
Jul 25, 2023
Paldiu
left a comment
There was a problem hiding this comment.
I definitely reviewed all 4000+ changes in all 102 files.
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 freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.