AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2026-07-15 18:15:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,455 Commits 38 Branches 58 Tags
merge-branch-between-main-and-dev
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
VideoandPaul Reilly fa1b6dde4c Go fuck yourself Codacy 
Codacy complained about me forgetting a "default" case in my rewrite of /moblimiter, so I have to do this shit.
 2023-07-11 12:06:59 -05:00
VideoandPaul Reilly 6a5b5c241e A few more changes 
- Cleans up /potion a tiny bit
- Rewrites part of /moblimiter
- Resolves FS-346 by cleaning up /setlever
- Modernizes /opall a bit
- Changes more components to use Adventure
 2023-07-11 12:06:59 -05:00
VideoandPaul Reilly cec506f148 Too much shit to list in the commit name 
- Removes ancient unused code
- General code cleanup in some places
- Rewrites a few components to use Adventure (testing needed)
- Rewrites a few commands to use more modern Java features like Streams
- Fixes oversight where vanishing still worked by names and not UUIDs
- Removes unused Pterodactyl integration
- Removes AutoEject's IP range banning functionality
- Does some minor cleanup to HTTPD's list & players modules
- Fixes ages-old bug in the AntiSpam that caused it to falsely mute players
 2023-07-11 12:06:59 -05:00
VideoandPaul Reilly 88eceab480 Codacy is incredibly picky and I hope it burns in hell 2023-07-11 12:06:58 -05:00
VideoandPaul Reilly df756d43ef Completely rewrites the Block Inspector, fixes bug in BukkitTelnetBridge caused when Essentials is not installed 2023-07-11 12:06:58 -05:00
VideoandPaul Reilly 91c4153037 Resolves FS-464 
Banners had a cap in them to mitigate the effects of chunk bans back in like 2019. This removes that ancient broken cap.
 2023-07-11 12:06:58 -05:00
VideoandPaul Reilly c5f0886df6 Resolves FS-339 by aggressively rewriting /list and removing ancient unused code 2023-07-11 12:06:58 -05:00
VideoandPaul Reilly ca990bc526 Resolves FS-321 by aggressively rewriting /plugincontrol 2023-07-11 12:06:58 -05:00
VideoandPaul Reilly 546827cd5a Resolves FS-320 and fixes FS-471 2023-07-11 12:06:57 -05:00
VideoandPaul Reilly e7e08c060e Attempts to resolve FS-311 and mitigates FS-396 2023-07-11 12:06:57 -05:00
VideoandPaul Reilly eb6a91323d Resolves FS-322 2023-07-11 12:06:57 -05:00
VideoandPaul Reilly 2fbd7578ab Resolves FS-331 2023-07-11 12:06:57 -05:00
VideoandPaul Reilly 75cd1864f6 God fucking dammit 2023-07-11 12:06:57 -05:00
VideoandPaul Reilly a420339017 Resolves FS-348 2023-07-11 12:06:57 -05:00
VideoandPaul Reilly 2b5ea048cc Resolves FS-340 and improves some surrounding code a bit 2023-07-11 12:06:57 -05:00
VideoandPaul Reilly 20f341ea45 Resolves FS-338 2023-07-11 12:06:57 -05:00
VideoandPaul Reilly eadbc504e5 Resolves FS-337 2023-07-11 12:06:57 -05:00
VideoandPaul Reilly 760ab3c622 Resolves FS-333 2023-07-11 12:06:56 -05:00
VideoandPaul Reilly b804459dcc Resolves FS-325 2023-07-11 12:06:56 -05:00
VideoandPaul Reilly 63f805935f Resolves FS-341 2023-07-11 12:06:56 -05:00
VideoandPaul Reilly 1937a3d4de Resolves FS-318 by rewriting the /mute command 
This has the fortunate side-effect of also fixing several bugs present in the original command.
 2023-07-11 12:06:56 -05:00
VideoandPaul Reilly 36663385ab Resolves FS-316 by aggressively rewriting /blockedit 
Disclaimer: I did this whilst sleep deprvied.
I didn't know how the fuck NPath is calculated so to play it safe I aggressively rewrote the command. I also took the opportunity to make some of the command's messages more consistent with eachother (using restrict/restore instead of block/unblock).
 2023-07-11 12:06:56 -05:00
