Commit Graph

2180 Commits

Author SHA1 Message Date
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
Video
3ca9835257
Merge branch 'development' into FS-37 2021-09-06 01:16:04 -06:00
Video
f69feed469 fixed 2021-09-06 01:14:21 -06:00
Video
8253f94ac4
Merge branch 'development' into FS-273 2021-09-06 01:12:00 -06:00
Video
54cb0cfac4
FS-409 (#124)
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2021-09-05 14:51:43 +01:00
Ryan
a4c81f202c
Merge branch 'development' into shitcan-savedflags 2021-09-04 01:23:06 +01:00
Ryan
da82b27016
Merge branch 'development' into FS-37 2021-09-04 01:07:55 +01:00
Ryan
daf0126f45
Merge branch 'development' into FS-273 2021-09-04 01:07:39 +01:00
Ryan
f6d46b6178
Merge branch 'development' into FS-215 2021-09-04 01:07:33 +01:00
Ryan
a2d11d4b93
Merge branch 'development' into FS-7 2021-09-04 01:07:28 +01:00
Ryan
23caa4e853
Dependency Fix & Improvements (#132)
* Upgrade Test

Going to see if switching to the new repo that went live 3 days ago and updating TFM to pull the latest version of Essentials is going to help things here. TFM is building locally so I haven't a fucking scooby doo why Github can't run the build because I've even tried dropping the M2 folder...

* Let's try again

Utter bullshit so far.

* Apparently we don't even use essentials...

No idea where the imports for EssentialsBridge are coming from...

* Various tweaks

Hopefully this might give some more joy, but if not it's removed a command I didn't want anyway and reduced our dependency tree.

I have also switched it to using the ATLAS Artafactory which will serve as an ongoing cache for dependencies and should start to speed up our Github builds as Maven is rubbish with many repo's.
2021-09-04 01:07:04 +01:00
Video
a51f5c9bbf FS-273 2021-09-03 13:53:33 -06:00
Video
ee804d52ff Makes [Discord] a hyperlink (FS-215)
I've decided to overhaul the implementation of DiscordToMinecraftListener to make it more easily workable. This overhaul allows me to implement FS-215 more easily.
2021-09-03 12:52:15 -06:00
Video
dc490659c1 Begins implementing FS-7
should be good enough, but feedback would be lovely
2021-09-03 00:07:20 -06:00
Ryan
0d09c3a550
Merge branch 'development' into shitcan-savedflags 2021-08-29 20:09:03 +01:00
dependabot[bot]
4c3f188bb8
Bump actions/setup-java from 2.2.0 to 2.3.0 (#122)
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 2.2.0 to 2.3.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v2.2.0...v2.3.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>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2021-08-29 20:08:43 +01:00
Video
e2ccd14eb3 Unsaves SavedFlags 2021-08-27 16:54:55 -06:00
Video
af1df22812
Merge branch 'development' into FS-37 2021-08-26 23:05:58 -06:00
Ivan
f380898bb7
yo remove my name (#123)
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2021-08-26 16:22:08 +01:00
Ryan
464ed85f1b
Update java16-maven.yml 2021-08-26 16:18:58 +01:00
Ryan
7dd235b166
Update java11-maven.yml 2021-08-26 16:18:49 +01:00
Ryan
1474a80875
Merge branch 'development' into FS-37 2021-08-26 13:26:44 +01:00
Ryan
f45466ee24
Create java16-maven.yml 2021-08-26 13:01:20 +01:00
Ryan
d70b7bbec2
Split out Java 11 and Java 16 for faster runs 2021-08-26 13:00:19 +01:00
dependabot[bot]
541c66c3de
Bump codacy/codacy-analysis-cli-action from 1.1.0 to 4.0.0 (#101)
Bumps [codacy/codacy-analysis-cli-action](https://github.com/codacy/codacy-analysis-cli-action) from 1.1.0 to 4.0.0.
- [Release notes](https://github.com/codacy/codacy-analysis-cli-action/releases)
- [Commits](https://github.com/codacy/codacy-analysis-cli-action/compare/1.1.0...4.0.0)

---
updated-dependencies:
- dependency-name: codacy/codacy-analysis-cli-action
  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-08-21 21:50:45 +01:00
Ryan
77fd4ff66a
Merge branch 'development' into FS-37 2021-08-21 21:34:04 +01:00
Ryan
d901cbaa81
Update pom.xml (#121)
* Update pom.xml

* Fix version from re-upload
2021-08-21 21:25:56 +01:00
Wild1145
538ed7020d Merge branch 'development' of https://github.com/AtlasMediaGroup/TotalFreedomMod into development 2021-08-21 15:36:32 +01:00