Ryan
706e9540ce
Remove Broken Downstream Merge Action ( #281 )
...
This never worked, let's just remove it.
2022-10-28 13:25:59 +01:00
dependabot[bot]
ac00d36dc6
Bump actions/setup-java from 3.5.1 to 3.6.0 ( #279 )
...
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](https://github.com/actions/setup-java/compare/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>
2022-10-25 00:32:07 +01:00
Video
a2133369d2
Merge pull request #276 from AtlasMediaGroup/FS-460-remove-sit-command-from-tfm
...
[FS-460] Remove /sit command
2022-10-17 11:32:36 -06:00
Video
48728c9524
Merge branch 'development' into FS-460-remove-sit-command-from-tfm
2022-10-17 09:51:09 -06:00
Video
d343bbc3d7
Merge pull request #268 from AtlasMediaGroup/FS-452-not-fucked
...
Removes /nh and code associated with it
2022-10-16 20:14:26 -06:00
Allink
2c357d1d49
Remove /sit command
...
FS-460
2022-10-13 19:53:04 +01:00
Ryan
5246639608
Merge branch 'development' into FS-452-not-fucked
2022-10-12 21:37:18 +01:00
Video
7fb4a477dc
Removes TFGuilds integration ( #264 )
...
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>
2022-10-12 21:36:49 +01:00
Ryan
612499ff0a
Merge pull request #274 from AtlasMediaGroup/main
...
Merge Main --> Development for 2022.06 Release.
2022-10-12 17:41:40 +01:00
Ryan
edb3dbfdbe
Merge pull request #273 from AtlasMediaGroup/RELEASE-2022.06
...
Release 2022.06
2022-10-12 17:37:09 +01:00
Paldiu
a332ecfbea
Merge pull request #272 from AtlasMediaGroup/fix-interact-blocking
...
Remove guard clause causing unintended side effects in interact blocker
2022-10-12 11:29:00 -05:00
Paldiu
7f78549f9d
Merge branch 'development' into fix-interact-blocking
2022-10-09 15:15:57 -05:00
Ryan
fd6f8a2d17
Merge branch 'main' into RELEASE-2022.06
2022-10-08 15:08:52 +01:00
dependabot[bot]
21c84d76d3
Bump actions/setup-java from 3.3.0 to 3.5.1 ( #271 )
...
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](https://github.com/actions/setup-java/compare/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>
2022-10-08 15:06:56 +01:00
Allink
88f53c05b9
Remove guard clause causing unintended side effects
2022-10-05 12:31:05 +01:00
Video
51cc527697
Removes /nh and code associated with it (except this time its based on the right branch)
2022-09-14 19:24:58 -06:00
Video
ae5038ef0f
Uplifts pom version to release
2022-09-13 21:54:42 -06:00
Video
ec5aa0304e
Uplifts version
2022-09-12 21:42:04 -06:00
Ryan
ebafc1c669
Hopefully fixing it this time ( #119 )
...
This is proving to be more of a PITA than I had expected.
2022-09-12 22:54:44 +01:00
Ryan
9f8dafb075
Merge pull request #257 from AtlasMediaGroup/update-squash
...
Update squash
2022-09-12 22:53:58 +01:00
Video
1eaaf5fcdb
Fixes bug where the whitelist wasn't working
2022-09-11 22:10:57 -06:00
Video
42458084d7
Untitled bugfix
2022-09-11 16:47:12 -06:00
Video
0cd2886e40
Fixes oversight where not having Essentials installed causes Discord reporting to fail
2022-09-11 16:14:31 -06:00
Video
575568cb05
Fixes severe bug where changes to player data wouldn't save
2022-09-11 15:33:05 -06:00
Video
26be5d0f44
Fixes bug where adminchat messages were duplicated when sent from in-game
...
Yet another bug discovered during testing before the release was to be cut
2022-09-11 12:47:58 -06:00
Video
7a724c2f13
Fixes bug that prevented /saconfig add from working properly
...
This popped up during testing right before RC2 was intended to be cut.
2022-09-11 12:12:36 -06:00
Video
9e1aa5d34e
Uplifts version to 2022.06-RC2
2022-09-11 11:36:21 -06:00
Video
4564ad0449
Fix SAConfig NPE (originally by Allink)
2022-09-11 11:34:16 -06:00
Video
1ddeb4b621
Merge pull request #263 from AtlasMediaGroup/FS-450
...
Fixes several bugs caused by potential issues in TFM's admin loading system (FS-450)
2022-09-11 11:30:37 -06:00
Video
a8665a15d4
Merge pull request #262 from AtlasMediaGroup/FS-449
...
Stabilization Part 4 - The Lost Episode (Remastered) [FS-449]
2022-09-11 11:30:21 -06:00
Video
c0f3712c8d
Fixes several bugs caused by any potential issues in TFM's admin loading system
2022-09-11 06:35:32 -06:00
Video
0dd7bc06eb
FS-449
2022-09-11 06:04:01 -06:00
Allink
4d98108a46
Remove uptime command ( #250 )
...
Codacy is struggling for no reason, merging anyway.
2022-09-11 12:31:52 +01:00
Allink
02b2810488
Merge remote-tracking branch 'origin/dependabot/maven/development/org.junit.jupiter-junit-jupiter-5.9.0' into megabranch
2022-08-18 23:47:37 +01:00
Allink
7e110e8ac6
Merge remote-tracking branch 'origin/dependabot/maven/development/org.javassist-javassist-3.29.1-GA' into megabranch
2022-08-18 23:47:34 +01:00
Allink
6d3f365878
Merge remote-tracking branch 'origin/dependabot/maven/development/net.essentialsx-EssentialsX-2.19.6' into megabranch
2022-08-18 23:47:25 +01:00
dependabot[bot]
05bb64ce85
Bump EssentialsX from 2.19.4 to 2.19.6
...
Bumps [EssentialsX](https://github.com/EssentialsX/Essentials ) from 2.19.4 to 2.19.6.
- [Release notes](https://github.com/EssentialsX/Essentials/releases )
- [Commits](https://github.com/EssentialsX/Essentials/compare/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>
2022-08-15 01:45:49 +00:00
dependabot[bot]
b05238c51f
Bump javassist from 3.29.0-GA to 3.29.1-GA
...
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>
2022-08-12 01:27:24 +00:00
dependabot[bot]
7bda4beab0
Bump worldedit-bukkit from 7.2.10 to 7.2.12
...
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>
2022-08-08 01:42:07 +00:00
dependabot[bot]
97544977b0
Bump junit-jupiter from 5.8.2 to 5.9.0
...
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](https://github.com/junit-team/junit5/compare/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>
2022-07-27 01:34:57 +00:00
Allink
073356be49
Properly patch Game Master Blocks ( #245 )
...
* 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
2022-07-16 23:03:23 +01:00
Paldiu
c472c5d5ce
Merge pull request #243 from AtlasMediaGroup/beds
...
Fix beds exploding in the Nether & End dimensions with explosions off
2022-06-20 07:25:27 -05:00
Allink
cb401577a4
Fix beds exploding in the Nether & End dimensions with explosions off
2022-06-20 02:46:09 +01:00
9d3165694a
Update version
2022-06-17 16:04:55 -05:00
dependabot[bot]
cffb5d9326
Bump codacy/codacy-analysis-cli-action from 4.0.2 to 4.1.0 ( #242 )
...
Bumps [codacy/codacy-analysis-cli-action](https://github.com/codacy/codacy-analysis-cli-action ) from 4.0.2 to 4.1.0.
- [Release notes](https://github.com/codacy/codacy-analysis-cli-action/releases )
- [Commits](https://github.com/codacy/codacy-analysis-cli-action/compare/4.0.2...v4.1.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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-16 12:33:31 +01:00
4e8df0938f
Merge pull request #240 from AtlasMediaGroup/add-devs
...
Add developers and improve code readability
2022-06-08 18:11:49 -05:00
511f172d84
Add developers and improve code readability
2022-06-08 17:57:22 -05:00
bfa8b2a752
Merge pull request #239 from AtlasMediaGroup/FS-222
...
Unvanish, remove commandspy & set fuckoff radius to 0 for removed admins
2022-06-05 18:47:21 -05:00
594b1f5605
Merge branch 'development' into FS-222
2022-06-05 18:42:51 -05:00
b9ca4f52a2
Merge pull request #238 from AtlasMediaGroup/properly-update
...
Update rest of dependencies
2022-06-05 18:41:34 -05:00
