Commit Graph

2278 Commits

Author SHA1 Message Date
Telesphoreo f294eaf10a a 2021-09-30 22:12:03 -05:00
Telesphoreo 8efe844640 Update to use Nexus 2021-09-30 22:08:26 -05:00
Telesphoreo 0df93530f1
Update build.gradle 2021-09-30 14:36:32 -05:00
Telesphoreo f9dfce8368
Update some dependencies 2021-09-30 14:32:18 -05:00
Telesphoreo e336df27c6
Delete pom.xml 2021-09-29 19:09:12 -05:00
Telesphoreo 88bdeeaf9f
Delete dependabot.yml 2021-09-29 19:08:25 -05:00
Telesphoreo b61693b2ab
Merge pull request #312 from TotalFreedomMC/dependabot/maven/development/com.sk89q.worldguard-worldguard-bukkit-7.0.6
Bump worldguard-bukkit from 7.0.4 to 7.0.6
2021-09-29 19:07:54 -05:00
Telesphoreo afef76efd7
Merge pull request #314 from TotalFreedomMC/dependabot/maven/development/org.spigotmc-spigot-1.17.1-R0.1-SNAPSHOT
Bump spigot from 1.16.5-R0.1-SNAPSHOT to 1.17.1-R0.1-SNAPSHOT
2021-09-29 19:07:34 -05:00
Telesphoreo 9fe3227f1a
Merge pull request #313 from TotalFreedomMC/dependabot/maven/development/net.dv8tion-JDA-4.3.0_331
Bump JDA from 4.2.1_255 to 4.3.0_331
2021-09-29 19:07:13 -05:00
Telesphoreo 512130ec52
Merge pull request #315 from TotalFreedomMC/dependabot/maven/development/commons-io-commons-io-2.11.0
Bump commons-io from 2.8.0 to 2.11.0
2021-09-29 19:07:01 -05:00
dependabot[bot] 5bd7d6fdb4
Bump JDA from 4.2.1_255 to 4.3.0_331
Bumps JDA from 4.2.1_255 to 4.3.0_331.

---
updated-dependencies:
- dependency-name: net.dv8tion:JDA
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-29 23:21:08 +00:00
Telesphoreo f4fe50fca0 Fix compile issues 2021-09-29 18:20:58 -05:00
dependabot[bot] f37dce7da6
Bump worldguard-bukkit from 7.0.4 to 7.0.6
Bumps worldguard-bukkit from 7.0.4 to 7.0.6.

---
updated-dependencies:
- dependency-name: com.sk89q.worldguard:worldguard-bukkit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-29 23:20:55 +00:00
dependabot[bot] 8c914ce3d1
Bump spigot from 1.16.5-R0.1-SNAPSHOT to 1.17.1-R0.1-SNAPSHOT
Bumps spigot from 1.16.5-R0.1-SNAPSHOT to 1.17.1-R0.1-SNAPSHOT.

