Commit Graph

  • 407b63e48b Fixes FS-137 Video 2021-04-26 01:23:24 -0600
  • be562fe722 ok, done (FS-156) Video 2021-04-26 00:58:28 -0600
  • 5555dfa188
    Merge branch 'development' into development Video 2021-04-26 00:47:10 -0600
  • 928ab41d7f Update Command_ride.java Video 2021-04-26 00:37:16 -0600
  • d11d55b218
    Vanished admins are no longer being counted (FS-148) (#41) Nathan Curran 2021-04-24 14:06:28 +1000
  • 76b3634fc6
    Merge branch 'development' into FS-148 Video 2021-04-23 21:12:46 -0600
  • debb95fb4c
    video dev man (#51) Video 2021-04-23 21:03:11 -0600
  • 7a36f4a7ef video dev man Video 2021-04-23 20:05:15 -0600
  • 13626a5c94
    Merge branch 'development' into FS-148 Nathan Curran 2021-04-22 21:55:02 +1000
  • b9f7ab3ec3
    Change punishment from kicking to muting on spam (FS-97) (#45) Nathan Curran 2021-04-22 21:54:29 +1000
  • 25b2e1ee51
    Merge branch 'development' into FS-97 Nathan Curran 2021-04-19 17:35:08 +1000
  • 76c9fa1292
    Merge branch 'development' into FS-148 Nathan Curran 2021-04-19 17:34:57 +1000
  • 2cdf1e66a6
    Disables block gravity and makes it togglable (FS-89) (#50) Video 2021-04-19 01:34:36 -0600
  • 6a31b5bc72 Combine these checks as Codacy ever so kindly suggested Video 2021-04-18 03:30:11 -0600
  • a7f3d0e247 Merge remote-tracking branch 'upstream/development' into development Video 2021-04-18 03:23:06 -0600
  • fbbdb5c861 Disables block gravity by default (FS-89) Video 2021-04-18 03:17:56 -0600
  • 04b57946cd
    Merge branch 'development' into FS-148 Ryan 2021-04-17 14:09:43 +0100
  • f326d81ede
    Merge branch 'development' into FS-97 Ryan 2021-04-17 14:09:23 +0100
  • 20c2c4c96e
    Delete /wipeuserdata (FS-196) (#49) Nathan Curran 2021-04-15 22:07:22 +1000
  • 70d5fa7c8b
    Delete /wipeuserdata (FS-196) Nathan Curran 2021-04-15 19:35:43 +1000
  • 348c687a23
    Merge branch 'development' into FS-148 Nathan Curran 2021-04-15 11:17:06 +1000
  • 78768770f2
    Merge branch 'development' into FS-97 Nathan Curran 2021-04-15 11:16:54 +1000
  • d5238150d0
    Curse be gone (#47) Video 2021-04-12 22:13:47 -0600
  • 104f3e1a49
    Merge branch 'development' into curse-be-gone Nathan Curran 2021-04-13 11:03:41 +1000
  • 64a4e70c41
    Merge pull request #48 from AtlasMediaGroup/abhi-fix Paldiu 2021-04-12 16:45:13 -0500
  • 0c2f0a714c [+] Fix #replace() abhiram 2021-04-12 16:31:48 +0530
  • 4c67553bdd [+] Whitespace change! abhiram 2021-04-12 16:26:06 +0530
  • ffab5e3c12 [+] Allman style formating abhiram 2021-04-12 16:01:31 +0530
  • f7556a4861 [+] Remove redundant comments abhiram 2021-04-12 15:59:27 +0530
  • 385fc77771 [+] Done all the requested changes! abhiram 2021-04-12 15:44:51 +0530
  • b852ea1822 [+] Update my account in developers list abhiram 2021-04-12 14:44:27 +0530
  • 4a5a3a1a2d [+] Fix FS-191 abhiram 2021-04-12 13:57:58 +0530
  • c8f1c4d87f
    Merge branch 'development' into curse-be-gone Ryan 2021-04-11 22:16:40 +0100
  • 05e082641e
    Merge branch 'development' into development Ryan 2021-04-11 22:16:31 +0100
  • 968b966834
    Merge branch 'development' into FS-148 Ryan 2021-04-11 22:16:22 +0100
  • a624884416
    Merge branch 'development' into FS-97 Ryan 2021-04-11 22:16:13 +0100
  • 37762e5470
    Merge pull request #39 from AtlasMediaGroup/Elmon11-patch-2 Ryan 2021-04-11 22:15:26 +0100
  • 7d27df04d5 Curse be gone Video 2021-04-11 15:09:54 -0600
  • 85d90090c8
    Merge branch 'development' into Elmon11-patch-2 Ryan 2021-04-11 18:41:54 +0100
  • b920d898c4
    Merge branch 'development' into development Ryan 2021-04-11 18:37:01 +0100
  • 3d2feba5ca Configurable blacklists for tag, muted commands, and wildcard Video 2021-04-10 21:31:08 -0600
  • d94354937d Removes hubworld entriely Video 2021-04-10 20:31:39 -0600
  • 4f6e650f4f Three fixes Video 2021-04-10 20:07:15 -0600
  • 9b76c47df5
    Merge branch 'FS-97' of https://github.com/AtlasMediaGroup/TotalFreedomMod into FS-97 Nathan Curran 2021-04-10 22:17:44 +1000
  • 8800ca341f
    Fix Codacy error Nathan Curran 2021-04-10 22:17:31 +1000
  • 4bafcf572e
    Merge branch 'development' into FS-148 Ryan 2021-04-10 12:57:05 +0100
  • 807d3c960f
    Merge branch 'development' into FS-97 Ryan 2021-04-10 12:56:56 +0100
  • 09930c2d9a
    Merge pull request #43 from VideoGameSmash12/development Ryan 2021-04-10 12:56:32 +0100
  • 7ae1ab035a
    Merge branch 'development' into development Ryan 2021-04-10 12:50:52 +0100
  • 2bd1787663
    Updated supported versions for TFM. Ryan 2021-04-10 12:45:56 +0100
  • 83f83c3d96
    Merge branch 'development' into FS-148 Ryan 2021-04-10 12:40:25 +0100
  • 765b7dcc4b
    Merge branch 'development' into development Ryan 2021-04-10 12:39:47 +0100
  • 091381a076
    Merge pull request #44 from AtlasMediaGroup/FS-145 Ryan 2021-04-10 12:39:08 +0100
  • add8184222
    Display correct time Nathan Curran 2021-04-10 18:22:48 +1000
  • 4251c4a77c
    Configurable time and use FPlayer to mute players Nathan Curran 2021-04-10 18:00:02 +1000
  • 27dfd71b2e
    Update JDA version and location (FS-145) Nathan Curran 2021-04-09 21:20:33 +1000
  • f86d55e8ef
    Progress on FS-97 Nathan Curran 2021-04-09 20:53:12 +1000
  • 16e06bd932 Forgot I had this there Video 2021-04-07 19:45:03 -0600
  • a33c310757 Fucking shit Video 2021-04-07 19:41:13 -0600
  • df21bdfa7e Other bug fixes Video 2021-04-07 19:40:19 -0600
  • d7e2c0da42
    Merge branch 'development' into Elmon11-patch-2 Nathan Curran 2021-04-07 11:52:16 +1000
  • a7529b41fb Oops Video 2021-04-05 18:08:24 -0600
  • c4fce3f0f9 Right, so this change applies only to commands. For the sake of code consistency, I tried to change as many as possible to use FreedomCommand.msg instead of CommandSender.sendMessage for their messages. Here are a list of the files containing those changes: * Command_adminworld.java * Command_adventure.java * Command_banip.java * Command_blockedit.java * Command_blockpvp.java * Command_cage.java * Command_cartsit.java * Command_clearchat.java * Command_clearinventory.java * Command_commandlist.java * Command_creative.java * Command_deop.java * Command_deopall.java * Command_dispfill.java * Command_doom.java * Command_gcmd.java * Command_hubworld.java * Command_inspect.java * Command_list.java * Command_lockup.java * Command_manageshop.java * Command_manuallyverify.java * Command_masterbuilderworld.java * Command_mbconfig.java * Command_moblimiter.java * Command_mp44.java * Command_mute.java * Command_nickfilter.java * Command_op.java * Command_opall.java * Command_opme.java * Command_potion.java (Also corrected the inconsistent "player not found" message's color) * Command_rank.java * Command_ride.java * Command_saconfig.java * Command_scare.java * Command_setplayerlimit.java * Command_settotalvotes.java * Command_smite.java * Command_spectator.java * Command_survival.java * Command_unblockcmd.java * Command_uncage.java * Command_unmute.java * Command_verifynoadmin.java Video 2021-04-05 17:13:26 -0600
  • 27f5f18962
    FS-143 Resolution (#42) Ryan 2021-04-05 22:11:12 +0100
  • 2e229d8e16
    Merge branch 'development' into FS-143 Ryan 2021-04-05 01:12:13 +0100
  • d1f7060214
    Fixes FS-143 Ryan Wild 2021-04-05 00:48:10 +0100
  • a0e085002f
    Bump to patch version. Ryan Wild 2021-04-04 23:47:21 +0100
  • d5a26a35bb
    Merge branch 'development' into FS-148 Ryan 2021-04-04 23:10:06 +0100
  • dca5e30291
    Actually display assistant exec in game (#37) Elmon11 2021-04-04 14:24:06 +0200
  • 61fd5d55ce
    Fixed JSON version of online Nathan Curran 2021-04-03 12:07:20 +1100
  • 2f079b55ba
    Vanished admins are no longer being counted (FS-148) Nathan Curran 2021-04-03 12:00:39 +1100
  • 7ce9bb025d
    Merge branch 'development' into Elmon11-patch-1 Nathan Curran 2021-04-03 11:54:50 +1100
  • 09a435053e
    Merge pull request #40 from AtlasMediaGroup/phoenix-patch-1 TFTWPhoenix 2021-03-31 17:12:56 -0500
  • 14309275fb
    Remove /premium TFTWPhoenix 2021-03-31 15:16:01 -0500
  • 9904fe1a07
    Merge branch 'development' into Elmon11-patch-1 Nathan Curran 2021-03-30 10:34:53 +1100
  • 2375e92d90
    Merge pull request #36 from AtlasMediaGroup/tfm-bugfix-001 Ryan 2021-03-26 15:43:22 +0000
  • 97672c2fff Update DiscordToAdminChatListener.java Paldiu 2021-03-22 09:57:09 -0500
  • 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
  • b9d7e28964
    Update FUtil.java Elmon11 2021-03-21 18:20:03 +0100
  • b7ff7e0e8c
    Update ConfigEntry.java Elmon11 2021-03-21 15:09:47 +0100
  • 4d35789ab0
    Update RankManager.java Elmon11 2021-03-21 15:09:19 +0100
  • dc10c40578
    noclear option in smite Elmon11 2021-03-21 13:57:24 +0100
  • be61b2c942
    Merge branch 'development' into Elmon11-patch-1 Elmon11 2021-03-21 13:44:51 +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
  • eb12649dee
    Actually display assistant exec in game Elmon11 2021-03-20 20:51:12 +0100
  • 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