AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-06-28 03:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,271 Commits 38 Branches 58 Tags
722ef5f99a72cca024bc9e878238e68737f41f15
Commit Graph

2271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Allink
722ef5f99a Merge branch 'development' into discord 2022-06-05 23:11:39 +01:00
Telesphoreo
83bb892056 Merge pull request #233 from AtlasMediaGroup/fix-readme 
Update README to fix badge
 2022-06-05 16:51:23 -05:00
Ryan
62ff195ec5 Merge branch 'development' into fix-readme 2022-06-05 22:48:25 +01:00
Allink
f44a1c7e69 Merge branch 'development' into discord 2022-06-05 22:40:48 +01:00
Telesphoreo
9f8dd91457 Merge pull request #235 from AtlasMediaGroup/update-deps 
Update all dependencies, confirmed working
 2022-06-05 16:30:08 -05:00
Telesphoreo
ee45256764 Update all dependencies, confirmed working 2022-06-05 16:09:23 -05:00
Telesphoreo
f6faf3b8bc Merge pull request #166 from AtlasMediaGroup/dependabot/maven/development/org.jetbrains-annotations-23.0.0 
Bump annotations from 22.0.0 to 23.0.0
 2022-06-05 15:38:43 -05:00
dependabot[bot]
8210dafcd3 Bump annotations from 22.0.0 to 23.0.0 
Bumps [annotations](https://github.com/JetBrains/java-annotations) from 22.0.0 to 23.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/22.0.0...23.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>
 2022-06-05 20:04:42 +00:00
Telesphoreo
4eb8174aa9 Merge pull request #164 from AtlasMediaGroup/dependabot/maven/development/org.reflections-reflections-0.10.2 
Bump reflections from 0.9.12 to 0.10.2
 2022-06-05 15:02:37 -05:00
Telesphoreo
ab309032e5 Update README to fix badge 2022-06-05 14:22:46 -05:00
Allink
0db661600f Merge remote-tracking branch 'origin/development' into discord 2022-06-05 20:21:58 +01:00
dependabot[bot]
d94b184703 Bump reflections from 0.9.12 to 0.10.2 
Bumps [reflections](https://github.com/ronmamo/reflections) from 0.9.12 to 0.10.2.
- [Release notes](https://github.com/ronmamo/reflections/releases)
- [Commits](https://github.com/ronmamo/reflections/compare/0.9.12...0.10.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-05 19:18:11 +00:00
Telesphoreo
c07473ef6d Merge pull request #216 from AtlasMediaGroup/dependabot/maven/development/com.sk89q.worldedit-worldedit-bukkit-7.2.10 
Bump worldedit-bukkit from 7.2.8 to 7.2.10
 2022-06-05 14:15:46 -05:00
dependabot[bot]
d7261627ff Bump worldedit-bukkit from 7.2.8 to 7.2.10 
Bumps worldedit-bukkit from 7.2.8 to 7.2.10.

---
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-06-05 18:39:30 +00:00
Telesphoreo
6ac7090fef Merge pull request #213 from AtlasMediaGroup/dependabot/maven/development/org.apache.maven.plugins-maven-compiler-plugin-3.10.1 
Bump maven-compiler-plugin from 3.8.1 to 3.10.1
 2022-06-05 13:37:09 -05:00
dependabot[bot]
9d2555cd03 Bump maven-compiler-plugin from 3.8.1 to 3.10.1 
Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.8.1 to 3.10.1.
- [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
- [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.8.1...maven-compiler-plugin-3.10.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-05 15:31:57 +00:00
dependabot[bot]
3c4b4140ce Bump actions/checkout from 2 to 3 (#202) 
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  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>
 2022-06-05 16:29:29 +01:00
dependabot[bot]
0f2d596b7a Bump actions/setup-java from 2.3.0 to 3.3.0 (#228) 
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 2.3.0 to 3.3.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v2.3.0...v3.3.0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  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>
 2022-06-05 13:43:26 +01:00
dependabot[bot]
dcdaecf9b0 Bump aormsby/Fork-Sync-With-Upstream-action from 2.1 to 3.3 (#230) 
Bumps [aormsby/Fork-Sync-With-Upstream-action](https://github.com/aormsby/Fork-Sync-With-Upstream-action) from 2.1 to 3.3.
- [Release notes](https://github.com/aormsby/Fork-Sync-With-Upstream-action/releases)
- [Commits](https://github.com/aormsby/Fork-Sync-With-Upstream-action/compare/v2.1...v3.3)

---
updated-dependencies:
- dependency-name: aormsby/Fork-Sync-With-Upstream-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>
 2022-06-05 13:15:26 +01:00
Allink
b4b10a3020 A single space 2022-06-05 12:14:49 +01:00
dependabot[bot]
52a39aa992 Bump github/codeql-action from 1 to 2 (#225) 
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 1 to 2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: github/codeql-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>
 2022-06-05 00:15:42 +01:00
Ryan
b4e7251e3b Merge pull request #232 from AtlasMediaGroup/main 
Merge from main into development
 2022-06-04 15:06:28 +01:00
Ryan
0f1fbf9481 Merge pull request #198 from AtlasMediaGroup/RELEASE-2022.02 
Release 2022.02
2022.02 		2022-06-04 15:04:16 +01:00
ayunami2000
73eb3226ee allow spawn eggs to do SOMETHING (#219) 
* allow spawn eggs to do SOMETHING

they now spawn a mob despite the mob having zero nbt from the spawn egg. "it's better than nothing" as one might say.

* mushroom cow moment

* formatting/style + remove extra change

* 💀

💀

* 💀 💀 💀

💀 💀 💀 💀 💀

Co-authored-by: Paldiu <pawereus@gmail.com>
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
 2022-06-04 14:59:35 +01:00
ayunami2000
68bcabe5c2 fix httpd log spam (#223) 
fix httpd log spam with invalid url encoded strings (lol)

Co-authored-by: Paldiu <pawereus@gmail.com>
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
 2022-06-03 18:27:37 +01:00
dependabot[bot]
ecc92589e9 Bump codacy/codacy-analysis-cli-action from 4.0.0 to 4.0.2 (#209) 
Bumps [codacy/codacy-analysis-cli-action](https://github.com/codacy/codacy-analysis-cli-action) from 4.0.0 to 4.0.2.
- [Release notes](https://github.com/codacy/codacy-analysis-cli-action/releases)
- [Commits](https://github.com/codacy/codacy-analysis-cli-action/compare/4.0.0...4.0.2)

---
updated-dependencies:
- dependency-name: codacy/codacy-analysis-cli-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-06-03 15:04:13 +01:00
Allink
bf41d08580 Mention the user who completes the report so we can have their current Discord name (includes their current name & tag in-case they delete their account) 2022-05-26 22:13:57 +01:00
Allink
9c91166319 Allow players to report offline players & allow admins to mark reports as completed, deleting them and sending them to an archive channel 2022-05-26 16:10:00 +01:00
Allink
09a220e0a2 VPS -> Host 2022-05-25 20:18:01 +01:00
Allink
ad9dd42edb Remove unused import 2022-05-25 19:55:25 +01:00
Allink
c9f5db0141 Add Discord commands like the old bot 2022-05-25 19:44:45 +01:00
Allink
47c30c3283 Add plural to Displayables 2022-05-25 19:41:58 +01:00
Allink
6c426644f6 Add uptime & memory related functions to FUtil 2022-05-25 18:49:53 +01:00
Allink
72bab1e2ed Add mean averaging to FUtil 2022-05-25 18:41:35 +01:00
Allink
1726050d65 Clean up DiscordToMinecraftListener 2022-05-25 17:18:49 +01:00
Allink
0fc5b01b29 Clean up message sanitization and properly strip section signs from nicks/messages 2022-05-25 17:15:04 +01:00
Paldiu
dfd90af017 Merge pull request #224 from AtlasMediaGroup/dependabot/maven/development/org.apache.maven.plugins-maven-antrun-plugin-3.1.0 
Bump maven-antrun-plugin from 3.0.0 to 3.1.0
 2022-05-24 20:47:32 -05:00
Paldiu
d13ecea947 Merge branch 'RELEASE-2022.02' of https://github.com/AtlasMediaGroup/TotalFreedomMod into RELEASE-2022.02 2022-05-01 09:55:58 -05:00
Paldiu
7ec053c867 Adjusted version 
Removed "-RELEASE"
 2022-05-01 09:55:47 -05:00
Ryan
1dcc05e7f5 Merge pull request #195 from AtlasMediaGroup/Wild1145-patch-3 
Update SECURITY.md
 2022-05-01 15:45:16 +01:00
Paldiu
c913b7ae74 Set Maven Shade version to 3.3.0 2022-05-01 09:41:53 -05:00
Paldiu
951f3c91d9 2022.02-RELEASE Versioning 
- Changed the version to 2022.02-RELEASE
- Changed the API version to 1.17
 2022-05-01 09:31:20 -05:00
dependabot[bot]
b573871c14 Bump maven-antrun-plugin from 3.0.0 to 3.1.0 
Bumps [maven-antrun-plugin](https://github.com/apache/maven-antrun-plugin) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/apache/maven-antrun-plugin/releases)
- [Commits](https://github.com/apache/maven-antrun-plugin/compare/maven-antrun-plugin-3.0.0...maven-antrun-plugin-3.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-01 11:42:11 +00:00
Video
78654eb5e8 Merge pull request #222 from AtlasMediaGroup/stabilization 
Stabilization
 2022-05-01 05:39:48 -06:00
Video
adbe125283 increments version 2022-04-20 17:03:13 -06:00
ayunami2000
e6a20e1757 fix httpd log spam 
fix httpd log spam with invalid url encoded strings (lol)
 2022-04-17 14:58:58 -07:00
Video
d71d8edf53 Merge branch 'development' into stabilization 2022-04-15 08:09:05 -06:00
Video
6af9f240f4 Stage 3 of IP -> UUID migration: completely removing the verification system 2022-04-15 07:52:06 -06:00
Video
05745c4210 Stage 2 of IP -> UUID migration: changing the admin list to use UUIDs 2022-04-15 07:09:23 -06:00
Video
98388d0d23 Stage 1 of IP -> UUID migration: changing player data to use UUIDs instead 2022-04-15 06:27:32 -06:00