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,296 Commits 38 Branches 58 Tags
c0f3712c8de9c2cfcf4ce5ca9db07e78f5dcfdcd
Commit Graph

2296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Video
c0f3712c8d Fixes several bugs caused by any potential issues in TFM's admin loading system 2022-09-11 06:35:32 -06:00
Allink
4d98108a46 Remove uptime command (#250) 
Codacy is struggling for no reason, merging anyway.
 2022-09-11 12:31:52 +01:00
Telesphoreo
9d3165694a Update version 2022.06-RC1 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
Telesphoreo
4e8df0938f Merge pull request #240 from AtlasMediaGroup/add-devs 
Add developers and improve code readability
 2022-06-08 18:11:49 -05:00
Telesphoreo
511f172d84 Add developers and improve code readability 2022-06-08 17:57:22 -05:00
Telesphoreo
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
Telesphoreo
594b1f5605 Merge branch 'development' into FS-222 2022-06-05 18:42:51 -05:00
Telesphoreo
b9ca4f52a2 Merge pull request #238 from AtlasMediaGroup/properly-update 
Update rest of dependencies
 2022-06-05 18:41:34 -05:00
Allink
d298e923b8 Merge pull request #227 from allinkdev/FS-222 
Merge allinkdev:FS-222 into AtlasMediaGroup:FS-222
 2022-06-06 00:37:29 +01:00
Telesphoreo
d0d97c0681 Merge branch 'development' into properly-update 2022-06-05 18:36:50 -05:00
Telesphoreo
2540c7c589 Merge pull request #237 from AtlasMediaGroup/discord 
Re-implement most-used commands from the old python bot & other improvements
 2022-06-05 18:35:35 -05:00
Allink
6bc91fc779 Merge pull request #236 from allinkdev/properly-update 
Merge allinkdev:properly-update into AtlasMediaGroup:properly-update
 2022-06-06 00:35:22 +01:00
Allink
9a54ef66d1 Merge pull request #231 from allinkdev/discord 
Merge allinkdev:discord into AtlasMediaGroup:discord branch
 2022-06-06 00:31:13 +01:00
Allink
722ef5f99a Merge branch 'development' into discord 2022-06-05 23:11:39 +01:00
Allink
6bf6eeec91 Merge branch 'development' into properly-update 2022-06-05 22:53:56 +01:00
Ryan
9df30a9556 Merge branch 'development' into FS-222 2022-06-05 22:52:30 +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
495fe79d94 Properly update 2022-06-05 22:44:38 +01:00
Allink
422b41dc8d Merge branch 'development' into FS-222 2022-06-05 22:41:02 +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
Ryan
611ee619a0 Merge branch 'development' into FS-222 2022-06-05 18:18:55 +01: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
Ryan
fb259ca9b7 Merge branch 'development' into FS-222 2022-06-05 00:18:55 +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
Ryan
8edc87034f Merge branch 'development' into FS-222 2022-06-03 19:21:07 +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
Paldiu
0fc20b6c56 Merge branch 'development' into FS-222 2022-05-26 10:11:01 -05: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