TotalFreedomMC/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TotalFreedomMod.git synced 2024-05-17 10:01:25 +00:00
Code Issues Projects Releases Wiki Activity

Commit graph

  • 5837b05a35 Merge branch 'tfm-bugfix-001' of https://github.com/AtlasMediaGroup/TotalFreedomMod into tfm-bugfix-001 Paldiu 2021-03-21 14:02:51 -0500
  • b3b68ebd13 Switch to Allman Formatting Paldiu 2021-03-21 14:02:43 -0500
  • 2dbbb5c262
         Intellij says this is fine so if it breaks again gg Elmon11 2021-03-21 19:07:07 +0100
  • e45655edbb
         im a clown Elmon11 2021-03-21 18:33:38 +0100
  • 9713fcabd6
         Should work fingers crossed Elmon11 2021-03-21 18:25:28 +0100
  • dc10c40578
         noclear option in smite Elmon11 2021-03-21 13:57:24 +0100
  • db3c190b2b
         Merge branch 'development' into tfm-bugfix-001 Nathan Curran 2021-03-21 16:11:13 +1100
  • 2725857364
         Merge pull request #38 from AtlasMediaGroup/FS-147 Paldiu 2021-03-20 22:14:10 -0500
  • 9f291f675c
         Use 'toEpochMilli()' instead (FS-147) Nathan Curran 2021-03-21 13:44:55 +1100
  • 561c192c27
         Fix bans not expiring (FS-147) Nathan Curran 2021-03-21 12:21:15 +1100
  • 086dec28ac
         Merge branch 'development' into tfm-bugfix-001 Ryan 2021-03-19 23:31:31 +0000
  • b03870c0aa SQL Fixes Paldiu 2021-03-19 10:39:58 -0500
  • f5c08cd28b
         Merge pull request #34 from AtlasMediaGroup/2021.02-release Ryan 2021-03-19 14:26:02 +0000
  • 2a87271642 Should fix FS-143 Paldiu 2021-03-19 08:58:29 -0500
  • 3b57aec0e8
         Merge branch 'development' into 2021.02-release Ryan 2021-03-18 23:57:10 +0000
  • efac65bc76
         Merge pull request #35 from AtlasMediaGroup/FS-58 Ryan 2021-03-18 23:17:25 +0000
  • 9c8fe6c590
         Fix checkstyle & other formatting Ryan Wild 2021-03-18 22:42:52 +0000
  • 9f52cdf753
         Merge branch 'development' into 2021.02-release Ryan 2021-03-18 22:28:53 +0000
  • 216234ea01
         Merge pull request #32 from AtlasMediaGroup/FS-33 Paldiu 2021-03-18 16:20:06 -0500
  • 881dead392
         Merge branch 'development' into 2021.02-release Nathan Curran 2021-03-19 08:04:36 +1100
  • ff2bca26aa
         Merge branch 'development' into FS-33 Ryan 2021-03-18 19:58:10 +0000
  • 89ad934aa6
         Bump version to 2021.02 Release Ryan Wild 2021-03-18 19:18:11 +0000
  • d0a195647c
         Merge pull request #33 from AtlasMediaGroup/FS-93 Paldiu 2021-03-17 09:06:45 -0500
  • eb05b05042
         Fixed FS-93 Nathan Curran 2021-03-16 20:21:31 +1100
  • b9c1970d20
         Update player's permission when opping. Nathan Curran 2021-03-16 19:56:29 +1100
  • 9eca9ac5b2
         Remove double storage Nathan Curran 2021-03-08 11:34:48 +1100
  • 5b577fae07
         Add myself to developer list Nathan Curran 2021-03-07 20:46:30 +1100
  • 452a8755c2
         Properly fix FS-33 Nathan Curran 2021-03-07 20:43:25 +1100
  • 2fb8f224e7
         Bump release to 2021.02-RC03 Ryan Wild 2021-03-06 23:38:46 +0000
  • b6a2c8e021
         Merge pull request #29 from AtlasMediaGroup/abhi-test Ryan 2021-03-06 20:32:04 +0000
  • f0a25fde0c
         Merge branch 'development' into abhi-test Ryan 2021-03-06 20:03:19 +0000
  • 4324497831
         Merge pull request #31 from AtlasMediaGroup/Wild1145-patch-1 Ryan 2021-03-06 20:03:02 +0000
  • 1f3c30c6f5 Merge branch 'frontdoor-and-banExpiry-only' of https://github.com/AtlasMediaGroup/TotalFreedomMod into frontdoor-and-banExpiry-only Paldiu 2021-03-06 13:49:31 -0600
  • b1047f2cfe Conversion Therapy Paldiu 2021-03-06 13:49:28 -0600
  • 14c53b7370
         Merge branch 'development' into Wild1145-patch-1 Ryan 2021-03-06 19:47:48 +0000
  • 0396b8ad86
         Merge pull request #30 from AtlasMediaGroup/frontdoor-and-banExpiry-only Ryan 2021-03-06 19:46:57 +0000
  • 8ee7486afc
         Merge branch 'development' into frontdoor-and-banExpiry-only Ryan 2021-03-06 19:38:01 +0000
  • 694d9614c5
         Tell Maven to also build Java 11 for once Ryan 2021-03-06 19:28:38 +0000
  • 150e25072a
         Tell CodeQL we're using Java 11 hopefully Ryan 2021-03-06 19:14:46 +0000
  • 7d990ae2c0 [+] Remove .idea abhiram 2021-03-06 23:50:23 +0530
  • 0dd5a26efa Merge branch 'frontdoor-and-banExpiry-only' of https://github.com/AtlasMediaGroup/TotalFreedomMod into frontdoor-and-banExpiry-only Paldiu 2021-03-06 12:12:59 -0600
  • 5c097c83cb Here's to hoping this fixes that stupid ban crap. Paldiu 2021-03-06 12:00:32 -0600
  • a85dd014a0 Added .idea in gitignore abhiram 2021-03-06 13:05:42 +0530
  • 342df43f85 Added myself to TFM abhiram 2021-03-06 13:04:36 +0530
  • d4be858c46
         2021.02-RC02 Release Bump Ryan Wild 2021-03-05 21:44:38 +0000
  • ec9a6e0d5b
         paldiu did some shit Ivan 2021-03-04 20:37:31 -0500
  • 9161016f73
         Merge branch 'development' into frontdoor-and-banExpiry-only Paldiu 2021-03-03 11:52:37 -0600
  • bdd22f8d75
         Update month to be 30 days instead of 4 weeks Paldiu 2021-03-03 12:50:45 -0500
  • ce103ffd50
         Merge pull request #28 from AtlasMediaGroup/abhi-test Paldiu 2021-03-02 20:45:18 -0600
  • 85c35f25a3 [+] Fix codacy issue abhiram 2021-03-03 06:47:22 +0530
  • c29b312101 [+] Remove .idea abhiram 2021-03-02 23:11:17 +0530
  • a4ead85701 add annotations dependency Paldiu 2021-03-01 23:03:49 -0600
  • 46273b3301 Revert "SQL PreparedStatement Fixes" Paldiu 2021-03-01 23:03:13 -0600
  • d6b74a76bb [+] Fix of FS-33 abhiram 2021-02-28 21:28:20 +0530
  • 6f66957b17 Few fixes for JIRA issues.... abhiram 2021-02-28 21:08:39 +0530
  • 17347c23a5 SQL PreparedStatement Fixes Paldiu 2021-02-26 15:29:02 -0600
  • 718748f1a2 Commit Ultimate Paldiu 2021-02-26 15:26:13 -0600
  • 12b04d302d Bull Request Paldiu 2021-02-26 15:12:31 -0600
  • 96d1c53ede
         First release candidate Ryan Wild 2021-02-26 16:53:00 +0000
  • b7ec982868
         Merge remote-tracking branch 'origin/paldiu-local' into paldiu-local Ryan Wild 2021-02-26 16:51:11 +0000
  • 3a853780ba
         updzte Paldiu 2021-02-23 17:12:40 -0600
  • 43bde1258f
         Fixed FrontDoor to work on Case 8! Paldiu 2021-02-12 10:17:22 -0600
  • e64323d70d
         Targeting NPath Complexity of 2m Paldiu 2021-02-06 08:37:14 -0600
  • b204c8bd4e
         Replace FrontDoor; I'm sure we have to initilize this somewhere. Paldiu 2021-01-28 13:27:49 -0600
  • 3f97b06da0
         Attempting to resolve Jira Tickets Paldiu 2021-01-11 19:56:05 -0600
  • 1293a8aa1e
         Merge pull request #26 from AtlasMediaGroup/ivan Ivan 2021-02-25 17:58:12 -0500
  • 96424694ee fix codacy errors Ivan 2021-02-25 17:03:31 -0500
  • 0367d9fd3a my end of the bargain Ivan 2021-02-25 16:42:30 -0500
  • 574f15821b updzte Paldiu 2021-02-23 17:12:40 -0600
  • 927f096b0e Merge branch 'development' into paldiu-local Paldiu 2021-02-23 17:12:02 -0600
  • 3b666f1fde
         Merge pull request #25 from AtlasMediaGroup/Elmon11-patch-1 Ivan 2021-02-17 18:25:19 -0500
  • ec51cb7408
         removing BukkitTelnet from untouchable plugins Elmon11 2021-02-17 22:03:35 +0100
  • 4023394562
         Merge pull request #24 from AtlasMediaGroup/FS-38 Ryan 2021-02-14 18:19:30 +0000
  • 5d312a12d4
         Remove the duplicates that I can see based off of the recent warn Ryan Wild 2021-02-14 18:05:32 +0000
  • b88cdf1250
         Re-Base Config against Freedom-01 Ryan Wild 2021-02-14 17:44:57 +0000
  • 38da7b9dd6 Fixed FrontDoor to work on Case 8! Paldiu 2021-02-12 10:17:22 -0600
  • 262c67600b Merge branch 'development' into paldiu-local Paldiu 2021-02-12 09:13:37 -0600
  • ebec598120
         Fix file permissions Ryan Wild 2021-02-06 23:56:15 +0000
  • aa060ea4d8
         Update README with security info Ryan 2021-02-06 23:42:03 +0000
  • fc3eef4d90
         Fixed Travis Build Status Ryan 2021-02-06 23:06:15 +0000
  • 44ac012165
         Re-adding Travis file based off of the original ones. Ryan 2021-02-06 22:44:50 +0000
  • 500d0e1044
         Let's start using TravisCI Again Ryan 2021-02-06 22:43:29 +0000
  • 6616db1a01 Targeting NPath Complexity of 2m Paldiu 2021-02-06 08:37:14 -0600
  • d8ee5538f7 Replace FrontDoor; I'm sure we have to initilize this somewhere. Paldiu 2021-01-28 13:27:49 -0600
  • 34cedcec76 Merge branch 'development' into paldiu-local Paldiu 2021-01-28 12:53:27 -0600
  • 400a90b385
         Merge pull request #21 from AtlasMediaGroup/smartnt-patch-1 Ivan 2021-01-25 21:28:43 -0500
  • b8a741aa58
         Add new developers to util Ivan 2021-01-25 20:36:58 -0500
  • a3929ec07e
         Merge pull request #19 from AtlasMediaGroup/permission-changes Elmon11 2021-01-17 04:11:31 +0100
  • 6b637c7d5f Attempting to resolve Jira Tickets Paldiu 2021-01-11 19:56:05 -0600
  • 8225daf6f1 permission changes & remove massmurder speed 2021-01-10 16:23:20 -0500
  • 8dce71eca1
         Merge pull request #18 from AtlasMediaGroup/revert-15-sql-fix Ryan 2021-01-10 20:45:13 +0000
  • a2243abf2d
         Revert "SQL fix" Ryan 2021-01-10 20:44:57 +0000
  • 009b983c9a
         Merge pull request #15 from AtlasMediaGroup/sql-fix Ryan 2021-01-10 20:36:57 +0000
  • 1b3876cffa
         Merge branch 'development' into sql-fix speed 2021-01-10 15:06:40 -0500
  • ed48ce3a8f
         Merge pull request #11 from AtlasMediaGroup/paldiu-local speed 2021-01-10 15:06:22 -0500
  • 830daab8f4 Fix Daemon Error Paldiu 2021-01-08 17:32:54 -0600
  • 9688827a39 formatting speed 2021-01-08 10:10:54 -0500
  • 3464a33678 NPE on Thread.join() possible fix Paldiu 2021-01-08 00:25:46 -0600
  • 5754d70d05
         Merge branch 'development' into sql-fix Paldiu 2021-01-07 14:46:13 -0500
  • fbf2972006 Merge branch 'sql-fix' into paldiu-local Paldiu 2021-01-07 13:40:59 -0600