---
updated-dependencies:
- dependency-name: org.spigotmc:spigot
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-29 23:16:03 +00:00
Telesphoreo cfd197b14d Update to 1.17
As a consequence, TFM is now behind AMG
2021-09-29 18:11:22 -05:00
dependabot[bot] 8486fa331d
Bump commons-io from 2.8.0 to 2.11.0
Bumps commons-io from 2.8.0 to 2.11.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-29 19:53:47 +00:00
Telesphoreo eaa26f9832 Merge from upstream 2021-09-29 14:50:04 -05:00
Wild1145 e122c4c5fa Bump to 2021.09-RC01 Release 2021-09-19 17:32:05 +01:00
dependabot[bot] 180cd81132
Bump junit-jupiter from 5.7.2 to 5.8.0 (#139)
Bumps [junit-jupiter](https://github.com/junit-team/junit5) from 5.7.2 to 5.8.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.7.2...r5.8.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>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-13 09:58:54 +01:00
Ryan d814853036
Merge branch 'development' into FS-273 2021-09-12 13:49:05 +01:00
Ryan a1ecf88109
Merge branch 'development' into FS-215 2021-09-12 13:48:59 +01:00
Ryan 5a6a5ff75d
Merge branch 'development' into FS-7 2021-09-12 13:48:50 +01:00
Ryan fdba119d5d
Merge branch 'development' into shitcan-savedflags 2021-09-12 13:48:44 +01:00
Ryan 087b8dd7ea
Merge branch 'development' into FS-37 2021-09-12 13:48:21 +01:00
dependabot[bot] 213a43380e
Bump git-commit-id-plugin from 4.0.2 to 4.9.10 (#113)
Bumps git-commit-id-plugin from 4.0.2 to 4.9.10.

---
updated-dependencies:
- dependency-name: pl.project13.maven:git-commit-id-plugin
  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>
2021-09-12 12:13:56 +01:00
dependabot[bot] 8a31b4c5c0
Bump javassist from 3.27.0-GA to 3.28.0-GA (#110)
Bumps [javassist](https://github.com/jboss-javassist/javassist) from 3.27.0-GA to 3.28.0-GA.
- [Release notes](https://github.com/jboss-javassist/javassist/releases)
- [Commits](https://github.com/jboss-javassist/javassist/commits)

---
updated-dependencies:
- dependency-name: org.javassist:javassist
  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>
2021-09-12 11:33:52 +01:00
Video 3818aab454
Merge branch 'development' into FS-37 2021-09-12 03:04:08 -06:00
Video 61857dd06f
Merge branch 'development' into shitcan-savedflags 2021-09-12 03:01:37 -06:00
Video bd647afe92
Merge branch 'development' into FS-215 2021-09-12 02:50:39 -06:00
dependabot[bot] 0e12f5e792
Bump commons-lang3 from 3.11 to 3.12.0 (#111)
Bumps commons-lang3 from 3.11 to 3.12.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  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>
2021-09-12 09:09:28 +01:00
Video 69f17ef2d7
Merge branch 'development' into FS-215 2021-09-12 02:01:56 -06:00
Video aebe1acec2
Merge pull request #136 from AtlasMediaGroup/multiple-birds-one-stone
Multiple fixes, one commit
2021-09-12 01:57:32 -06:00
Video 938b3aa630
Merge branch 'development' into multiple-birds-one-stone 2021-09-11 20:53:16 -06:00
dependabot[bot] 6772333eb4
Bump junit-jupiter from 5.4.2 to 5.7.2 (#103)
Bumps [junit-jupiter](https://github.com/junit-team/junit5) from 5.4.2 to 5.7.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.4.2...r5.7.2)

---
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>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-12 00:10:47 +01:00
dependabot[bot] 0204961834
Bump commons-io from 2.8.0 to 2.11.0 (#117)
Bumps commons-io from 2.8.0 to 2.11.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  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>
2021-09-11 23:53:41 +01:00
dependabot[bot] 2f332a8c42
Bump annotations from 20.1.0 to 22.0.0 (#104)
Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.1.0 to 22.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.1.0...22.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-11 18:48:33 +01:00
dependabot[bot] e288668c92
Bump maven-antrun-plugin from 1.8 to 3.0.0 (#102)
Bumps [maven-antrun-plugin](https://github.com/apache/maven-antrun-plugin) from 1.8 to 3.0.0.
- [Release notes](https://github.com/apache/maven-antrun-plugin/releases)
- [Commits](https://github.com/apache/maven-antrun-plugin/compare/maven-antrun-plugin-1.8...maven-antrun-plugin-3.0.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-antrun-plugin
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-11 18:42:31 +01:00
Ryan caeda219fa
Merge branch 'development' into FS-37 2021-09-11 15:26:37 +01:00
Ryan e50101df43
Merge branch 'development' into multiple-birds-one-stone 2021-09-11 15:24:52 +01:00
Ryan ee1b27fa0d
Merge branch 'development' into FS-215 2021-09-11 01:24:00 +01:00
Ryan 6ca61d9c6c
Merge branch 'development' into FS-7 2021-09-11 01:23:52 +01:00
Ryan 2d18d461fe
Merge branch 'development' into shitcan-savedflags 2021-09-11 01:23:44 +01:00
Ryan 47e6386907
Merge branch 'development' into FS-273 2021-09-11 01:23:13 +01:00
Ryan 0a9b95bfce
Move to new ATLAS Nexus (#138)
* Move to new ATLAS Nexus

Turns out jFrog is super expensive and 10GB of Bandwidth doesn't go far, this should make things a lot better :)

* Update pom.xml

* Update pom.xml
2021-09-11 01:19:08 +01:00
Video fedf80b834
Merge branch 'development' into FS-7 2021-09-10 01:39:16 -06:00
Video 2bdf14f38c
Merge branch 'development' into FS-215 2021-09-06 15:26:13 -06:00
Video b1062fbb6c
Merge branch 'development' into FS-273 2021-09-06 14:39:32 -06:00
Video f00f075551
Merge branch 'development' into multiple-birds-one-stone 2021-09-06 14:38:42 -06:00
dependabot[bot] 44ff621d73
Bump bstats-bukkit from 1.8 to 2.2.1 (#99)
Bumps [bstats-bukkit](https://github.com/Bastian/bStats-Metrics) from 1.8 to 2.2.1.
- [Release notes](https://github.com/Bastian/bStats-Metrics/releases)
- [Commits](https://github.com/Bastian/bStats-Metrics/commits/v2.2.1)

---
updated-dependencies:
- dependency-name: org.bstats:bstats-bukkit
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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>

Resolves FS-419
2021-09-06 20:21:49 +01:00
Video 032e54e2d4 Multiple birds, one commit
Here's a list of things I've fixed/mitigated:
- Range bans in ban-related commands (FS-209)
- Bug in /tempban where the duration in the broadcast is always wrong
- Over-complicated handling of /tempban durations (instead of trying to process them and silently fail, it'll flat out say that an invalid duration is well, invalid)
- Inconsistent "player not found" messages in banning commands
- (Mitigates) weird issue with case-sensitive usernames in banning commands when the server has restarted since a player last joined
- (Mitigates) banned IPs being inaccurate when a player was banned offline whilst containing multiple IPs in their playerdata
- Redoing how MovementValidator handled positive and negative infinity exploit items, completely removing the need for Mojangson in the first place and allowing the plugin to run without Essentials once more in the process (related to FS-406)

Here is what I've done in addition:
- Merged /tban and /noob into /tempban, which now bans for 5 minutes by default (FS-205)
2021-09-06 04:44:39 -06:00