TotalFreedomMC/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TotalFreedomMod.git synced 2024-06-16 00:21:20 +00:00
Code Issues Projects Releases Wiki Activity
1935 commits 7 branches 35 tags 8.2 MiB
Commit graph

1935 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elmon11 dca5e30291
Actually display assistant exec in game (#37) 
* Actually display assistant exec in game

* Update RankManager.java

* Update ConfigEntry.java

* Update FUtil.java

Co-authored-by: Nathan Curran <30569566+Focusvity@users.noreply.github.com>
 2021-04-04 22:24:06 +10:00
TFTWPhoenix 09a435053e
Merge pull request #40 from AtlasMediaGroup/phoenix-patch-1 
Remove /premium
 2021-03-31 17:12:56 -05:00
TFTWPhoenix 14309275fb
Remove /premium 2021-03-31 15:16:01 -05:00
Ryan 2375e92d90
Merge pull request #36 from AtlasMediaGroup/tfm-bugfix-001 
FS-143
 2021-03-26 15:43:22 +00:00
Paldiu 97672c2fff Update DiscordToAdminChatListener.java 
This is the only way we can load media after [Discord] and [Formatting] without rewriting the method
 2021-03-22 09:57:09 -05:00
Paldiu 5837b05a35 Merge branch 'tfm-bugfix-001' of https://github.com/AtlasMediaGroup/TotalFreedomMod into tfm-bugfix-001 2021-03-21 14:02:51 -05:00
Paldiu b3b68ebd13 Switch to Allman Formatting 2021-03-21 14:02:43 -05:00
Nathan Curran db3c190b2b
Merge branch 'development' into tfm-bugfix-001 2021-03-21 16:11:13 +11:00
Paldiu 2725857364
Merge pull request #38 from AtlasMediaGroup/FS-147 
Fix ban expiration (FS-147)
 2021-03-20 22:14:10 -05:00
Nathan Curran 9f291f675c
Use 'toEpochMilli()' instead (FS-147) 2021-03-21 13:44:55 +11:00
Nathan Curran 561c192c27
Fix bans not expiring (FS-147) 2021-03-21 12:21:15 +11:00
Ryan 086dec28ac
Merge branch 'development' into tfm-bugfix-001 2021-03-19 23:31:31 +00:00
Paldiu b03870c0aa SQL Fixes 
:)
 2021-03-19 10:39:58 -05:00
Ryan f5c08cd28b
Merge pull request #34 from AtlasMediaGroup/2021.02-release 
Bump version to 2021.02 Release
 2021-03-19 14:26:02 +00:00
Paldiu 2a87271642 Should fix FS-143 2021-03-19 08:58:29 -05:00
Ryan 3b57aec0e8
Merge branch 'development' into 2021.02-release 2021-03-18 23:57:10 +00:00
Ryan 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
Ryan 9f52cdf753
Merge branch 'development' into 2021.02-release 2021-03-18 22:28:53 +00:00
Paldiu 216234ea01
Merge pull request #32 from AtlasMediaGroup/FS-33 
Properly fix FS-33
 2021-03-18 16:20:06 -05:00
Nathan Curran 881dead392
Merge branch 'development' into 2021.02-release 2021-03-19 08:04:36 +11:00
Ryan 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
Paldiu d0a195647c
Merge pull request #33 from AtlasMediaGroup/FS-93 
Fixed permission not setting for new players (FS-93)
 2021-03-17 09:06:45 -05:00
Nathan Curran eb05b05042
Fixed FS-93 
- Players no longer need to relog, just need to be opped to get permissions.
- Removed redundant PlayerJoinEvent code as it's already been executed (See RankManager class).
 2021-03-16 20:21:31 +11:00
Nathan Curran b9c1970d20
Update player's permission when opping. 2021-03-16 19:56:29 +11:00
Nathan Curran 9eca9ac5b2
Remove double storage 
It is unnecessary as the information is already stored in a map (Username, IPs)
 2021-03-08 11:34:48 +11:00
Nathan Curran 5b577fae07
Add myself to developer list 2021-03-07 20:46:30 +11:00
Nathan Curran 452a8755c2
Properly fix FS-33 2021-03-07 20:43:25 +11:00
Ryan Wild 2fb8f224e7
Bump release to 2021.02-RC03 2021-03-06 23:38:46 +00:00
Ryan b6a2c8e021
Merge pull request #29 from AtlasMediaGroup/abhi-test 
Added myself to TFM
 2021-03-06 20:32:04 +00:00
Ryan f0a25fde0c
Merge branch 'development' into abhi-test 2021-03-06 20:03:19 +00:00
Ryan 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
Ryan 14c53b7370
Merge branch 'development' into Wild1145-patch-1 2021-03-06 19:47:48 +00:00
Ryan 0396b8ad86
Merge pull request #30 from AtlasMediaGroup/frontdoor-and-banExpiry-only 
fix banning/?? Resolves FS-130
 2021-03-06 19:46:57 +00:00
Ryan 8ee7486afc
Merge branch 'development' into frontdoor-and-banExpiry-only 2021-03-06 19:38:01 +00:00
Ryan 694d9614c5
Tell Maven to also build Java 11 for once 2021-03-06 19:28:38 +00:00
Ryan 150e25072a
Tell CodeQL we're using Java 11 hopefully 2021-03-06 19:14:46 +00:00
abhiram 7d990ae2c0 [+] Remove .idea 2021-03-06 23:50:23 +05:30
Paldiu 0dd5a26efa Merge branch 'frontdoor-and-banExpiry-only' of https://github.com/AtlasMediaGroup/TotalFreedomMod into frontdoor-and-banExpiry-only 2021-03-06 12:12:59 -06:00
Paldiu 5c097c83cb Here's to hoping this fixes that stupid ban crap. 2021-03-06 12:00:32 -06:00
abhiram a85dd014a0 Added .idea in gitignore 2021-03-06 13:05:42 +05:30
abhiram 342df43f85 Added myself to TFM 2021-03-06 13:04:36 +05:30
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
Ivan ec9a6e0d5b
paldiu did some shit 
FS-63 (FrontDoor)
FS-130 (Bans)
 2021-03-04 20:37:31 -05:00
Paldiu 9161016f73
Merge branch 'development' into frontdoor-and-banExpiry-only 2021-03-03 11:52:37 -06:00
Paldiu bdd22f8d75
Update month to be 30 days instead of 4 weeks 2021-03-03 12:50:45 -05:00
Paldiu ce103ffd50
Merge pull request #28 from AtlasMediaGroup/abhi-test 
fixes of JIRA issues.
 2021-03-02 20:45:18 -06:00
abhiram 85c35f25a3 [+] Fix codacy issue 2021-03-03 06:47:22 +05:30
abhiram c29b312101 [+] Remove .idea 2021-03-02 23:11:17 +05:30