AtlasMediaGroup
/
TotalFreedomMod
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,894 Commits 38 Branches 58 Tags 8.9 MiB
Commit Graph

1894 Commits

Author SHA1 Message Date
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
Paldiu a4ead85701 add annotations dependency 2021-03-01 23:03:49 -06:00
Paldiu 46273b3301 Revert "SQL PreparedStatement Fixes" 
This reverts commit 17347c23a5.
 2021-03-01 23:03:13 -06:00
abhiram d6b74a76bb [+] Fix of FS-33 2021-02-28 21:28:20 +05:30
abhiram 6f66957b17 Few fixes for JIRA issues.... 2021-02-28 21:08:39 +05:30
Paldiu 17347c23a5 SQL PreparedStatement Fixes 2021-02-26 15:29:02 -06:00
Paldiu 718748f1a2 Commit Ultimate 
ultimate super mega mode power upgrade
 2021-02-26 15:26:13 -06: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
Ivan 1293a8aa1e
Merge pull request #26 from AtlasMediaGroup/ivan 
Ruh-Roh Raggy!
 2021-02-25 17:58:12 -05:00
Ivan 96424694ee fix codacy errors 2021-02-25 17:03:31 -05:00
Ivan 0367d9fd3a my end of the bargain 2021-02-25 16:42:30 -05:00
Ivan 3b666f1fde
Merge pull request #25 from AtlasMediaGroup/Elmon11-patch-1 
removing BukkitTelnet from untouchable plugins
 2021-02-17 18:25:19 -05:00
Elmon11 ec51cb7408
removing BukkitTelnet from untouchable plugins 2021-02-17 22:03:35 +01:00
Ryan 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
Ryan aa060ea4d8
Update README with security info 2021-02-06 23:42:03 +00:00
Ryan fc3eef4d90
Fixed Travis Build Status 2021-02-06 23:06:15 +00:00
Ryan 44ac012165
Re-adding Travis file based off of the original ones. 2021-02-06 22:44:50 +00:00
Ryan 500d0e1044
Let's start using TravisCI Again 
It just makes sense...
 2021-02-06 22:43:29 +00:00
Ivan 400a90b385
Merge pull request #21 from AtlasMediaGroup/smartnt-patch-1 
Add new developers to util
 2021-01-25 21:28:43 -05:00
Ivan b8a741aa58
Add new developers to util 
Hopefully this doesn't fuck up this time - last PR my Macbook was having issues with for some reason.
 2021-01-25 20:36:58 -05:00
Elmon11 a3929ec07e
Merge pull request #19 from AtlasMediaGroup/permission-changes 
merging according to wild's comments
 2021-01-17 04:11:31 +01:00
speed 8225daf6f1 permission changes & remove massmurder 
resolves FS-69, FS-70, FS-71
 2021-01-10 16:23:20 -05:00
Ryan 8dce71eca1
Merge pull request #18 from AtlasMediaGroup/revert-15-sql-fix 
Revert "SQL fix"
 2021-01-10 20:45:13 +00:00
Ryan a2243abf2d
Revert "SQL fix" 2021-01-10 20:44:57 +00:00
Ryan 009b983c9a
Merge pull request #15 from AtlasMediaGroup/sql-fix 
SQL fix
 2021-01-10 20:36:57 +00:00
speed 1b3876cffa
Merge branch 'development' into sql-fix 2021-01-10 15:06:40 -05:00
speed ed48ce3a8f
Merge pull request #11 from AtlasMediaGroup/paldiu-local 
Removal of Lombok
 2021-01-10 15:06:22 -05:00
Paldiu 830daab8f4 Fix Daemon Error 
Reflection issue when initializing the daemon; trying to call a constructor with one argument using two arguments.

Removed an unused constructor.
 2021-01-08 17:32:54 -06:00
speed 9688827a39 formatting 2021-01-08 10:10:54 -05:00
Paldiu 3464a33678 NPE on Thread.join() possible fix 
This bug is hard to decipher mainly due to the thread being terminated somewhere before the thread.join is called. this may be due to the safeClose method defined with serverSocket, but again, I'm not too sure what's up here. This may also be because something failed to execute in one of the try catch statements, causing the thread to never be initialized in the first place.
 2021-01-08 00:25:46 -06:00
Paldiu 5754d70d05
Merge branch 'development' into sql-fix 2021-01-07 14:46:13 -05:00
Paldiu fbf2972006 Merge branch 'sql-fix' into paldiu-local 2021-01-07 13:40:59 -06:00
Paldiu aa2836b29a Merge branch 'mbw-fix' into paldiu-local 2021-01-07 13:39:51 -06:00
Paldiu 260368585e reformat 2021-01-07 13:29:47 -06:00
Paldiu 323fd1a031 Should be fine now 2021-01-04 18:27:57 -06:00
Paldiu c7b0f77910 Merge branch 'development' into paldiu-local 2021-01-04 13:14:53 -06:00
speed 7fb6a2f087
Merge pull request #17 from AtlasMediaGroup/Elmon11-patch-1 
Fix developer title not showing up on Offline mode servers
 2021-01-03 13:47:14 -05:00
Elmon11 e32c2eed15
Update FUtil.java 2021-01-03 19:23:10 +01:00
Elmon11 7afa80c89f
Update FUtil.java 2021-01-03 19:18:14 +01:00