AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2026-07-16 02:25:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,877 Commits 38 Branches 58 Tags
96424694ee6970af3279d1f772847033c8ea881e
Commit Graph
1877 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
IvanandGitHub 3b666f1fde Merge pull request #25 from AtlasMediaGroup/Elmon11-patch-1 
removing BukkitTelnet from untouchable plugins
 2021-02-17 18:25:19 -05:00
Elmon11andGitHub ec51cb7408 removing BukkitTelnet from untouchable plugins 2021-02-17 22:03:35 +01: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
IvanandGitHub 400a90b385 Merge pull request #21 from AtlasMediaGroup/smartnt-patch-1 
Add new developers to util
 2021-01-25 21:28:43 -05:00
IvanandGitHub 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
Elmon11andGitHub 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
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
speedandGitHub 1b3876cffa Merge branch 'development' into sql-fix 2021-01-10 15:06:40 -05:00
speedandGitHub 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
PaldiuandGitHub 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
speedandGitHub 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
Elmon11andGitHub e32c2eed15 Update FUtil.java 2021-01-03 19:23:10 +01:00
Elmon11andGitHub 7afa80c89f Update FUtil.java 2021-01-03 19:18:14 +01:00
Elmon11andGitHub a3cccc7ac0 Update FUtil.java 2021-01-03 19:16:41 +01:00
Elmon11andGitHub bc37ed5341 Fix developer title not showing up on Offline mode servers 2021-01-03 19:04:23 +01:00
speed 0a5ce5b9cc fix w/e in mbw 2020-12-31 13:06:05 -05:00
Paldiu a4e23dc03f Codacy Complacency Part 2 2020-12-29 22:14:57 -06:00
Paldiu 7a394e52e4 Codacy complacency 2020-12-29 22:06:12 -06:00
Paldiu 9352a48650 Finalized lombok removal 
Finally removed all lomboks, also reduced npath complexity for FreedomCommand.FCommand#execute and removed empty constructor from Discord
 2020-12-29 21:37:50 -06:00
PaldiuandGitHub a849e01ce5 Merge pull request #12 from AtlasMediaGroup/FS-59 
admin chat discord formatting (FS-59)
 2020-12-29 15:34:48 -05: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
speedandGitHub 1ba468cbfc Merge branch 'development' into sql-fix 2020-12-28 17:49:11 -05:00
RyanandGitHub 91dc89013c Merge pull request #14 from AtlasMediaGroup/mojangson-update 
Mojangson update
 2020-12-28 22:44:20 +00:00
speed 7cdeac451b SQL fix 2020-12-28 17:39:07 -05:00
speed 5b8cf2798e Update pom.xml 2020-12-28 17:05:52 -05:00
speed 98158e0f27 mojangson update 2020-12-28 17:04:14 -05:00
PaldiuandGitHub c0ac0365eb Merge pull request #13 from AtlasMediaGroup/Elmon11-patch-1 
Make gcmd not work on admins

//MERGE COMMIT:
At least one build check passed, the failing check is irrelevant.
 2020-12-28 07:41:58 -05:00
Elmon11andGitHub 0c60cbc739 Update Command_gcmd.java 2020-12-28 00:18:05 +01:00
Elmon11andGitHub 402a6be5ad Make gcmd not work on admins 2020-12-28 00:04:57 +01:00