Bump to release version

We're good to go!
Merge branch 'main' of https://github.com/AtlasMediaGroup/TotalFreedomMod into RELEASE-2021.06
2025-07-01 20:46:41 +00:00 · 2021-08-14 21:17:21 +01:00 · 2021-07-17 13:14:39 +01:00 · 2021-07-17 13:10:35 +01:00 · 2021-07-16 11:43:46 +01:00 · 2021-07-08 20:48:41 +01:00
3 changed files with 4 additions and 4 deletions
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# TotalFreedomMod [![Build Status](https://travis-ci.com/AtlasMediaGroup/TotalFreedomMod.svg?branch=development)](https://travis-ci.com/AtlasMediaGroup/TotalFreedomMod) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/29c0f964da304666bd654bc7b1d556db)](https://www.codacy.com/gh/AtlasMediaGroup/TotalFreedomMod/dashboard?utm_source=github.com&utm_medium=referral&utm_content=AtlasMediaGroup/TotalFreedomMod&utm_campaign=Badge_Grade)
+# TotalFreedomMod [![Maven-Build](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/maven.yml/badge.svg)](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/maven.yml) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/29c0f964da304666bd654bc7b1d556db)](https://www.codacy.com/gh/AtlasMediaGroup/TotalFreedomMod/dashboard?utm_source=github.com&utm_medium=referral&utm_content=AtlasMediaGroup/TotalFreedomMod&utm_campaign=Badge_Grade) [![CodeQL](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/codeql-analysis.yml)
 TotalFreedomMod is a CraftBukkit server plugin designed primarily to support the [Official TotalFreedom Minecraft Server](https://totalfreedom.me/). However, you are more than welcome to adapt the source for your own server.
@ -14,4 +14,4 @@ For information on our security policy and reporting an issue, please see [SECUR
 ### Compiling
-You need Maven to build. You'd also need to set the JDK version to Java 8 as that is the current standard as of now.
+You need Maven to build. You'd also need to set the JDK version to Java 11 as that is the current standard as of now.
--- a/SECURITY.md
+++ b/SECURITY.md
@ -19,13 +19,13 @@ These versions are no longer under active development, however we will look to r
 | Version             | Supported          | Support End: |
 | ------------------- | ------------------ | ------------ |
 | 2021.04             | :white_check_mark: | July 2021    |
 | 2021.02             | :white_check_mark: | June 2021    |
 ### No Longer Supported
 These versions are no longer supported at all. It is strongly advised to update if you are running any of these versions. 
 | Version             | Supported          | Support Ended:      |
 | ------------------- | ------------------ | ------------------- |
 | 2021.02             | :x:                | 6 June 2021         |
 | 2020.11             | :x:                | 3 May 2021          |
 | 6.0.x (Pre-Release) | :x:                | December 2020       |
 | < 2020.11           | :x:                | December 2020       |
--- a/pom.xml
+++ b/pom.xml
@ -5,7 +5,7 @@
    <groupId>me.totalfreedom</groupId>
    <artifactId>TotalFreedomMod</artifactId>
-    <version>2021.04</version>
+    <version>2021.06</version>
    <packaging>jar</packaging>
    <properties>
Author	SHA1	Message	Date
Wild1145	4a6ad2059a	Bump to release version We're good to go!	2021-08-14 21:17:21 +01:00
Ryan Wild	ad80011de2	Merge branch 'main' of https://github.com/AtlasMediaGroup/TotalFreedomMod into RELEASE-2021.06 # Conflicts: # pom.xml	2021-07-17 13:14:39 +01:00
Ryan Wild	c732b40203	Bump release to 2021.06-RC01	2021-07-17 13:10:35 +01:00
Ryan	a37364d07e	Correct JDK Version in README (#92 ) It's currently wrong so needed updating.	2021-07-16 11:43:46 +01:00
Ryan	939e98b759	Update badges (#88 ) Remove TravisCI Add Github Maven Build Action Add CodeQL Badge	2021-07-08 20:48:41 +01:00
Ryan	17b051e2a7	Retired support for 2021.02 fully. (#72 )	2021-06-07 16:26:15 +01:00
Nathan Curran	77a05f22a8	TotalFreedomMod May Update	2021-06-07 16:26:15 +01:00
Nathan Curran	5c3ef1f107	Bump version	2021-06-07 16:26:15 +01:00
Video	53c5991971	Addresses FS-224 (#70 )	2021-06-07 16:26:15 +01:00
Nathan Curran	ff760a6c11	Use long instead of int and use offset to check time (FS-181) (#69 ) * Use long instead of int and use offset to check time (FS-181) * Remove star import	2021-06-07 16:26:15 +01:00
Nathan Curran	63069ff9ec	Calculate the player count without offline players (FS-247) (#68 ) Co-authored-by: Ryan <Wild1145@users.noreply.github.com>	2021-06-07 16:26:15 +01:00
Nathan Curran	5e63b71861	Small modification to new TFGuilds (FS-255) (#67 )	2021-06-07 16:26:15 +01:00
Ryan	b72782de4f	Add //g to blocked commands (#62 ) Co-authored-by: Nathan Curran <30569566+Focusvity@users.noreply.github.com>	2021-06-07 16:26:15 +01:00
Nathan Curran	de9556c550	Name change for Fleek (#64 )	2021-06-07 16:26:15 +01:00
Nathan Curran	6590504545	Added new dependency to allow TFM to compile (#65 )	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
Video	07b5076717	Bug fixes, improvements, and removals (FS-192) (#46 ) * Three fixes * Fixes /tempban throwing a NullPointerException when trying to get a player who isn't on the server but was in the past * Fixes /tempban banning players for 24 hours regardless of the duration defined * Fixes /list -t throwing a NullPointerException when performed from a non-player source (such as Telnet) * Removes hubworld entriely * Configurable blacklists for tag, muted commands, and wildcard Changes: * Moves globally blocked commands to the `global` subsection of the original `blocked_commands` section. You will need to update your configurations * /wildcard's command blacklist is now configurable under the `wildcard` section in `blocked_commands`. * The commands muted players can't use are now configurable under the `muted` section in `blocked_commands`. * Removes some commented-out globally blocked command entries. Co-authored-by: Ryan <Wild1145@users.noreply.github.com>	2021-06-07 16:26:15 +01:00
Video	6fb9507a4c	Why overcomplicating things is a horrifically bad idea (#55 ) The longer I look into this plugin's code, the angrier I will become. This fixes 2 bugs in the /potion command: - Fixes non-admins being able to clear other players - Fixes NPE caused when trying to add potion effects to players who are not on the server as a non-admin. Both of these issues are caused by overcomplicating seemingly simple solutions, hence the name of this commit. Co-authored-by: Ryan <Wild1145@users.noreply.github.com> Co-authored-by: Nathan Curran <30569566+Focusvity@users.noreply.github.com>	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
Elmon11	c60b451ce7	grammar fix	2021-06-07 16:26:15 +01:00
Video	f85f3e32ea	Fixes FS-137	2021-06-07 16:26:15 +01:00
Video	57b3351047	ok, done (FS-156)	2021-06-07 16:26:15 +01:00
Video	dd10eb3f5e	Update Command_ride.java	2021-06-07 16:26:15 +01:00