VideoandPaul Reilly 5d4085ab07 Fixes FS-323 by rewriting ride modes to make sense 2023-07-11 12:06:53 -05:00
VideoandPaul Reilly 0686419ce3 Fixes FS-349 2023-07-11 12:06:53 -05:00
VideoandPaul Reilly 9998392b1a Fixes FS-343 2023-07-11 12:06:53 -05:00
VideoandPaul Reilly 2d918fe17b Removes /nh and code associated with it (except this time its based on the right branch) 2023-07-11 12:06:53 -05:00
VideoPaul ReillyAllinkRyan
 		6cc9b26661 Removes TFGuilds integration (#264) 
TFGuilds was shitcanned the other day (good riddence), so there's no point in bridging it anymore.

Co-authored-by: Allink <[email protected]>
Co-authored-by: Ryan <[email protected]>
 2023-07-11 12:06:52 -05:00
VideoandGitHub 41923b29d7 Merge pull request #301 from AtlasMediaGroup/ver/1.19.3 
Update to 1.19.4
 2023-07-01 16:28:08 -06:00
Video 41331e719d Updates version to 2022.06.1 2023-03-08 19:58:14 -07:00
VideoandGitHub 72c83ba84a Merge pull request #306 from AtlasMediaGroup/critical-exploit-fix 
Patches critical exploit in the command blocker
 2023-03-08 19:53:51 -07:00
Video 3deaaafb88 Patches critical exploit 2023-03-08 19:52:30 -07:00
Video b3e1a8b528 Aggressive debloat 
- Removes unused Logviewer functionality
- Removes several unused bits of code from FPlayer
- Changes the build configuration to not shade in org.apache.commons:commons-lang3, commons-io.commons-io,
  jetbrains.annotation, and org.javassist:javassist, opting instead to load them in on runtime using a
  little-known Spigot trick
 2022-11-21 07:09:59 -07:00
Video 99a5897d44 Go fuck yourself Codacy 
Codacy complained about me forgetting a "default" case in my rewrite of /moblimiter, so I have to do this shit.
 2022-11-20 23:02:00 -07:00
Video 9064f4b1f2 A few more changes 
- Cleans up /potion a tiny bit
- Rewrites part of /moblimiter
- Resolves FS-346 by cleaning up /setlever
- Modernizes /opall a bit
- Changes more components to use Adventure
 2022-11-20 22:57:31 -07:00
Video 2698cbf46d Too much shit to list in the commit name 
- Removes ancient unused code
- General code cleanup in some places
- Rewrites a few components to use Adventure (testing needed)
- Rewrites a few commands to use more modern Java features like Streams
- Fixes oversight where vanishing still worked by names and not UUIDs
- Removes unused Pterodactyl integration
- Removes AutoEject's IP range banning functionality
- Does some minor cleanup to HTTPD's list & players modules
- Fixes ages-old bug in the AntiSpam that caused it to falsely mute players
 2022-11-17 01:34:45 -07:00
VideoandGitHub d3b4feaec9 Merge branch 'development' into fs24 2022-11-16 03:04:35 -07:00
Video c9adb0c5a8 Codacy is incredibly picky and I hope it burns in hell 2022-11-16 03:01:51 -07:00
Video cb642eba08 Completely rewrites the Block Inspector, fixes bug in BukkitTelnetBridge caused when Essentials is not installed 2022-11-15 21:32:21 -07:00
Video 69a06167a1 Resolves FS-464 
Banners had a cap in them to mitigate the effects of chunk bans back in like 2019. This removes that ancient broken cap.
 2022-11-14 11:41:38 -07:00
Video 550ff492ee Resolves FS-339 by aggressively rewriting /list and removing ancient unused code 2022-11-14 10:54:59 -07:00
Video 88914632f5 Resolves FS-321 by aggressively rewriting /plugincontrol 2022-11-14 00:38:42 -07:00
Video 47445933f3 Resolves FS-320 and fixes FS-471 2022-11-13 23:20:46 -07:00
Video 94d6f0a872 Attempts to resolve FS-311 and mitigates FS-396 2022-11-13 20:53:50 -07:00
Video 3d67c83ea4 Resolves FS-322 2022-11-13 07:01:30 -07:00
Video 22161b2e90 Resolves FS-331 2022-11-13 06:55:17 -07:00
Video b1f08c3b7f God fucking dammit 2022-11-13 06:49:32 -07:00
Video 466745d51f Resolves FS-348 2022-11-13 06:46:48 -07:00
Video 98921b975f Resolves FS-340 and improves some surrounding code a bit 2022-11-13 06:44:56 -07:00
Video 35d53ece4e Resolves FS-338 2022-11-13 06:40:36 -07:00
Video 33146fa161 Resolves FS-337 2022-11-13 06:35:44 -07:00
Video d7fddc3765 Resolves FS-333 2022-11-13 06:31:45 -07:00
Video f4cb736c17 Resolves FS-325 2022-11-13 06:28:53 -07:00
Video 3763e0728d Resolves FS-341 2022-11-13 06:25:56 -07:00
Video af18299613 Resolves FS-318 by rewriting the /mute command 
This has the fortunate side-effect of also fixing several bugs present in the original command.
 2022-11-13 06:19:10 -07:00
Video f0d6549eec Resolves FS-316 by aggressively rewriting /blockedit 
Disclaimer: I did this whilst sleep deprvied.
I didn't know how the fuck NPath is calculated so to play it safe I aggressively rewrote the command. I also took the opportunity to make some of the command's messages more consistent with eachother (using restrict/restore instead of block/unblock).
 2022-11-13 04:49:58 -07:00
Video 3b61ba408f Fixes FS-314 2022-11-04 22:58:36 -06:00
Video af710edc88 Fixes FS-323 by rewriting ride modes to make sense 2022-11-04 22:26:19 -06:00
Video 459a11e638 Fixes FS-349 2022-11-04 21:32:23 -06:00
Video 2e41414358 Fixes FS-343 2022-11-04 21:30:28 -06:00
VideoandGitHub a2133369d2 Merge pull request #276 from AtlasMediaGroup/FS-460-remove-sit-command-from-tfm 
[FS-460] Remove /sit command
 2022-10-17 11:32:36 -06:00
VideoandGitHub 48728c9524 Merge branch 'development' into FS-460-remove-sit-command-from-tfm 2022-10-17 09:51:09 -06:00
VideoandGitHub d343bbc3d7 Merge pull request #268 from AtlasMediaGroup/FS-452-not-fucked 
Removes /nh and code associated with it
 2022-10-16 20:14:26 -06:00
VideoGitHubAllinkRyan
 		7fb4a477dc Removes TFGuilds integration (#264) 
TFGuilds was shitcanned the other day (good riddence), so there's no point in bridging it anymore.

Co-authored-by: Allink <[email protected]>
Co-authored-by: Ryan <[email protected]>
 2022-10-12 21:36:49 +01:00
Video 51cc527697 Removes /nh and code associated with it (except this time its based on the right branch) 2022-09-14 19:24:58 -06:00
VideoandGitHub ae5038ef0f Uplifts pom version to release 2022-09-13 21:54:42 -06:00
Video ec5aa0304e Uplifts version 2022-09-12 21:42:04 -06:00
Video 1eaaf5fcdb Fixes bug where the whitelist wasn't working 2022-09-11 22:10:57 -06:00
Video 42458084d7 Untitled bugfix 2022-09-11 16:47:12 -06:00
Video 0cd2886e40 Fixes oversight where not having Essentials installed causes Discord reporting to fail 2022-09-11 16:14:31 -06:00
Video 575568cb05 Fixes severe bug where changes to player data wouldn't save 2022-09-11 15:33:05 -06:00
Video 26be5d0f44 Fixes bug where adminchat messages were duplicated when sent from in-game 
Yet another bug discovered during testing before the release was to be cut
 2022-09-11 12:47:58 -06:00
Video 7a724c2f13 Fixes bug that prevented /saconfig add from working properly 
This popped up during testing right before RC2 was intended to be cut.
 2022-09-11 12:12:36 -06:00
Video 9e1aa5d34e Uplifts version to 2022.06-RC2 2022-09-11 11:36:21 -06:00
Video 4564ad0449 Fix SAConfig NPE (originally by Allink) 2022-09-11 11:34:16 -06:00
VideoandGitHub 1ddeb4b621 Merge pull request #263 from AtlasMediaGroup/FS-450 
Fixes several bugs caused by potential issues in TFM's admin loading system (FS-450)
 2022-09-11 11:30:37 -06:00
VideoandGitHub a8665a15d4 Merge pull request #262 from AtlasMediaGroup/FS-449 
Stabilization Part 4 - The Lost Episode (Remastered) [FS-449]
 2022-09-11 11:30:21 -06:00
Video c0f3712c8d Fixes several bugs caused by any potential issues in TFM's admin loading system 2022-09-11 06:35:32 -06:00
Video 0dd7bc06eb FS-449 2022-09-11 06:04:01 -06:00
VideoandGitHub 78654eb5e8 Merge pull request #222 from AtlasMediaGroup/stabilization 
Stabilization
 2022-05-01 05:39:48 -06:00
VideoandGitHub adbe125283 increments version 2022-04-20 17:03:13 -06:00
VideoandGitHub d71d8edf53 Merge branch 'development' into stabilization 2022-04-15 08:09:05 -06:00
Video 6af9f240f4 Stage 3 of IP -> UUID migration: completely removing the verification system 2022-04-15 07:52:06 -06:00
Video 05745c4210 Stage 2 of IP -> UUID migration: changing the admin list to use UUIDs 2022-04-15 07:09:23 -06:00
Video 98388d0d23 Stage 1 of IP -> UUID migration: changing player data to use UUIDs instead 2022-04-15 06:27:32 -06:00
VideoandGitHub 1da87eeb37 Merge pull request #217 from AtlasMediaGroup/dependabot/maven/development/net.coreprotect-coreprotect-21.2 
Bump coreprotect from 20.4 to 21.2
 2022-04-15 05:44:33 -06:00
Video b656925e4f Fixes two bugs related to commands 
- Fixes commands not showing up in their own dedicated section in /help
- Fixes duplicate/disorganized commands in the HTTPD help page by overhauling it
 2022-04-15 05:28:32 -06:00
Video d4f44e988c Additional future-proofing 2022-04-15 05:08:11 -06:00
Video c39c632a67 Removes useless code 2022-04-15 05:03:41 -06:00
Video adcccb10e5 Removes dependency on NMS 2022-03-25 14:45:32 -06:00
VideoandGitHub f9eabf27d5 Merge pull request #205 from AtlasMediaGroup/fs-442 
FS-442
 2022-03-06 16:15:53 -07:00
VideoandRyan 846154a723 will this work 2022-03-06 14:37:45 +00:00
Video 004a0f3d7c Update Groups.java 
This should resolve the issues with spawn eggs and mobs.
 2022-02-21 17:04:53 -07:00
Video cf5199f28e Squashed commit of the following: 
commit 43c68579e5
Merge: 2618d97a b711ed51
Author: elmon <[email protected]>
Date:   Mon Feb 21 10:01:39 2022 +0100

    Merge pull request #190 from AtlasMediaGroup/Elmon11-patch-2

    order of messages fix

commit b711ed517f
Merge: 1c464729 2618d97a
Author: elmon <[email protected]>
Date:   Mon Jan 24 22:16:24 2022 +0100

    Merge branch 'development' into Elmon11-patch-2

commit 2618d97a3e
Author: Nathan Curran <[email protected]>
Date:   Mon Jan 24 12:42:47 2022 +1100

    Remove requireNonNull method from getIp, which causes NPE - resolves FS-429 (#187)

    Co-authored-by: Paldiu <[email protected]>

commit 1c4647290a
Merge: f00f67a8 850f1210
Author: Nathan Curran <[email protected]>
Date:   Mon Jan 24 12:41:47 2022 +1100

    Merge branch 'development' into Elmon11-patch-2

commit f00f67a844
Author: elmon <[email protected]>
Date:   Sun Jan 23 13:26:22 2022 +0100

    order of messages fix

    https://media.discordapp.net/attachments/874713176082636882/934559012991680532/unknown.png

commit 850f12103c
Merge: 2eb0ab4c 7fd77f3c
Author: Paldiu <[email protected]>
Date:   Mon Jan 17 11:35:09 2022 -0600

    Merge pull request #188 from AtlasMediaGroup/Wild1145-patch-1

    Correct CoreProtect Version

commit 7fd77f3cbb
Author: Ryan <[email protected]>
Date:   Sun Jan 16 18:22:16 2022 +0000

    Correct CoreProtect Version

    To align with the version running on Freedom-01 at the moment.

commit 2eb0ab4cb1
Merge: 8cff0124 2612aaec
Author: Video <[email protected]>
Date:   Wed Dec 22 20:56:46 2021 -0700

    Merge pull request #179 from AtlasMediaGroup/FS-212

    Makes spawnmob configurable, increases the default limit to 25 (FS-212)

commit 2612aaec31
Author: Video <[email protected]>
Date:   Wed Dec 15 21:46:56 2021 -0700

    Makes spawnmob configurable and increases the default limit to 25

commit 8cff0124ea
Merge: 35965b0b 1162f10e
Author: Video <[email protected]>
Date:   Mon Nov 29 06:36:20 2021 -0700

    Merge pull request #93 from AtlasMediaGroup/FS-37

    Fixes FS-37

commit 1162f10ebb
Merge: 7ce173e0 35965b0b
Author: Video <[email protected]>
Date:   Mon Nov 29 06:31:18 2021 -0700

    Merge branch 'development' into FS-37

commit 35965b0b10
Merge: aa20a6e5 1253732f
Author: Video <[email protected]>
Date:   Mon Nov 29 06:31:11 2021 -0700

    Merge pull request #174 from AtlasMediaGroup/FS-256

    Forces the server to recalculate the permissions server-wide in /opall (FS-256)

commit 1253732f77
Merge: e1bee321 aa20a6e5
Author: Video <[email protected]>
Date:   Mon Nov 29 06:25:25 2021 -0700

    Merge branch 'development' into FS-256

commit 7ce173e02b
Merge: 4d006ed1 aa20a6e5
Author: Video <[email protected]>
Date:   Mon Nov 29 06:24:34 2021 -0700

    Merge branch 'development' into FS-37

commit aa20a6e579
Merge: 70622900 1ecfb0b0
Author: Video <[email protected]>
Date:   Mon Nov 29 06:23:57 2021 -0700

    Merge pull request #129 from AtlasMediaGroup/FS-7

    Allow players to pay other players coins [FS-7]

commit e1bee32163
Author: Video <[email protected]>
Date:   Mon Nov 29 03:27:07 2021 -0700

    Forces the server to recalculate the permissions server-wide in /opall

commit 4d006ed172
Merge: 8cbfde8b 70622900
Author: Video <[email protected]>
Date:   Mon Nov 29 03:04:42 2021 -0700

    Merge branch 'development' into FS-37

commit 1ecfb0b066
Merge: 225ade87 70622900
Author: Video <[email protected]>
Date:   Mon Nov 29 03:01:22 2021 -0700

    Merge branch 'development' into FS-7

commit 706229004c
Merge: a42cb6af a4adfa9b
Author: Video <[email protected]>
Date:   Mon Nov 29 03:00:15 2021 -0700

    Merge pull request #131 from AtlasMediaGroup/FS-273

    Moves /rainbowtrail to the shop (FS-273)

commit a4adfa9bee
Merge: 1b5bbd1c a42cb6af
Author: Video <[email protected]>
Date:   Mon Nov 29 02:46:41 2021 -0700

    Merge branch 'development' into FS-273

commit 225ade8753
Merge: afe755f5 a42cb6af
Author: Video <[email protected]>
Date:   Mon Nov 29 02:46:02 2021 -0700

    Merge branch 'development' into FS-7

commit 8cbfde8bbc
Merge: bba5ec92 a42cb6af
Author: Video <[email protected]>
Date:   Mon Nov 29 02:41:49 2021 -0700

    Merge branch 'development' into FS-37

commit a42cb6aff9
Merge: 2ecfb886 01fdf766
Author: Video <[email protected]>
Date:   Mon Nov 29 02:41:34 2021 -0700

    Merge pull request #125 from AtlasMediaGroup/shitcan-savedflags

    Shitcans SavedFlags

commit 01fdf766ee
Merge: 58c21bb1 2ecfb886
Author: Video <[email protected]>
Date:   Tue Nov 23 09:28:48 2021 -0700

    Merge branch 'development' into shitcan-savedflags

commit afe755f5c1
Merge: 5f97e68e 2ecfb886
Author: Video <[email protected]>
Date:   Tue Nov 23 09:26:59 2021 -0700

    Merge branch 'development' into FS-7

commit 5f97e68e0e
Author: Video <[email protected]>
Date:   Tue Nov 23 09:26:49 2021 -0700

    fuck it, it works

commit 1b5bbd1c05
Merge: 8356e831 2ecfb886
Author: Video <[email protected]>
Date:   Tue Nov 23 09:16:21 2021 -0700

    Merge branch 'development' into FS-273

commit 2ecfb88604
Merge: 42143c11 bb2ddf11
Author: Video <[email protected]>
Date:   Tue Nov 23 09:15:16 2021 -0700

    Merge pull request #130 from AtlasMediaGroup/FS-215

    Makes [Discord] a hyperlink (FS-215)

commit 8356e831a5
Author: Video <[email protected]>
Date:   Tue Nov 23 09:11:16 2021 -0700

    Redundancy fix and better protection system

commit ab00cb840f
Merge: ecce62f6 42143c11
Author: Video <[email protected]>
Date:   Tue Nov 23 03:31:45 2021 -0700

    Merge branch 'development' into FS-273

commit bb2ddf1129
Merge: cf9fdc6f 42143c11
Author: Video <[email protected]>
Date:   Tue Nov 23 03:31:19 2021 -0700

    Merge branch 'development' into FS-215

commit bba5ec922b
Merge: 68adaed9 42143c11
Author: Video <[email protected]>
Date:   Tue Nov 23 03:31:13 2021 -0700

    Merge branch 'development' into FS-37

commit 58c21bb1aa
Merge: fdba119d 42143c11
Author: Video <[email protected]>
Date:   Tue Nov 23 03:30:48 2021 -0700

    Merge branch 'development' into shitcan-savedflags

commit 68adaed997
Merge: 087b8dd7 a598c933
Author: Video <[email protected]>
Date:   Sat Oct 9 00:09:24 2021 -0600

    Merge branch 'development' into FS-37

commit ecce62f6b4
Merge: d8148530 a598c933
Author: Video <[email protected]>
Date:   Sat Oct 9 00:01:22 2021 -0600

    Merge branch 'development' into FS-273

commit cf9fdc6fe4
Merge: 387ea6f7 a598c933
Author: Video <[email protected]>
Date:   Fri Oct 8 01:43:33 2021 -0600

    Merge branch 'development' into FS-215

commit 387ea6f71e
Merge: a1ecf881 180cd811
Author: Video <[email protected]>
Date:   Fri Oct 1 00:35:12 2021 -0600

    Merge branch 'development' into FS-215

commit d814853036
Merge: 47e63869 213a4338
Author: Ryan <[email protected]>
Date:   Sun Sep 12 13:49:05 2021 +0100

    Merge branch 'development' into FS-273

commit a1ecf88109
Merge: bd647afe 213a4338
Author: Ryan <[email protected]>
Date:   Sun Sep 12 13:48:59 2021 +0100

    Merge branch 'development' into FS-215

commit 5a6a5ff75d
Merge: 6ca61d9c 213a4338
Author: Ryan <[email protected]>
Date:   Sun Sep 12 13:48:50 2021 +0100

    Merge branch 'development' into FS-7

commit fdba119d5d
Merge: 61857dd0 213a4338
Author: Ryan <[email protected]>
Date:   Sun Sep 12 13:48:44 2021 +0100

    Merge branch 'development' into shitcan-savedflags

commit 087b8dd7ea
Merge: 3818aab4 213a4338
Author: Ryan <[email protected]>
Date:   Sun Sep 12 13:48:21 2021 +0100

    Merge branch 'development' into FS-37

commit 3818aab454
Merge: caeda219 0e12f5e7
Author: Video <[email protected]>
Date:   Sun Sep 12 03:04:08 2021 -0600

    Merge branch 'development' into FS-37

commit 61857dd06f
Merge: 2d18d461 0e12f5e7
Author: Video <[email protected]>
Date:   Sun Sep 12 03:01:37 2021 -0600

    Merge branch 'development' into shitcan-savedflags

commit bd647afe92
Merge: 69f17ef2 0e12f5e7
Author: Video <[email protected]>
Date:   Sun Sep 12 02:50:39 2021 -0600

    Merge branch 'development' into FS-215

commit 69f17ef2d7
Merge: ee1b27fa aebe1ace
Author: Video <[email protected]>
Date:   Sun Sep 12 02:01:56 2021 -0600

    Merge branch 'development' into FS-215

commit caeda219fa
Merge: 3ca98352 0a9b95bf
Author: Ryan <[email protected]>
Date:   Sat Sep 11 15:26:37 2021 +0100

    Merge branch 'development' into FS-37

commit ee1b27fa0d
Merge: 2bdf14f3 0a9b95bf
Author: Ryan <[email protected]>
Date:   Sat Sep 11 01:24:00 2021 +0100

    Merge branch 'development' into FS-215

commit 6ca61d9c6c
Merge: fedf80b8 0a9b95bf
Author: Ryan <[email protected]>
Date:   Sat Sep 11 01:23:52 2021 +0100

    Merge branch 'development' into FS-7

commit 2d18d461fe
Merge: a4c81f20 0a9b95bf
Author: Ryan <[email protected]>
Date:   Sat Sep 11 01:23:44 2021 +0100

    Merge branch 'development' into shitcan-savedflags

commit 47e6386907
Merge: b1062fbb 0a9b95bf
Author: Ryan <[email protected]>
Date:   Sat Sep 11 01:23:13 2021 +0100

    Merge branch 'development' into FS-273

commit fedf80b834
Merge: a2d11d4b 44ff621d
Author: Video <[email protected]>
Date:   Fri Sep 10 01:39:16 2021 -0600

    Merge branch 'development' into FS-7

commit 2bdf14f38c
Merge: f6d46b61 44ff621d
Author: Video <[email protected]>
Date:   Mon Sep 6 15:26:13 2021 -0600

    Merge branch 'development' into FS-215

commit b1062fbb6c
Merge: f69feed4 44ff621d
Author: Video <[email protected]>
Date:   Mon Sep 6 14:39:32 2021 -0600

    Merge branch 'development' into FS-273

commit 3ca9835257
Merge: da82b270 54cb0cfa
Author: Video <[email protected]>
Date:   Mon Sep 6 01:16:04 2021 -0600

    Merge branch 'development' into FS-37

commit f69feed469
Author: Video <[email protected]>
Date:   Mon Sep 6 01:14:21 2021 -0600

    fixed

commit 8253f94ac4
Merge: daf0126f 54cb0cfa
Author: Video <[email protected]>
Date:   Mon Sep 6 01:12:00 2021 -0600

    Merge branch 'development' into FS-273

commit a4c81f202c
Merge: 0d09c3a5 23caa4e8
Author: Ryan <[email protected]>
Date:   Sat Sep 4 01:23:06 2021 +0100

    Merge branch 'development' into shitcan-savedflags

commit da82b27016
Merge: af1df228 23caa4e8
Author: Ryan <[email protected]>
Date:   Sat Sep 4 01:07:55 2021 +0100

    Merge branch 'development' into FS-37

commit daf0126f45
Merge: a51f5c9b 23caa4e8
Author: Ryan <[email protected]>
Date:   Sat Sep 4 01:07:39 2021 +0100

    Merge branch 'development' into FS-273

commit f6d46b6178
Merge: ee804d52 23caa4e8
Author: Ryan <[email protected]>
Date:   Sat Sep 4 01:07:33 2021 +0100

    Merge branch 'development' into FS-215

commit a2d11d4b93
Merge: dc490659 23caa4e8
Author: Ryan <[email protected]>
Date:   Sat Sep 4 01:07:28 2021 +0100

    Merge branch 'development' into FS-7

commit a51f5c9bbf
Author: Video <[email protected]>
Date:   Fri Sep 3 13:53:33 2021 -0600

    FS-273

commit ee804d52ff
Author: Video <[email protected]>
Date:   Fri Sep 3 12:52:15 2021 -0600

    Makes [Discord] a hyperlink (FS-215)

    I've decided to overhaul the implementation of DiscordToMinecraftListener to make it more easily workable. This overhaul allows me to implement FS-215 more easily.

commit dc490659c1
Author: Video <[email protected]>
Date:   Fri Sep 3 00:07:20 2021 -0600

    Begins implementing FS-7

    should be good enough, but feedback would be lovely

commit 0d09c3a550
Merge: e2ccd14e 4c3f188b
Author: Ryan <[email protected]>
Date:   Sun Aug 29 20:09:03 2021 +0100

    Merge branch 'development' into shitcan-savedflags

commit e2ccd14eb3
Author: Video <[email protected]>
Date:   Fri Aug 27 16:54:55 2021 -0600

    Unsaves SavedFlags

commit af1df22812
Merge: 1474a808 f380898b
Author: Video <[email protected]>
Date:   Thu Aug 26 23:05:58 2021 -0600

    Merge branch 'development' into FS-37

commit 1474a80875
Merge: 77fd4ff6 f45466ee
Author: Ryan <[email protected]>
Date:   Thu Aug 26 13:26:44 2021 +0100

    Merge branch 'development' into FS-37

commit 77fd4ff66a
Merge: 33aca2a4 d901cbaa
Author: Ryan <[email protected]>
Date:   Sat Aug 21 21:34:04 2021 +0100

    Merge branch 'development' into FS-37

commit 33aca2a482
Merge: 159eda73 0582c2e5
Author: Video <[email protected]>
Date:   Tue Aug 10 22:38:51 2021 -0600

    Merge branch 'development' into FS-37

commit 159eda73a1
Merge: da2d2525 6874b2ce
Author: Ryan <[email protected]>
Date:   Tue Aug 10 17:34:12 2021 +0100

    Merge branch 'development' into FS-37

commit da2d25252b
Merge: e99aaa2e c8a4382a
Author: Ryan <[email protected]>
Date:   Tue Aug 10 17:31:13 2021 +0100

    Merge branch 'development' into FS-37

commit e99aaa2eb4
Author: Video <[email protected]>
Date:   Thu Aug 5 00:32:23 2021 -0600

    Fixes FS-37

    Fixes an oversight introduced in https://github.com/AtlasMediaGroup/TotalFreedomMod/commit/76bb2d08acb9a56a845377e2106a8f7e2d8a0750 in which the configuration is loaded twice.
 2022-02-21 16:45:03 -07:00
VideoandGitHub 2eb0ab4cb1 Merge pull request #179 from AtlasMediaGroup/FS-212 
Makes spawnmob configurable, increases the default limit to 25 (FS-212)
 2021-12-22 20:56:46 -07:00
Video 2612aaec31 Makes spawnmob configurable and increases the default limit to 25 2021-12-15 21:46:56 -07:00
Video 6e7ad73152 Nevermind that didn't work 2021-11-29 07:03:29 -07:00
Video af6411b82c Wait a second 
This *should* work...
 2021-11-29 06:54:04 -07:00
Video e9ba958a4e Squashed commit of the following: 
commit 35965b0b10
Merge: aa20a6e5 1253732f
Author: Video <[email protected]>
Date:   Mon Nov 29 06:31:11 2021 -0700

    Merge pull request #174 from AtlasMediaGroup/FS-256

    Forces the server to recalculate the permissions server-wide in /opall (FS-256)

commit 1253732f77
Merge: e1bee321 aa20a6e5
Author: Video <[email protected]>
Date:   Mon Nov 29 06:25:25 2021 -0700

    Merge branch 'development' into FS-256

commit aa20a6e579
Merge: 70622900 1ecfb0b0
Author: Video <[email protected]>
Date:   Mon Nov 29 06:23:57 2021 -0700

    Merge pull request #129 from AtlasMediaGroup/FS-7

    Allow players to pay other players coins [FS-7]

commit e1bee32163
Author: Video <[email protected]>
Date:   Mon Nov 29 03:27:07 2021 -0700

    Forces the server to recalculate the permissions server-wide in /opall

commit 1ecfb0b066
Merge: 225ade87 70622900
Author: Video <[email protected]>
Date:   Mon Nov 29 03:01:22 2021 -0700

    Merge branch 'development' into FS-7

commit 706229004c
Merge: a42cb6af a4adfa9b
Author: Video <[email protected]>
Date:   Mon Nov 29 03:00:15 2021 -0700

    Merge pull request #131 from AtlasMediaGroup/FS-273

    Moves /rainbowtrail to the shop (FS-273)

commit a4adfa9bee
Merge: 1b5bbd1c a42cb6af
Author: Video <[email protected]>
Date:   Mon Nov 29 02:46:41 2021 -0700

    Merge branch 'development' into FS-273

commit 225ade8753
Merge: afe755f5 a42cb6af
Author: Video <[email protected]>
Date:   Mon Nov 29 02:46:02 2021 -0700

    Merge branch 'development' into FS-7

commit a42cb6aff9
Merge: 2ecfb886 01fdf766
Author: Video <[email protected]>
Date:   Mon Nov 29 02:41:34 2021 -0700

    Merge pull request #125 from AtlasMediaGroup/shitcan-savedflags

    Shitcans SavedFlags

commit 01fdf766ee
Merge: 58c21bb1 2ecfb886
Author: Video <[email protected]>
Date:   Tue Nov 23 09:28:48 2021 -0700

    Merge branch 'development' into shitcan-savedflags

commit afe755f5c1
Merge: 5f97e68e 2ecfb886
Author: Video <[email protected]>
Date:   Tue Nov 23 09:26:59 2021 -0700

    Merge branch 'development' into FS-7

commit 5f97e68e0e
Author: Video <[email protected]>
Date:   Tue Nov 23 09:26:49 2021 -0700

    fuck it, it works

commit 1b5bbd1c05
Merge: 8356e831 2ecfb886
Author: Video <[email protected]>
Date:   Tue Nov 23 09:16:21 2021 -0700

    Merge branch 'development' into FS-273

commit 2ecfb88604
Merge: 42143c11 bb2ddf11
Author: Video <[email protected]>
Date:   Tue Nov 23 09:15:16 2021 -0700

    Merge pull request #130 from AtlasMediaGroup/FS-215

    Makes [Discord] a hyperlink (FS-215)

commit 8356e831a5
Author: Video <[email protected]>
Date:   Tue Nov 23 09:11:16 2021 -0700

    Redundancy fix and better protection system

commit ab00cb840f
Merge: ecce62f6 42143c11
Author: Video <[email protected]>
Date:   Tue Nov 23 03:31:45 2021 -0700

    Merge branch 'development' into FS-273

commit bb2ddf1129
Merge: cf9fdc6f 42143c11
Author: Video <[email protected]>
Date:   Tue Nov 23 03:31:19 2021 -0700

    Merge branch 'development' into FS-215

commit 58c21bb1aa
Merge: fdba119d 42143c11
Author: Video <[email protected]>
Date:   Tue Nov 23 03:30:48 2021 -0700

    Merge branch 'development' into shitcan-savedflags

commit ecce62f6b4
Merge: d8148530 a598c933
Author: Video <[email protected]>
Date:   Sat Oct 9 00:01:22 2021 -0600

    Merge branch 'development' into FS-273

commit cf9fdc6fe4
Merge: 387ea6f7 a598c933
Author: Video <[email protected]>
Date:   Fri Oct 8 01:43:33 2021 -0600

    Merge branch 'development' into FS-215

commit 387ea6f71e
Merge: a1ecf881 180cd811
Author: Video <[email protected]>
Date:   Fri Oct 1 00:35:12 2021 -0600

    Merge branch 'development' into FS-215

commit d814853036
Merge: 47e63869 213a4338
Author: Ryan <[email protected]>
Date:   Sun Sep 12 13:49:05 2021 +0100

    Merge branch 'development' into FS-273

commit a1ecf88109
Merge: bd647afe 213a4338
Author: Ryan <[email protected]>
Date:   Sun Sep 12 13:48:59 2021 +0100

    Merge branch 'development' into FS-215

commit 5a6a5ff75d
Merge: 6ca61d9c 213a4338
Author: Ryan <[email protected]>
Date:   Sun Sep 12 13:48:50 2021 +0100

    Merge branch 'development' into FS-7

commit fdba119d5d
Merge: 61857dd0 213a4338
Author: Ryan <[email protected]>
Date:   Sun Sep 12 13:48:44 2021 +0100

    Merge branch 'development' into shitcan-savedflags

commit 61857dd06f
Merge: 2d18d461 0e12f5e7
Author: Video <[email protected]>
Date:   Sun Sep 12 03:01:37 2021 -0600

    Merge branch 'development' into shitcan-savedflags

commit bd647afe92
Merge: 69f17ef2 0e12f5e7
Author: Video <[email protected]>
Date:   Sun Sep 12 02:50:39 2021 -0600

    Merge branch 'development' into FS-215

commit 69f17ef2d7
Merge: ee1b27fa aebe1ace
Author: Video <[email protected]>
Date:   Sun Sep 12 02:01:56 2021 -0600

    Merge branch 'development' into FS-215

commit ee1b27fa0d
Merge: 2bdf14f3 0a9b95bf
Author: Ryan <[email protected]>
Date:   Sat Sep 11 01:24:00 2021 +0100

    Merge branch 'development' into FS-215

commit 6ca61d9c6c
Merge: fedf80b8 0a9b95bf
Author: Ryan <[email protected]>
Date:   Sat Sep 11 01:23:52 2021 +0100

    Merge branch 'development' into FS-7

commit 2d18d461fe
Merge: a4c81f20 0a9b95bf
Author: Ryan <[email protected]>
Date:   Sat Sep 11 01:23:44 2021 +0100

    Merge branch 'development' into shitcan-savedflags

commit 47e6386907
Merge: b1062fbb 0a9b95bf
Author: Ryan <[email protected]>
Date:   Sat Sep 11 01:23:13 2021 +0100

    Merge branch 'development' into FS-273

commit fedf80b834
Merge: a2d11d4b 44ff621d
Author: Video <[email protected]>
Date:   Fri Sep 10 01:39:16 2021 -0600

    Merge branch 'development' into FS-7

commit 2bdf14f38c
Merge: f6d46b61 44ff621d
Author: Video <[email protected]>
Date:   Mon Sep 6 15:26:13 2021 -0600

    Merge branch 'development' into FS-215

commit b1062fbb6c
Merge: f69feed4 44ff621d
Author: Video <[email protected]>
Date:   Mon Sep 6 14:39:32 2021 -0600

    Merge branch 'development' into FS-273

commit f69feed469
Author: Video <[email protected]>
Date:   Mon Sep 6 01:14:21 2021 -0600

    fixed

commit 8253f94ac4
Merge: daf0126f 54cb0cfa
Author: Video <[email protected]>
Date:   Mon Sep 6 01:12:00 2021 -0600

    Merge branch 'development' into FS-273

commit a4c81f202c
Merge: 0d09c3a5 23caa4e8
Author: Ryan <[email protected]>
Date:   Sat Sep 4 01:23:06 2021 +0100

    Merge branch 'development' into shitcan-savedflags

commit daf0126f45
Merge: a51f5c9b 23caa4e8
Author: Ryan <[email protected]>
Date:   Sat Sep 4 01:07:39 2021 +0100

    Merge branch 'development' into FS-273

commit f6d46b6178
Merge: ee804d52 23caa4e8
Author: Ryan <[email protected]>
Date:   Sat Sep 4 01:07:33 2021 +0100

    Merge branch 'development' into FS-215

commit a2d11d4b93
Merge: dc490659 23caa4e8
Author: Ryan <[email protected]>
Date:   Sat Sep 4 01:07:28 2021 +0100

    Merge branch 'development' into FS-7

commit a51f5c9bbf
Author: Video <[email protected]>
Date:   Fri Sep 3 13:53:33 2021 -0600

    FS-273

commit ee804d52ff
Author: Video <[email protected]>
Date:   Fri Sep 3 12:52:15 2021 -0600

    Makes [Discord] a hyperlink (FS-215)

    I've decided to overhaul the implementation of DiscordToMinecraftListener to make it more easily workable. This overhaul allows me to implement FS-215 more easily.

commit dc490659c1
Author: Video <[email protected]>
Date:   Fri Sep 3 00:07:20 2021 -0600

    Begins implementing FS-7

    should be good enough, but feedback would be lovely

commit 0d09c3a550
Merge: e2ccd14e 4c3f188b
Author: Ryan <[email protected]>
Date:   Sun Aug 29 20:09:03 2021 +0100

    Merge branch 'development' into shitcan-savedflags

commit e2ccd14eb3
Author: Video <[email protected]>
Date:   Fri Aug 27 16:54:55 2021 -0600

    Unsaves SavedFlags
 2021-11-29 06:40:26 -07:00
VideoandGitHub 8cff0124ea Merge pull request #93 from AtlasMediaGroup/FS-37 
Fixes FS-37
 2021-11-29 06:36:20 -07:00
VideoandGitHub 1162f10ebb Merge branch 'development' into FS-37 2021-11-29 06:31:18 -07:00