AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2026-07-15 18:15:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,071 Commits 38 Branches 58 Tags
2eb6cc00365b8cc08d739888a356f14929b60e7e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
RyanGitHubVideo
 		2eb6cc0036 Correct CoreProtect POM Version (#108) 
Co-authored-by: Video <[email protected]>
 2021-08-18 23:45:56 +01:00
RyanandGitHub 101987cc17 Merge branch 'development' into FS-381 2021-08-10 17:34:03 +01:00
RyanandGitHub 3be0ffba4e Merge branch 'development' into FS-381 2021-08-10 17:31:26 +01:00
Ryan Wild 62529a6171 Merge branch 'main' of https://github.com/AtlasMediaGroup/TotalFreedomMod into development 2021-07-17 13:18:18 +01:00
RyanandGitHub a37364d07e Correct JDK Version in README (#92) 
It's currently wrong so needed updating.
 2021-07-16 11:43:46 +01:00
RyanandGitHub 939e98b759 Update badges (#88) 
Remove TravisCI
Add Github Maven Build Action 
Add CodeQL Badge
 2021-07-08 20:48:41 +01:00
RyanandGitHub d99f3e657b Let's actually do dependency uplifts (#89) 2021-07-08 20:48:27 +01:00
RyanandGitHub 92bbb62379 Temporarily re-naming /clearchat to /cleanchat (#91) 
* Temporarily re-naming /clearchat to /cleanchat

Due to another plugin which currently doesn't quite have all the permissions working, this command is not currently able to be executed as it stands.

* Shhh I know I'm an idiot
 2021-07-05 23:29:22 +01:00
RyanandGitHub 6fd075fe96 Start building Java 16 (#84) 
* Start building Java 16

* Re-apply Fleek's change

* Removed the shitty Github auto formatted white space.

* Update to the maven build in Github workflows

Given TravisCI has started to charge, I guess this might be what we move back to using as our main way to verify if something can actually build.

* Update maven.yml

* Delete .travis.yml
 2021-06-24 21:21:39 +01:00
RyanandGitHub a6ca6b122c Merge branch 'development' into FS-239-to-FS-242 2021-06-18 13:24:15 +01:00
RyanandGitHub 06025b2e69 Updated permissions to re-baseline with the dev server (#75) 
Updating this to be based off of the dev server as it seems this has not been updated in some time. Primary purpose is to add the crackshot bypass removal for everyone (Though allow admins to bypass) and to add a start of network manager perms in the hopes it makes it more usable going forward.
 2021-06-13 19:51:27 +01:00
Ryan 17b051e2a7 Retired support for 2021.02 fully. (#72) 2021-06-07 16:26:15 +01:00
RyanandNathan Curran b72782de4f Add //g to blocked commands (#62) 
Co-authored-by: Nathan Curran <[email protected]>
 2021-06-07 16:26:15 +01:00
Ryan 8d1e8dcf05 Switched from -c to -ci (#63) 
Resolves FS-219
 2021-06-07 16:26:15 +01:00
Ryan 879a524bb4 Remove a number of wipe commands we don't want anyway 
We shouldn't be wiping any of this data within the server now anyway so let's not tempt fate again.
 2021-06-07 16:26:15 +01:00
Ryan Wild a498104777 Merge branch 'main' of github.com:AtlasMediaGroup/TotalFreedomMod into development 2021-06-07 16:22:43 +01:00
RyanandGitHub 4e577f97fa Enable downward Sync from main (#60) 
We want to make sure anything on the main branch which is commited makes it's way down to the dev and other branches.
 2021-05-28 15:22:07 +01:00
RyanGitHubNathan Curran
 		ac615f54f7 Add //g to blocked commands (#62) 
Co-authored-by: Nathan Curran <[email protected]>
 2021-05-21 22:44:51 +01:00
RyanandGitHub d170f6d323 Switched from -c to -ci (#63) 
Resolves FS-219
 2021-05-16 15:27:12 +01:00
RyanandGitHub caaa067096 Update Security Matrix (#59) 
* Update Security Matrix

Updating the full security matrix.

* Yay for consistency

* I hate Markdown / Markup / Whatever the fuck this is.
 2021-05-04 13:30:17 +01:00
RyanandGitHub 7258d7f1bf Merge pull request #58 from AtlasMediaGroup/FS-221 
Remove a number of wipe commands we don't want anyway
 2021-05-04 12:59:31 +01:00
RyanandGitHub c00e64f736 Merge pull request #54 from VideoGameSmash12/FS-137 
Assistant executive discord integration (FS-137)
 2021-05-03 20:14:35 +01:00
RyanandGitHub 9e73db0f24 Merge branch 'development' into FS-137 2021-05-03 19:46:59 +01:00
RyanandGitHub 951c061d77 Merge pull request #57 from AtlasMediaGroup/Elmon11-patch-2 
grammar fix
 2021-05-03 19:46:37 +01:00
RyanandGitHub 579d3e0719 Merge branch 'development' into Elmon11-patch-2 2021-05-03 19:13:39 +01:00
RyanandGitHub 9777733d04 Merge pull request #53 from VideoGameSmash12/ride-typo 
Fixes typo in /ride
 2021-05-03 19:13:26 +01:00
RyanandGitHub 05e118dcb4 Merge branch 'development' into ride-typo 2021-05-03 18:21:16 +01:00
RyanandGitHub 7a0d6f49f4 Merge pull request #52 from VideoGameSmash12/FS-156 
Fixes typo in the Lightning Rod's name (FS-156)
 2021-05-03 18:20:20 +01:00
RyanandGitHub 19f1b7f6bd Merge branch 'development' into Elmon11-patch-2 2021-05-03 15:45:54 +01:00
RyanandGitHub b12afbdc1f Merge branch 'development' into FS-137 2021-05-03 15:45:45 +01:00
RyanandGitHub 49e77d4f93 Merge branch 'development' into ride-typo 2021-05-03 15:45:36 +01:00
RyanandGitHub eb9107bedf Merge branch 'development' into FS-156 2021-05-03 15:45:25 +01:00
Ryan 951c699ed0 Remove a number of wipe commands we don't want anyway 
We shouldn't be wiping any of this data within the server now anyway so let's not tempt fate again.
 2021-05-03 15:44:05 +01:00
Ryan 9e676143b8 2021.04 Release 
Formal Release for 2021.04
 2021-05-03 15:19:42 +01:00
Ryan c8b20bc255 RC2 Release 2021-05-02 13:12:37 +01:00
Ryan 6073712fdf Bump Version 
Bump Version to 2021.04-RC01
 2021-04-26 20:46:11 +01:00
RyanandGitHub 37762e5470 Merge pull request #39 from AtlasMediaGroup/Elmon11-patch-2 
clearinv option in smite (FS-161)
 2021-04-11 22:15:26 +01:00
RyanandGitHub 85d90090c8 Merge branch 'development' into Elmon11-patch-2 2021-04-11 18:41:54 +01:00
RyanandGitHub 09930c2d9a Merge pull request #43 from VideoGameSmash12/development 
Consistency fixes (across 46 commands), additional CoreProtect integration (/dispfill and /setlever), and a critical bugfix (/setlever) (FS-162)
 2021-04-10 12:56:32 +01:00
RyanandGitHub 7ae1ab035a Merge branch 'development' into development 2021-04-10 12:50:52 +01:00
RyanandGitHub 2bd1787663 Updated supported versions for TFM. 2021-04-10 12:45:56 +01:00
RyanandGitHub 765b7dcc4b Merge branch 'development' into development 2021-04-10 12:39:47 +01:00
RyanandGitHub 091381a076 Merge pull request #44 from AtlasMediaGroup/FS-145 
Update JDA version and location (FS-145)
 2021-04-10 12:39:08 +01:00
RyanandGitHub 27f5f18962 FS-143 Resolution (#42) 
* Bump to patch version.

* Fixes FS-143

Various changes to make it work better with logging and things like that.
 2021-04-06 07:11:12 +10:00
RyanandGitHub 2375e92d90 Merge pull request #36 from AtlasMediaGroup/tfm-bugfix-001 
FS-143
 2021-03-26 15:43:22 +00:00
RyanandGitHub 086dec28ac Merge branch 'development' into tfm-bugfix-001 2021-03-19 23:31:31 +00:00
RyanandGitHub f5c08cd28b Merge pull request #34 from AtlasMediaGroup/2021.02-release 
Bump version to 2021.02 Release
 2021-03-19 14:26:02 +00:00
RyanandGitHub 3b57aec0e8 Merge branch 'development' into 2021.02-release 2021-03-18 23:57:10 +00:00
RyanandGitHub efac65bc76 Merge pull request #35 from AtlasMediaGroup/FS-58 
Fix checkstyle & other formatting
 2021-03-18 23:17:25 +00:00
Ryan Wild 9c8fe6c590 Fix checkstyle & other formatting 
This should help clear a lot of the "Security" alerts resolving FS-58
 2021-03-18 22:42:52 +00:00
RyanandGitHub 9f52cdf753 Merge branch 'development' into 2021.02-release 2021-03-18 22:28:53 +00:00
RyanandGitHub ff2bca26aa Merge branch 'development' into FS-33 2021-03-18 19:58:10 +00:00
Ryan Wild 89ad934aa6 Bump version to 2021.02 Release 2021-03-18 19:18:11 +00:00
Ryan Wild 2fb8f224e7 Bump release to 2021.02-RC03 2021-03-06 23:38:46 +00:00
RyanandGitHub b6a2c8e021 Merge pull request #29 from AtlasMediaGroup/abhi-test 
Added myself to TFM
 2021-03-06 20:32:04 +00:00
RyanandGitHub f0a25fde0c Merge branch 'development' into abhi-test 2021-03-06 20:03:19 +00:00
RyanandGitHub 4324497831 Merge pull request #31 from AtlasMediaGroup/Wild1145-patch-1 
Tell CodeQL we're using Java 11 hopefully
 2021-03-06 20:03:02 +00:00
RyanandGitHub 14c53b7370 Merge branch 'development' into Wild1145-patch-1 2021-03-06 19:47:48 +00:00
RyanandGitHub 0396b8ad86 Merge pull request #30 from AtlasMediaGroup/frontdoor-and-banExpiry-only 
fix banning/?? Resolves FS-130
 2021-03-06 19:46:57 +00:00
RyanandGitHub 8ee7486afc Merge branch 'development' into frontdoor-and-banExpiry-only 2021-03-06 19:38:01 +00:00
RyanandGitHub 694d9614c5 Tell Maven to also build Java 11 for once 2021-03-06 19:28:38 +00:00
RyanandGitHub 150e25072a Tell CodeQL we're using Java 11 hopefully 2021-03-06 19:14:46 +00:00
Ryan Wild d4be858c46 2021.02-RC02 Release Bump 
Version bump with some Netbeans Config updates to use Java 11 as we should have been.
 2021-03-05 21:44:38 +00:00
Ryan Wild 96d1c53ede First release candidate 
Bumping version and build code name for the first release candidate of the 2021.02 release.
 2021-02-26 16:53:00 +00:00
RyanandGitHub 4023394562 Merge pull request #24 from AtlasMediaGroup/FS-38 
Remove duplicate config
 2021-02-14 18:19:30 +00:00
Ryan Wild 5d312a12d4 Remove the duplicates that I can see based off of the recent warn 
Heap is entirely removed as it doesn't appear to now be a valid command. The rest are duplicated elsewhere. When in doubt the highest level of restriction was applied.
 2021-02-14 18:05:32 +00:00
Ryan Wild b88cdf1250 Re-Base Config against Freedom-01 
Ensures all the variables we probably have changed and that run as standard are set, commands that are blocked are updated and anything else I could think of are up to date.
 2021-02-14 17:44:57 +00:00
Ryan Wild ebec598120 Fix file permissions 2021-02-06 23:56:15 +00:00
RyanandGitHub aa060ea4d8 Update README with security info 2021-02-06 23:42:03 +00:00
RyanandGitHub fc3eef4d90 Fixed Travis Build Status 2021-02-06 23:06:15 +00:00
RyanandGitHub 44ac012165 Re-adding Travis file based off of the original ones. 2021-02-06 22:44:50 +00:00
RyanandGitHub 500d0e1044 Let's start using TravisCI Again 
It just makes sense...
 2021-02-06 22:43:29 +00:00
RyanandGitHub 8dce71eca1 Merge pull request #18 from AtlasMediaGroup/revert-15-sql-fix 
Revert "SQL fix"
 2021-01-10 20:45:13 +00:00
RyanandGitHub a2243abf2d Revert "SQL fix" 2021-01-10 20:44:57 +00:00
RyanandGitHub 009b983c9a Merge pull request #15 from AtlasMediaGroup/sql-fix 
SQL fix
 2021-01-10 20:36:57 +00:00
RyanandGitHub fd725ca6c5 Merge branch 'development' into paldiu-local 2020-12-28 22:51:44 +00:00
RyanandGitHub 0703ea685e Merge branch 'development' into FS-59 2020-12-28 22:51:21 +00:00
RyanandGitHub 91dc89013c Merge pull request #14 from AtlasMediaGroup/mojangson-update 
Mojangson update
 2020-12-28 22:44:20 +00:00
RyanandGitHub fb314170c1 Moved Repo's to HTTPS 2020-12-24 22:52:35 +00:00
RyanandGitHub 7bf97a03c4 Update social links in line with live config 
The current server config has these links and those ones commented out. While I do now own them not all of them I'm actively using but thought it'd be good to keep this sync'd up.

Resolves FS-12
 2020-12-24 18:36:27 +00:00
RyanandGitHub fa5c774f45 Remove developer who has been suspended indefintely. 2020-12-15 20:53:07 +00:00
RyanandGitHub 681695150a Merge pull request #6 from AtlasMediaGroup/Wild1145-patch-1 
Block new CoreProtect stuff better
 2020-12-05 21:10:27 +00:00
RyanandGitHub 92534640d4 Block new CoreProtect stuff better 2020-12-05 19:01:09 +00:00
RyanandGitHub 7871acc215 Merge pull request #5 from AtlasMediaGroup/Wild1145-patch-1 
Update checkstyle.xml
 2020-12-02 20:50:01 +00:00
RyanandGitHub 153b87c3b3 Update checkstyle.xml 
Think this should fix a load of our new warnings.
 2020-12-02 20:40:32 +00:00
RyanandGitHub 932fa467ba Update README.md 2020-12-02 20:31:44 +00:00
RyanandGitHub 82804fcac2 Create codacy-analysis.yml 2020-12-02 20:23:31 +00:00
RyanandGitHub c0a7ee1bb6 Final fix to security readme (I hope) 2020-12-01 19:43:45 +00:00
RyanandGitHub 8c0db481ae Update SECURITY.md 
Helps when you delete the template...
 2020-12-01 19:43:07 +00:00
RyanandGitHub 6084e7cb63 Create SECURITY.md 2020-12-01 19:42:16 +00:00
RyanandGitHub e40138dee6 Update maven.yml 2020-12-01 19:35:11 +00:00
RyanandGitHub 495133da1a Let's see if this works. 2020-11-22 23:45:29 +00:00
RyanandJerom van der Sar 98f0fdb620 Added a catch for if a player is caged and kicked. Resolves #1789 (#2041) 2017-06-30 09:47:31 +02:00
RyanandJerom van der Sar 26c83ff585 Corrected player message for /disguisetoggle. Resolves #1872 (#2042) 2017-06-30 09:46:31 +02:00
RyanandJerom van der Sar 30a6b7a442 Increased text limit. Resolves #1941 (#2039) 
* Updated the comment as I forgot that

* Corrected the max limited based on updated issue from 250 to 256
 2017-06-30 09:41:01 +02:00
RyanandGitHub 7245de1513 Update README.md 2017-04-26 22:36:20 +01:00
RyanandGitHub d2503da298 Updated Libs Disguise Version Dependency 
It will now always pull the latest 1.11 branch commit, this should remain build-able and stable as it is a TF Project.
 2017-04-26 22:34:14 +01:00
RyanandGitHub c8fb54182e Update pom.xml 2017-04-23 17:17:14 +01:00
RyanandGitHub f3130f5cfc Update pom.xml 
Updated Libs Disguise version
 2017-04-19 18:29:47 +01:00
RyanandJeromSar ade60ad611 Updated developer names. Resolves #421 2015-02-13 18:08:27 +01:00