Commit Graph
51 Commits
Author SHA1 Message Date
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
Ryan 9a2dc52e87 Using qop should now only op those who are not op.
This will further reduce the amount of spam and doesn't spam everyone with "you are now op".
2014-08-14 22:32:45 +01:00