Allow players to pay other players coins [FS-7] #129
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
should be good enough, but feedback would be lovely
|
Disregard the build failure. It seems that the dependencies are on the fritz again. |
Wild1145
previously requested changes
Sep 4, 2021
src/main/java/me/totalfreedom/totalfreedommod/command/Command_coins.java
Outdated
Show resolved
Hide resolved
src/main/java/me/totalfreedom/totalfreedommod/command/Command_coins.java
Show resolved
Hide resolved
src/main/java/me/totalfreedom/totalfreedommod/command/Command_coins.java
Show resolved
Hide resolved
|
pinged because of your original review |
VideoGameSmash12
added a commit
that referenced
this pull request
Nov 29, 2021
commit 35965b0 Merge: aa20a6e 1253732 Author: Video <videogamesm12@gmail.com> 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 1253732 Merge: e1bee32 aa20a6e Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 06:25:25 2021 -0700 Merge branch 'development' into FS-256 commit aa20a6e Merge: 7062290 1ecfb0b Author: Video <videogamesm12@gmail.com> 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 e1bee32 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 03:27:07 2021 -0700 Forces the server to recalculate the permissions server-wide in /opall commit 1ecfb0b Merge: 225ade8 7062290 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 03:01:22 2021 -0700 Merge branch 'development' into FS-7 commit 7062290 Merge: a42cb6a a4adfa9 Author: Video <videogamesm12@gmail.com> 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 a4adfa9 Merge: 1b5bbd1 a42cb6a Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 02:46:41 2021 -0700 Merge branch 'development' into FS-273 commit 225ade8 Merge: afe755f a42cb6a Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 02:46:02 2021 -0700 Merge branch 'development' into FS-7 commit a42cb6a Merge: 2ecfb88 01fdf76 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 02:41:34 2021 -0700 Merge pull request #125 from AtlasMediaGroup/shitcan-savedflags Shitcans SavedFlags commit 01fdf76 Merge: 58c21bb 2ecfb88 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:28:48 2021 -0700 Merge branch 'development' into shitcan-savedflags commit afe755f Merge: 5f97e68 2ecfb88 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:26:59 2021 -0700 Merge branch 'development' into FS-7 commit 5f97e68 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:26:49 2021 -0700 fuck it, it works commit 1b5bbd1 Merge: 8356e83 2ecfb88 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:16:21 2021 -0700 Merge branch 'development' into FS-273 commit 2ecfb88 Merge: 42143c1 bb2ddf1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:15:16 2021 -0700 Merge pull request #130 from AtlasMediaGroup/FS-215 Makes [Discord] a hyperlink (FS-215) commit 8356e83 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:11:16 2021 -0700 Redundancy fix and better protection system commit ab00cb8 Merge: ecce62f 42143c1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 03:31:45 2021 -0700 Merge branch 'development' into FS-273 commit bb2ddf1 Merge: cf9fdc6 42143c1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 03:31:19 2021 -0700 Merge branch 'development' into FS-215 commit 58c21bb Merge: fdba119 42143c1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 03:30:48 2021 -0700 Merge branch 'development' into shitcan-savedflags commit ecce62f Merge: d814853 a598c93 Author: Video <videogamesm12@gmail.com> Date: Sat Oct 9 00:01:22 2021 -0600 Merge branch 'development' into FS-273 commit cf9fdc6 Merge: 387ea6f a598c93 Author: Video <videogamesm12@gmail.com> Date: Fri Oct 8 01:43:33 2021 -0600 Merge branch 'development' into FS-215 commit 387ea6f Merge: a1ecf88 180cd81 Author: Video <videogamesm12@gmail.com> Date: Fri Oct 1 00:35:12 2021 -0600 Merge branch 'development' into FS-215 commit d814853 Merge: 47e6386 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:49:05 2021 +0100 Merge branch 'development' into FS-273 commit a1ecf88 Merge: bd647af 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:48:59 2021 +0100 Merge branch 'development' into FS-215 commit 5a6a5ff Merge: 6ca61d9 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:48:50 2021 +0100 Merge branch 'development' into FS-7 commit fdba119 Merge: 61857dd 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:48:44 2021 +0100 Merge branch 'development' into shitcan-savedflags commit 61857dd Merge: 2d18d46 0e12f5e Author: Video <videogamesm12@gmail.com> Date: Sun Sep 12 03:01:37 2021 -0600 Merge branch 'development' into shitcan-savedflags commit bd647af Merge: 69f17ef 0e12f5e Author: Video <videogamesm12@gmail.com> Date: Sun Sep 12 02:50:39 2021 -0600 Merge branch 'development' into FS-215 commit 69f17ef Merge: ee1b27f aebe1ac Author: Video <videogamesm12@gmail.com> Date: Sun Sep 12 02:01:56 2021 -0600 Merge branch 'development' into FS-215 commit ee1b27f Merge: 2bdf14f 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 01:24:00 2021 +0100 Merge branch 'development' into FS-215 commit 6ca61d9 Merge: fedf80b 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 01:23:52 2021 +0100 Merge branch 'development' into FS-7 commit 2d18d46 Merge: a4c81f2 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 01:23:44 2021 +0100 Merge branch 'development' into shitcan-savedflags commit 47e6386 Merge: b1062fb 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 01:23:13 2021 +0100 Merge branch 'development' into FS-273 commit fedf80b Merge: a2d11d4 44ff621 Author: Video <videogamesm12@gmail.com> Date: Fri Sep 10 01:39:16 2021 -0600 Merge branch 'development' into FS-7 commit 2bdf14f Merge: f6d46b6 44ff621 Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 15:26:13 2021 -0600 Merge branch 'development' into FS-215 commit b1062fb Merge: f69feed 44ff621 Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 14:39:32 2021 -0600 Merge branch 'development' into FS-273 commit f69feed Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 01:14:21 2021 -0600 fixed commit 8253f94 Merge: daf0126 54cb0cf Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 01:12:00 2021 -0600 Merge branch 'development' into FS-273 commit a4c81f2 Merge: 0d09c3a 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:23:06 2021 +0100 Merge branch 'development' into shitcan-savedflags commit daf0126 Merge: a51f5c9 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:07:39 2021 +0100 Merge branch 'development' into FS-273 commit f6d46b6 Merge: ee804d5 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:07:33 2021 +0100 Merge branch 'development' into FS-215 commit a2d11d4 Merge: dc49065 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:07:28 2021 +0100 Merge branch 'development' into FS-7 commit a51f5c9 Author: Video <videogamesm12@gmail.com> Date: Fri Sep 3 13:53:33 2021 -0600 FS-273 commit ee804d5 Author: Video <videogamesm12@gmail.com> 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 dc49065 Author: Video <videogamesm12@gmail.com> Date: Fri Sep 3 00:07:20 2021 -0600 Begins implementing FS-7 should be good enough, but feedback would be lovely commit 0d09c3a Merge: e2ccd14 4c3f188 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Aug 29 20:09:03 2021 +0100 Merge branch 'development' into shitcan-savedflags commit e2ccd14 Author: Video <videogamesm12@gmail.com> Date: Fri Aug 27 16:54:55 2021 -0600 Unsaves SavedFlags
VideoGameSmash12
added a commit
that referenced
this pull request
Feb 21, 2022
commit 43c6857 Merge: 2618d97 b711ed5 Author: elmon <elmon11bussiness@gmail.com> Date: Mon Feb 21 10:01:39 2022 +0100 Merge pull request #190 from AtlasMediaGroup/Elmon11-patch-2 order of messages fix commit b711ed5 Merge: 1c46472 2618d97 Author: elmon <elmon11bussiness@gmail.com> Date: Mon Jan 24 22:16:24 2022 +0100 Merge branch 'development' into Elmon11-patch-2 commit 2618d97 Author: Nathan Curran <30569566+Focusvity@users.noreply.github.com> 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 <pawereus@gmail.com> commit 1c46472 Merge: f00f67a 850f121 Author: Nathan Curran <30569566+Focusvity@users.noreply.github.com> Date: Mon Jan 24 12:41:47 2022 +1100 Merge branch 'development' into Elmon11-patch-2 commit f00f67a Author: elmon <elmon11bussiness@gmail.com> Date: Sun Jan 23 13:26:22 2022 +0100 order of messages fix https://media.discordapp.net/attachments/874713176082636882/934559012991680532/unknown.png commit 850f121 Merge: 2eb0ab4 7fd77f3 Author: Paldiu <pawereus@gmail.com> Date: Mon Jan 17 11:35:09 2022 -0600 Merge pull request #188 from AtlasMediaGroup/Wild1145-patch-1 Correct CoreProtect Version commit 7fd77f3 Author: Ryan <Wild1145@users.noreply.github.com> 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 2eb0ab4 Merge: 8cff012 2612aae Author: Video <videogamesm12@gmail.com> 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 2612aae Author: Video <videogamesm12@gmail.com> Date: Wed Dec 15 21:46:56 2021 -0700 Makes spawnmob configurable and increases the default limit to 25 commit 8cff012 Merge: 35965b0 1162f10 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 06:36:20 2021 -0700 Merge pull request #93 from AtlasMediaGroup/FS-37 Fixes FS-37 commit 1162f10 Merge: 7ce173e 35965b0 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 06:31:18 2021 -0700 Merge branch 'development' into FS-37 commit 35965b0 Merge: aa20a6e 1253732 Author: Video <videogamesm12@gmail.com> 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 1253732 Merge: e1bee32 aa20a6e Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 06:25:25 2021 -0700 Merge branch 'development' into FS-256 commit 7ce173e Merge: 4d006ed aa20a6e Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 06:24:34 2021 -0700 Merge branch 'development' into FS-37 commit aa20a6e Merge: 7062290 1ecfb0b Author: Video <videogamesm12@gmail.com> 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 e1bee32 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 03:27:07 2021 -0700 Forces the server to recalculate the permissions server-wide in /opall commit 4d006ed Merge: 8cbfde8 7062290 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 03:04:42 2021 -0700 Merge branch 'development' into FS-37 commit 1ecfb0b Merge: 225ade8 7062290 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 03:01:22 2021 -0700 Merge branch 'development' into FS-7 commit 7062290 Merge: a42cb6a a4adfa9 Author: Video <videogamesm12@gmail.com> 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 a4adfa9 Merge: 1b5bbd1 a42cb6a Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 02:46:41 2021 -0700 Merge branch 'development' into FS-273 commit 225ade8 Merge: afe755f a42cb6a Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 02:46:02 2021 -0700 Merge branch 'development' into FS-7 commit 8cbfde8 Merge: bba5ec9 a42cb6a Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 02:41:49 2021 -0700 Merge branch 'development' into FS-37 commit a42cb6a Merge: 2ecfb88 01fdf76 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 02:41:34 2021 -0700 Merge pull request #125 from AtlasMediaGroup/shitcan-savedflags Shitcans SavedFlags commit 01fdf76 Merge: 58c21bb 2ecfb88 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:28:48 2021 -0700 Merge branch 'development' into shitcan-savedflags commit afe755f Merge: 5f97e68 2ecfb88 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:26:59 2021 -0700 Merge branch 'development' into FS-7 commit 5f97e68 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:26:49 2021 -0700 fuck it, it works commit 1b5bbd1 Merge: 8356e83 2ecfb88 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:16:21 2021 -0700 Merge branch 'development' into FS-273 commit 2ecfb88 Merge: 42143c1 bb2ddf1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:15:16 2021 -0700 Merge pull request #130 from AtlasMediaGroup/FS-215 Makes [Discord] a hyperlink (FS-215) commit 8356e83 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:11:16 2021 -0700 Redundancy fix and better protection system commit ab00cb8 Merge: ecce62f 42143c1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 03:31:45 2021 -0700 Merge branch 'development' into FS-273 commit bb2ddf1 Merge: cf9fdc6 42143c1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 03:31:19 2021 -0700 Merge branch 'development' into FS-215 commit bba5ec9 Merge: 68adaed 42143c1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 03:31:13 2021 -0700 Merge branch 'development' into FS-37 commit 58c21bb Merge: fdba119 42143c1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 03:30:48 2021 -0700 Merge branch 'development' into shitcan-savedflags commit 68adaed Merge: 087b8dd a598c93 Author: Video <videogamesm12@gmail.com> Date: Sat Oct 9 00:09:24 2021 -0600 Merge branch 'development' into FS-37 commit ecce62f Merge: d814853 a598c93 Author: Video <videogamesm12@gmail.com> Date: Sat Oct 9 00:01:22 2021 -0600 Merge branch 'development' into FS-273 commit cf9fdc6 Merge: 387ea6f a598c93 Author: Video <videogamesm12@gmail.com> Date: Fri Oct 8 01:43:33 2021 -0600 Merge branch 'development' into FS-215 commit 387ea6f Merge: a1ecf88 180cd81 Author: Video <videogamesm12@gmail.com> Date: Fri Oct 1 00:35:12 2021 -0600 Merge branch 'development' into FS-215 commit d814853 Merge: 47e6386 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:49:05 2021 +0100 Merge branch 'development' into FS-273 commit a1ecf88 Merge: bd647af 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:48:59 2021 +0100 Merge branch 'development' into FS-215 commit 5a6a5ff Merge: 6ca61d9 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:48:50 2021 +0100 Merge branch 'development' into FS-7 commit fdba119 Merge: 61857dd 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:48:44 2021 +0100 Merge branch 'development' into shitcan-savedflags commit 087b8dd Merge: 3818aab 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:48:21 2021 +0100 Merge branch 'development' into FS-37 commit 3818aab Merge: caeda21 0e12f5e Author: Video <videogamesm12@gmail.com> Date: Sun Sep 12 03:04:08 2021 -0600 Merge branch 'development' into FS-37 commit 61857dd Merge: 2d18d46 0e12f5e Author: Video <videogamesm12@gmail.com> Date: Sun Sep 12 03:01:37 2021 -0600 Merge branch 'development' into shitcan-savedflags commit bd647af Merge: 69f17ef 0e12f5e Author: Video <videogamesm12@gmail.com> Date: Sun Sep 12 02:50:39 2021 -0600 Merge branch 'development' into FS-215 commit 69f17ef Merge: ee1b27f aebe1ac Author: Video <videogamesm12@gmail.com> Date: Sun Sep 12 02:01:56 2021 -0600 Merge branch 'development' into FS-215 commit caeda21 Merge: 3ca9835 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 15:26:37 2021 +0100 Merge branch 'development' into FS-37 commit ee1b27f Merge: 2bdf14f 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 01:24:00 2021 +0100 Merge branch 'development' into FS-215 commit 6ca61d9 Merge: fedf80b 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 01:23:52 2021 +0100 Merge branch 'development' into FS-7 commit 2d18d46 Merge: a4c81f2 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 01:23:44 2021 +0100 Merge branch 'development' into shitcan-savedflags commit 47e6386 Merge: b1062fb 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 01:23:13 2021 +0100 Merge branch 'development' into FS-273 commit fedf80b Merge: a2d11d4 44ff621 Author: Video <videogamesm12@gmail.com> Date: Fri Sep 10 01:39:16 2021 -0600 Merge branch 'development' into FS-7 commit 2bdf14f Merge: f6d46b6 44ff621 Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 15:26:13 2021 -0600 Merge branch 'development' into FS-215 commit b1062fb Merge: f69feed 44ff621 Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 14:39:32 2021 -0600 Merge branch 'development' into FS-273 commit 3ca9835 Merge: da82b27 54cb0cf Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 01:16:04 2021 -0600 Merge branch 'development' into FS-37 commit f69feed Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 01:14:21 2021 -0600 fixed commit 8253f94 Merge: daf0126 54cb0cf Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 01:12:00 2021 -0600 Merge branch 'development' into FS-273 commit a4c81f2 Merge: 0d09c3a 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:23:06 2021 +0100 Merge branch 'development' into shitcan-savedflags commit da82b27 Merge: af1df22 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:07:55 2021 +0100 Merge branch 'development' into FS-37 commit daf0126 Merge: a51f5c9 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:07:39 2021 +0100 Merge branch 'development' into FS-273 commit f6d46b6 Merge: ee804d5 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:07:33 2021 +0100 Merge branch 'development' into FS-215 commit a2d11d4 Merge: dc49065 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:07:28 2021 +0100 Merge branch 'development' into FS-7 commit a51f5c9 Author: Video <videogamesm12@gmail.com> Date: Fri Sep 3 13:53:33 2021 -0600 FS-273 commit ee804d5 Author: Video <videogamesm12@gmail.com> 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 dc49065 Author: Video <videogamesm12@gmail.com> Date: Fri Sep 3 00:07:20 2021 -0600 Begins implementing FS-7 should be good enough, but feedback would be lovely commit 0d09c3a Merge: e2ccd14 4c3f188 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Aug 29 20:09:03 2021 +0100 Merge branch 'development' into shitcan-savedflags commit e2ccd14 Author: Video <videogamesm12@gmail.com> Date: Fri Aug 27 16:54:55 2021 -0600 Unsaves SavedFlags commit af1df22 Merge: 1474a80 f380898 Author: Video <videogamesm12@gmail.com> Date: Thu Aug 26 23:05:58 2021 -0600 Merge branch 'development' into FS-37 commit 1474a80 Merge: 77fd4ff f45466e Author: Ryan <Wild1145@users.noreply.github.com> Date: Thu Aug 26 13:26:44 2021 +0100 Merge branch 'development' into FS-37 commit 77fd4ff Merge: 33aca2a d901cba Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Aug 21 21:34:04 2021 +0100 Merge branch 'development' into FS-37 commit 33aca2a Merge: 159eda7 0582c2e Author: Video <videogamesm12@gmail.com> Date: Tue Aug 10 22:38:51 2021 -0600 Merge branch 'development' into FS-37 commit 159eda7 Merge: da2d252 6874b2c Author: Ryan <Wild1145@users.noreply.github.com> Date: Tue Aug 10 17:34:12 2021 +0100 Merge branch 'development' into FS-37 commit da2d252 Merge: e99aaa2 c8a4382 Author: Ryan <Wild1145@users.noreply.github.com> Date: Tue Aug 10 17:31:13 2021 +0100 Merge branch 'development' into FS-37 commit e99aaa2 Author: Video <videogamesm12@gmail.com> Date: Thu Aug 5 00:32:23 2021 -0600 Fixes FS-37 Fixes an oversight introduced in 76bb2d0 in which the configuration is loaded twice.
VideoGameSmash12
added a commit
to VideoGameSmash12/TotalFreedomMod
that referenced
this pull request
Feb 27, 2022
commit 2c22c6c Merge: 11134f4 5ef0f29 Author: Paldiu <pawereus@gmail.com> Date: Wed Feb 23 17:10:09 2022 -0600 Merge pull request AtlasMediaGroup#194 from AtlasMediaGroup/Wild1145-patch-1 Update various dependencies based on Freedom-01 State commit 5ef0f29 Merge: e7992c7 11134f4 Author: Ryan <Wild1145@users.noreply.github.com> Date: Wed Feb 23 22:48:53 2022 +0000 Merge branch 'development' into Wild1145-patch-1 commit 11134f4 Merge: 43c6857 82e966d Author: Ryan <Wild1145@users.noreply.github.com> Date: Wed Feb 23 22:48:32 2022 +0000 Merge pull request AtlasMediaGroup#197 from AtlasMediaGroup/FS-292 Uplifts the plugin to 1.17.1 commit e7992c7 Merge: 127ee7d 43c6857 Author: Ryan <Wild1145@users.noreply.github.com> Date: Tue Feb 22 21:17:02 2022 +0000 Merge branch 'development' into Wild1145-patch-1 commit 82e966d Author: Ryan <Wild1145@users.noreply.github.com> Date: Tue Feb 22 20:50:41 2022 +0000 Delete java11-maven.yml commit f457c4c Merge: 004a0f3 43c6857 Author: Paldiu <pawereus@gmail.com> Date: Mon Feb 21 18:08:29 2022 -0600 Merge branch 'development' into FS-292 commit 004a0f3 Author: Video <videogamesm12@gmail.com> Date: Mon Feb 21 17:04:53 2022 -0700 Update Groups.java This should resolve the issues with spawn eggs and mobs. commit cf5199f Author: Video <videogamesm12@gmail.com> Date: Mon Feb 21 16:45:03 2022 -0700 Squashed commit of the following: commit 43c6857 Merge: 2618d97 b711ed5 Author: elmon <elmon11bussiness@gmail.com> Date: Mon Feb 21 10:01:39 2022 +0100 Merge pull request AtlasMediaGroup#190 from AtlasMediaGroup/Elmon11-patch-2 order of messages fix commit b711ed5 Merge: 1c46472 2618d97 Author: elmon <elmon11bussiness@gmail.com> Date: Mon Jan 24 22:16:24 2022 +0100 Merge branch 'development' into Elmon11-patch-2 commit 2618d97 Author: Nathan Curran <30569566+Focusvity@users.noreply.github.com> Date: Mon Jan 24 12:42:47 2022 +1100 Remove requireNonNull method from getIp, which causes NPE - resolves FS-429 (AtlasMediaGroup#187) Co-authored-by: Paldiu <pawereus@gmail.com> commit 1c46472 Merge: f00f67a 850f121 Author: Nathan Curran <30569566+Focusvity@users.noreply.github.com> Date: Mon Jan 24 12:41:47 2022 +1100 Merge branch 'development' into Elmon11-patch-2 commit f00f67a Author: elmon <elmon11bussiness@gmail.com> Date: Sun Jan 23 13:26:22 2022 +0100 order of messages fix https://media.discordapp.net/attachments/874713176082636882/934559012991680532/unknown.png commit 850f121 Merge: 2eb0ab4 7fd77f3 Author: Paldiu <pawereus@gmail.com> Date: Mon Jan 17 11:35:09 2022 -0600 Merge pull request AtlasMediaGroup#188 from AtlasMediaGroup/Wild1145-patch-1 Correct CoreProtect Version commit 7fd77f3 Author: Ryan <Wild1145@users.noreply.github.com> 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 2eb0ab4 Merge: 8cff012 2612aae Author: Video <videogamesm12@gmail.com> Date: Wed Dec 22 20:56:46 2021 -0700 Merge pull request AtlasMediaGroup#179 from AtlasMediaGroup/FS-212 Makes spawnmob configurable, increases the default limit to 25 (FS-212) commit 2612aae Author: Video <videogamesm12@gmail.com> Date: Wed Dec 15 21:46:56 2021 -0700 Makes spawnmob configurable and increases the default limit to 25 commit 8cff012 Merge: 35965b0 1162f10 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 06:36:20 2021 -0700 Merge pull request #93 from AtlasMediaGroup/FS-37 Fixes FS-37 commit 1162f10 Merge: 7ce173e 35965b0 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 06:31:18 2021 -0700 Merge branch 'development' into FS-37 commit 35965b0 Merge: aa20a6e 1253732 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 06:31:11 2021 -0700 Merge pull request AtlasMediaGroup#174 from AtlasMediaGroup/FS-256 Forces the server to recalculate the permissions server-wide in /opall (FS-256) commit 1253732 Merge: e1bee32 aa20a6e Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 06:25:25 2021 -0700 Merge branch 'development' into FS-256 commit 7ce173e Merge: 4d006ed aa20a6e Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 06:24:34 2021 -0700 Merge branch 'development' into FS-37 commit aa20a6e Merge: 7062290 1ecfb0b Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 06:23:57 2021 -0700 Merge pull request AtlasMediaGroup#129 from AtlasMediaGroup/FS-7 Allow players to pay other players coins [FS-7] commit e1bee32 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 03:27:07 2021 -0700 Forces the server to recalculate the permissions server-wide in /opall commit 4d006ed Merge: 8cbfde8 7062290 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 03:04:42 2021 -0700 Merge branch 'development' into FS-37 commit 1ecfb0b Merge: 225ade8 7062290 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 03:01:22 2021 -0700 Merge branch 'development' into FS-7 commit 7062290 Merge: a42cb6a a4adfa9 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 03:00:15 2021 -0700 Merge pull request AtlasMediaGroup#131 from AtlasMediaGroup/FS-273 Moves /rainbowtrail to the shop (FS-273) commit a4adfa9 Merge: 1b5bbd1 a42cb6a Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 02:46:41 2021 -0700 Merge branch 'development' into FS-273 commit 225ade8 Merge: afe755f a42cb6a Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 02:46:02 2021 -0700 Merge branch 'development' into FS-7 commit 8cbfde8 Merge: bba5ec9 a42cb6a Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 02:41:49 2021 -0700 Merge branch 'development' into FS-37 commit a42cb6a Merge: 2ecfb88 01fdf76 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 02:41:34 2021 -0700 Merge pull request AtlasMediaGroup#125 from AtlasMediaGroup/shitcan-savedflags Shitcans SavedFlags commit 01fdf76 Merge: 58c21bb 2ecfb88 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:28:48 2021 -0700 Merge branch 'development' into shitcan-savedflags commit afe755f Merge: 5f97e68 2ecfb88 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:26:59 2021 -0700 Merge branch 'development' into FS-7 commit 5f97e68 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:26:49 2021 -0700 fuck it, it works commit 1b5bbd1 Merge: 8356e83 2ecfb88 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:16:21 2021 -0700 Merge branch 'development' into FS-273 commit 2ecfb88 Merge: 42143c1 bb2ddf1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:15:16 2021 -0700 Merge pull request AtlasMediaGroup#130 from AtlasMediaGroup/FS-215 Makes [Discord] a hyperlink (FS-215) commit 8356e83 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:11:16 2021 -0700 Redundancy fix and better protection system commit ab00cb8 Merge: ecce62f 42143c1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 03:31:45 2021 -0700 Merge branch 'development' into FS-273 commit bb2ddf1 Merge: cf9fdc6 42143c1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 03:31:19 2021 -0700 Merge branch 'development' into FS-215 commit bba5ec9 Merge: 68adaed 42143c1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 03:31:13 2021 -0700 Merge branch 'development' into FS-37 commit 58c21bb Merge: fdba119 42143c1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 03:30:48 2021 -0700 Merge branch 'development' into shitcan-savedflags commit 68adaed Merge: 087b8dd a598c93 Author: Video <videogamesm12@gmail.com> Date: Sat Oct 9 00:09:24 2021 -0600 Merge branch 'development' into FS-37 commit ecce62f Merge: d814853 a598c93 Author: Video <videogamesm12@gmail.com> Date: Sat Oct 9 00:01:22 2021 -0600 Merge branch 'development' into FS-273 commit cf9fdc6 Merge: 387ea6f a598c93 Author: Video <videogamesm12@gmail.com> Date: Fri Oct 8 01:43:33 2021 -0600 Merge branch 'development' into FS-215 commit 387ea6f Merge: a1ecf88 180cd81 Author: Video <videogamesm12@gmail.com> Date: Fri Oct 1 00:35:12 2021 -0600 Merge branch 'development' into FS-215 commit d814853 Merge: 47e6386 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:49:05 2021 +0100 Merge branch 'development' into FS-273 commit a1ecf88 Merge: bd647af 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:48:59 2021 +0100 Merge branch 'development' into FS-215 commit 5a6a5ff Merge: 6ca61d9 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:48:50 2021 +0100 Merge branch 'development' into FS-7 commit fdba119 Merge: 61857dd 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:48:44 2021 +0100 Merge branch 'development' into shitcan-savedflags commit 087b8dd Merge: 3818aab 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:48:21 2021 +0100 Merge branch 'development' into FS-37 commit 3818aab Merge: caeda21 0e12f5e Author: Video <videogamesm12@gmail.com> Date: Sun Sep 12 03:04:08 2021 -0600 Merge branch 'development' into FS-37 commit 61857dd Merge: 2d18d46 0e12f5e Author: Video <videogamesm12@gmail.com> Date: Sun Sep 12 03:01:37 2021 -0600 Merge branch 'development' into shitcan-savedflags commit bd647af Merge: 69f17ef 0e12f5e Author: Video <videogamesm12@gmail.com> Date: Sun Sep 12 02:50:39 2021 -0600 Merge branch 'development' into FS-215 commit 69f17ef Merge: ee1b27f aebe1ac Author: Video <videogamesm12@gmail.com> Date: Sun Sep 12 02:01:56 2021 -0600 Merge branch 'development' into FS-215 commit caeda21 Merge: 3ca9835 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 15:26:37 2021 +0100 Merge branch 'development' into FS-37 commit ee1b27f Merge: 2bdf14f 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 01:24:00 2021 +0100 Merge branch 'development' into FS-215 commit 6ca61d9 Merge: fedf80b 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 01:23:52 2021 +0100 Merge branch 'development' into FS-7 commit 2d18d46 Merge: a4c81f2 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 01:23:44 2021 +0100 Merge branch 'development' into shitcan-savedflags commit 47e6386 Merge: b1062fb 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 01:23:13 2021 +0100 Merge branch 'development' into FS-273 commit fedf80b Merge: a2d11d4 44ff621 Author: Video <videogamesm12@gmail.com> Date: Fri Sep 10 01:39:16 2021 -0600 Merge branch 'development' into FS-7 commit 2bdf14f Merge: f6d46b6 44ff621 Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 15:26:13 2021 -0600 Merge branch 'development' into FS-215 commit b1062fb Merge: f69feed 44ff621 Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 14:39:32 2021 -0600 Merge branch 'development' into FS-273 commit 3ca9835 Merge: da82b27 54cb0cf Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 01:16:04 2021 -0600 Merge branch 'development' into FS-37 commit f69feed Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 01:14:21 2021 -0600 fixed commit 8253f94 Merge: daf0126 54cb0cf Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 01:12:00 2021 -0600 Merge branch 'development' into FS-273 commit a4c81f2 Merge: 0d09c3a 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:23:06 2021 +0100 Merge branch 'development' into shitcan-savedflags commit da82b27 Merge: af1df22 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:07:55 2021 +0100 Merge branch 'development' into FS-37 commit daf0126 Merge: a51f5c9 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:07:39 2021 +0100 Merge branch 'development' into FS-273 commit f6d46b6 Merge: ee804d5 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:07:33 2021 +0100 Merge branch 'development' into FS-215 commit a2d11d4 Merge: dc49065 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:07:28 2021 +0100 Merge branch 'development' into FS-7 commit a51f5c9 Author: Video <videogamesm12@gmail.com> Date: Fri Sep 3 13:53:33 2021 -0600 FS-273 commit ee804d5 Author: Video <videogamesm12@gmail.com> 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 dc49065 Author: Video <videogamesm12@gmail.com> Date: Fri Sep 3 00:07:20 2021 -0600 Begins implementing FS-7 should be good enough, but feedback would be lovely commit 0d09c3a Merge: e2ccd14 4c3f188 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Aug 29 20:09:03 2021 +0100 Merge branch 'development' into shitcan-savedflags commit e2ccd14 Author: Video <videogamesm12@gmail.com> Date: Fri Aug 27 16:54:55 2021 -0600 Unsaves SavedFlags commit af1df22 Merge: 1474a80 f380898 Author: Video <videogamesm12@gmail.com> Date: Thu Aug 26 23:05:58 2021 -0600 Merge branch 'development' into FS-37 commit 1474a80 Merge: 77fd4ff f45466e Author: Ryan <Wild1145@users.noreply.github.com> Date: Thu Aug 26 13:26:44 2021 +0100 Merge branch 'development' into FS-37 commit 77fd4ff Merge: 33aca2a d901cba Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Aug 21 21:34:04 2021 +0100 Merge branch 'development' into FS-37 commit 33aca2a Merge: 159eda7 0582c2e Author: Video <videogamesm12@gmail.com> Date: Tue Aug 10 22:38:51 2021 -0600 Merge branch 'development' into FS-37 commit 159eda7 Merge: da2d252 6874b2c Author: Ryan <Wild1145@users.noreply.github.com> Date: Tue Aug 10 17:34:12 2021 +0100 Merge branch 'development' into FS-37 commit da2d252 Merge: e99aaa2 c8a4382 Author: Ryan <Wild1145@users.noreply.github.com> Date: Tue Aug 10 17:31:13 2021 +0100 Merge branch 'development' into FS-37 commit e99aaa2 Author: Video <videogamesm12@gmail.com> Date: Thu Aug 5 00:32:23 2021 -0600 Fixes FS-37 Fixes an oversight introduced in AtlasMediaGroup@76bb2d0 in which the configuration is loaded twice. commit 43c6857 Merge: 2618d97 b711ed5 Author: elmon <elmon11bussiness@gmail.com> Date: Mon Feb 21 10:01:39 2022 +0100 Merge pull request AtlasMediaGroup#190 from AtlasMediaGroup/Elmon11-patch-2 order of messages fix commit 127ee7d Author: Ryan <Wild1145@users.noreply.github.com> Date: Fri Feb 18 16:50:45 2022 +0000 Move CodeQL to Java 17 commit c873fd4 Author: Ryan <Wild1145@users.noreply.github.com> Date: Wed Feb 16 21:02:00 2022 +0000 Update pom.xml commit fa90e1d Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Feb 5 23:25:57 2022 +0000 Update various dependencies based on Freedom-01 State Various plugins have been updated but not reflected back here. This PR Corrects that. commit b711ed5 Merge: 1c46472 2618d97 Author: elmon <elmon11bussiness@gmail.com> Date: Mon Jan 24 22:16:24 2022 +0100 Merge branch 'development' into Elmon11-patch-2 commit 2618d97 Author: Nathan Curran <30569566+Focusvity@users.noreply.github.com> Date: Mon Jan 24 12:42:47 2022 +1100 Remove requireNonNull method from getIp, which causes NPE - resolves FS-429 (AtlasMediaGroup#187) Co-authored-by: Paldiu <pawereus@gmail.com> commit 1c46472 Merge: f00f67a 850f121 Author: Nathan Curran <30569566+Focusvity@users.noreply.github.com> Date: Mon Jan 24 12:41:47 2022 +1100 Merge branch 'development' into Elmon11-patch-2 commit f00f67a Author: elmon <elmon11bussiness@gmail.com> Date: Sun Jan 23 13:26:22 2022 +0100 order of messages fix https://media.discordapp.net/attachments/874713176082636882/934559012991680532/unknown.png commit 850f121 Merge: 2eb0ab4 7fd77f3 Author: Paldiu <pawereus@gmail.com> Date: Mon Jan 17 11:35:09 2022 -0600 Merge pull request AtlasMediaGroup#188 from AtlasMediaGroup/Wild1145-patch-1 Correct CoreProtect Version commit 7fd77f3 Author: Ryan <Wild1145@users.noreply.github.com> 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 2eb0ab4 Merge: 8cff012 2612aae Author: Video <videogamesm12@gmail.com> Date: Wed Dec 22 20:56:46 2021 -0700 Merge pull request AtlasMediaGroup#179 from AtlasMediaGroup/FS-212 Makes spawnmob configurable, increases the default limit to 25 (FS-212) commit 2612aae Author: Video <videogamesm12@gmail.com> Date: Wed Dec 15 21:46:56 2021 -0700 Makes spawnmob configurable and increases the default limit to 25 commit 6e7ad73 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 07:03:29 2021 -0700 Nevermind that didn't work commit af6411b Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 06:54:04 2021 -0700 Wait a second This *should* work... commit e9ba958 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 06:40:26 2021 -0700 Squashed commit of the following: commit 35965b0 Merge: aa20a6e 1253732 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 06:31:11 2021 -0700 Merge pull request AtlasMediaGroup#174 from AtlasMediaGroup/FS-256 Forces the server to recalculate the permissions server-wide in /opall (FS-256) commit 1253732 Merge: e1bee32 aa20a6e Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 06:25:25 2021 -0700 Merge branch 'development' into FS-256 commit aa20a6e Merge: 7062290 1ecfb0b Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 06:23:57 2021 -0700 Merge pull request AtlasMediaGroup#129 from AtlasMediaGroup/FS-7 Allow players to pay other players coins [FS-7] commit e1bee32 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 03:27:07 2021 -0700 Forces the server to recalculate the permissions server-wide in /opall commit 1ecfb0b Merge: 225ade8 7062290 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 03:01:22 2021 -0700 Merge branch 'development' into FS-7 commit 7062290 Merge: a42cb6a a4adfa9 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 03:00:15 2021 -0700 Merge pull request AtlasMediaGroup#131 from AtlasMediaGroup/FS-273 Moves /rainbowtrail to the shop (FS-273) commit a4adfa9 Merge: 1b5bbd1 a42cb6a Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 02:46:41 2021 -0700 Merge branch 'development' into FS-273 commit 225ade8 Merge: afe755f a42cb6a Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 02:46:02 2021 -0700 Merge branch 'development' into FS-7 commit a42cb6a Merge: 2ecfb88 01fdf76 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 02:41:34 2021 -0700 Merge pull request AtlasMediaGroup#125 from AtlasMediaGroup/shitcan-savedflags Shitcans SavedFlags commit 01fdf76 Merge: 58c21bb 2ecfb88 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:28:48 2021 -0700 Merge branch 'development' into shitcan-savedflags commit afe755f Merge: 5f97e68 2ecfb88 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:26:59 2021 -0700 Merge branch 'development' into FS-7 commit 5f97e68 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:26:49 2021 -0700 fuck it, it works commit 1b5bbd1 Merge: 8356e83 2ecfb88 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:16:21 2021 -0700 Merge branch 'development' into FS-273 commit 2ecfb88 Merge: 42143c1 bb2ddf1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:15:16 2021 -0700 Merge pull request AtlasMediaGroup#130 from AtlasMediaGroup/FS-215 Makes [Discord] a hyperlink (FS-215) commit 8356e83 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:11:16 2021 -0700 Redundancy fix and better protection system commit ab00cb8 Merge: ecce62f 42143c1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 03:31:45 2021 -0700 Merge branch 'development' into FS-273 commit bb2ddf1 Merge: cf9fdc6 42143c1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 03:31:19 2021 -0700 Merge branch 'development' into FS-215 commit 58c21bb Merge: fdba119 42143c1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 03:30:48 2021 -0700 Merge branch 'development' into shitcan-savedflags commit ecce62f Merge: d814853 a598c93 Author: Video <videogamesm12@gmail.com> Date: Sat Oct 9 00:01:22 2021 -0600 Merge branch 'development' into FS-273 commit cf9fdc6 Merge: 387ea6f a598c93 Author: Video <videogamesm12@gmail.com> Date: Fri Oct 8 01:43:33 2021 -0600 Merge branch 'development' into FS-215 commit 387ea6f Merge: a1ecf88 180cd81 Author: Video <videogamesm12@gmail.com> Date: Fri Oct 1 00:35:12 2021 -0600 Merge branch 'development' into FS-215 commit d814853 Merge: 47e6386 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:49:05 2021 +0100 Merge branch 'development' into FS-273 commit a1ecf88 Merge: bd647af 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:48:59 2021 +0100 Merge branch 'development' into FS-215 commit 5a6a5ff Merge: 6ca61d9 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:48:50 2021 +0100 Merge branch 'development' into FS-7 commit fdba119 Merge: 61857dd 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:48:44 2021 +0100 Merge branch 'development' into shitcan-savedflags commit 61857dd Merge: 2d18d46 0e12f5e Author: Video <videogamesm12@gmail.com> Date: Sun Sep 12 03:01:37 2021 -0600 Merge branch 'development' into shitcan-savedflags commit bd647af Merge: 69f17ef 0e12f5e Author: Video <videogamesm12@gmail.com> Date: Sun Sep 12 02:50:39 2021 -0600 Merge branch 'development' into FS-215 commit 69f17ef Merge: ee1b27f aebe1ac Author: Video <videogamesm12@gmail.com> Date: Sun Sep 12 02:01:56 2021 -0600 Merge branch 'development' into FS-215 commit ee1b27f Merge: 2bdf14f 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 01:24:00 2021 +0100 Merge branch 'development' into FS-215 commit 6ca61d9 Merge: fedf80b 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 01:23:52 2021 +0100 Merge branch 'development' into FS-7 commit 2d18d46 Merge: a4c81f2 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 01:23:44 2021 +0100 Merge branch 'development' into shitcan-savedflags commit 47e6386 Merge: b1062fb 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 01:23:13 2021 +0100 Merge branch 'development' into FS-273 commit fedf80b Merge: a2d11d4 44ff621 Author: Video <videogamesm12@gmail.com> Date: Fri Sep 10 01:39:16 2021 -0600 Merge branch 'development' into FS-7 commit 2bdf14f Merge: f6d46b6 44ff621 Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 15:26:13 2021 -0600 Merge branch 'development' into FS-215 commit b1062fb Merge: f69feed 44ff621 Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 14:39:32 2021 -0600 Merge branch 'development' into FS-273 commit f69feed Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 01:14:21 2021 -0600 fixed commit 8253f94 Merge: daf0126 54cb0cf Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 01:12:00 2021 -0600 Merge branch 'development' into FS-273 commit a4c81f2 Merge: 0d09c3a 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:23:06 2021 +0100 Merge branch 'development' into shitcan-savedflags commit daf0126 Merge: a51f5c9 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:07:39 2021 +0100 Merge branch 'development' into FS-273 commit f6d46b6 Merge: ee804d5 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:07:33 2021 +0100 Merge branch 'development' into FS-215 commit a2d11d4 Merge: dc49065 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:07:28 2021 +0100 Merge branch 'development' into FS-7 commit a51f5c9 Author: Video <videogamesm12@gmail.com> Date: Fri Sep 3 13:53:33 2021 -0600 FS-273 commit ee804d5 Author: Video <videogamesm12@gmail.com> 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 dc49065 Author: Video <videogamesm12@gmail.com> Date: Fri Sep 3 00:07:20 2021 -0600 Begins implementing FS-7 should be good enough, but feedback would be lovely commit 0d09c3a Merge: e2ccd14 4c3f188 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Aug 29 20:09:03 2021 +0100 Merge branch 'development' into shitcan-savedflags commit e2ccd14 Author: Video <videogamesm12@gmail.com> Date: Fri Aug 27 16:54:55 2021 -0600 Unsaves SavedFlags commit a29392c Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 03:03:00 2021 -0700 Squashed commit of the following: commit 7062290 Merge: a42cb6a a4adfa9 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 03:00:15 2021 -0700 Merge pull request AtlasMediaGroup#131 from AtlasMediaGroup/FS-273 Moves /rainbowtrail to the shop (FS-273) commit a4adfa9 Merge: 1b5bbd1 a42cb6a Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 02:46:41 2021 -0700 Merge branch 'development' into FS-273 commit a42cb6a Merge: 2ecfb88 01fdf76 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 02:41:34 2021 -0700 Merge pull request AtlasMediaGroup#125 from AtlasMediaGroup/shitcan-savedflags Shitcans SavedFlags commit 01fdf76 Merge: 58c21bb 2ecfb88 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:28:48 2021 -0700 Merge branch 'development' into shitcan-savedflags commit 1b5bbd1 Merge: 8356e83 2ecfb88 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:16:21 2021 -0700 Merge branch 'development' into FS-273 commit 2ecfb88 Merge: 42143c1 bb2ddf1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:15:16 2021 -0700 Merge pull request AtlasMediaGroup#130 from AtlasMediaGroup/FS-215 Makes [Discord] a hyperlink (FS-215) commit 8356e83 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:11:16 2021 -0700 Redundancy fix and better protection system commit ab00cb8 Merge: ecce62f 42143c1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 03:31:45 2021 -0700 Merge branch 'development' into FS-273 commit bb2ddf1 Merge: cf9fdc6 42143c1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 03:31:19 2021 -0700 Merge branch 'development' into FS-215 commit 58c21bb Merge: fdba119 42143c1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 03:30:48 2021 -0700 Merge branch 'development' into shitcan-savedflags commit ecce62f Merge: d814853 a598c93 Author: Video <videogamesm12@gmail.com> Date: Sat Oct 9 00:01:22 2021 -0600 Merge branch 'development' into FS-273 commit cf9fdc6 Merge: 387ea6f a598c93 Author: Video <videogamesm12@gmail.com> Date: Fri Oct 8 01:43:33 2021 -0600 Merge branch 'development' into FS-215 commit 387ea6f Merge: a1ecf88 180cd81 Author: Video <videogamesm12@gmail.com> Date: Fri Oct 1 00:35:12 2021 -0600 Merge branch 'development' into FS-215 commit d814853 Merge: 47e6386 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:49:05 2021 +0100 Merge branch 'development' into FS-273 commit a1ecf88 Merge: bd647af 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:48:59 2021 +0100 Merge branch 'development' into FS-215 commit fdba119 Merge: 61857dd 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:48:44 2021 +0100 Merge branch 'development' into shitcan-savedflags commit 61857dd Merge: 2d18d46 0e12f5e Author: Video <videogamesm12@gmail.com> Date: Sun Sep 12 03:01:37 2021 -0600 Merge branch 'development' into shitcan-savedflags commit bd647af Merge: 69f17ef 0e12f5e Author: Video <videogamesm12@gmail.com> Date: Sun Sep 12 02:50:39 2021 -0600 Merge branch 'development' into FS-215 commit 69f17ef Merge: ee1b27f aebe1ac Author: Video <videogamesm12@gmail.com> Date: Sun Sep 12 02:01:56 2021 -0600 Merge branch 'development' into FS-215 commit ee1b27f Merge: 2bdf14f 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 01:24:00 2021 +0100 Merge branch 'development' into FS-215 commit 2d18d46 Merge: a4c81f2 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 01:23:44 2021 +0100 Merge branch 'development' into shitcan-savedflags commit 47e6386 Merge: b1062fb 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 01:23:13 2021 +0100 Merge branch 'development' into FS-273 commit 2bdf14f Merge: f6d46b6 44ff621 Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 15:26:13 2021 -0600 Merge branch 'development' into FS-215 commit b1062fb Merge: f69feed 44ff621 Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 14:39:32 2021 -0600 Merge branch 'development' into FS-273 commit f69feed Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 01:14:21 2021 -0600 fixed commit 8253f94 Merge: daf0126 54cb0cf Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 01:12:00 2021 -0600 Merge branch 'development' into FS-273 commit a4c81f2 Merge: 0d09c3a 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:23:06 2021 +0100 Merge branch 'development' into shitcan-savedflags commit daf0126 Merge: a51f5c9 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:07:39 2021 +0100 Merge branch 'development' into FS-273 commit f6d46b6 Merge: ee804d5 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:07:33 2021 +0100 Merge branch 'development' into FS-215 commit a51f5c9 Author: Video <videogamesm12@gmail.com> Date: Fri Sep 3 13:53:33 2021 -0600 FS-273 commit ee804d5 Author: Video <videogamesm12@gmail.com> 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 0d09c3a Merge: e2ccd14 4c3f188 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Aug 29 20:09:03 2021 +0100 Merge branch 'development' into shitcan-savedflags commit e2ccd14 Author: Video <videogamesm12@gmail.com> Date: Fri Aug 27 16:54:55 2021 -0600 Unsaves SavedFlags commit bf2323b Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 02:44:23 2021 -0700 Squashed commit of the following: commit a42cb6a Merge: 2ecfb88 01fdf76 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 02:41:34 2021 -0700 Merge pull request AtlasMediaGroup#125 from AtlasMediaGroup/shitcan-savedflags Shitcans SavedFlags commit 01fdf76 Merge: 58c21bb 2ecfb88 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:28:48 2021 -0700 Merge branch 'development' into shitcan-savedflags commit 2ecfb88 Merge: 42143c1 bb2ddf1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 09:15:16 2021 -0700 Merge pull request AtlasMediaGroup#130 from AtlasMediaGroup/FS-215 Makes [Discord] a hyperlink (FS-215) commit bb2ddf1 Merge: cf9fdc6 42143c1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 03:31:19 2021 -0700 Merge branch 'development' into FS-215 commit 58c21bb Merge: fdba119 42143c1 Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 03:30:48 2021 -0700 Merge branch 'development' into shitcan-savedflags commit cf9fdc6 Merge: 387ea6f a598c93 Author: Video <videogamesm12@gmail.com> Date: Fri Oct 8 01:43:33 2021 -0600 Merge branch 'development' into FS-215 commit 387ea6f Merge: a1ecf88 180cd81 Author: Video <videogamesm12@gmail.com> Date: Fri Oct 1 00:35:12 2021 -0600 Merge branch 'development' into FS-215 commit a1ecf88 Merge: bd647af 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:48:59 2021 +0100 Merge branch 'development' into FS-215 commit fdba119 Merge: 61857dd 213a433 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Sep 12 13:48:44 2021 +0100 Merge branch 'development' into shitcan-savedflags commit 61857dd Merge: 2d18d46 0e12f5e Author: Video <videogamesm12@gmail.com> Date: Sun Sep 12 03:01:37 2021 -0600 Merge branch 'development' into shitcan-savedflags commit bd647af Merge: 69f17ef 0e12f5e Author: Video <videogamesm12@gmail.com> Date: Sun Sep 12 02:50:39 2021 -0600 Merge branch 'development' into FS-215 commit 69f17ef Merge: ee1b27f aebe1ac Author: Video <videogamesm12@gmail.com> Date: Sun Sep 12 02:01:56 2021 -0600 Merge branch 'development' into FS-215 commit ee1b27f Merge: 2bdf14f 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 01:24:00 2021 +0100 Merge branch 'development' into FS-215 commit 2d18d46 Merge: a4c81f2 0a9b95b Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 11 01:23:44 2021 +0100 Merge branch 'development' into shitcan-savedflags commit 2bdf14f Merge: f6d46b6 44ff621 Author: Video <videogamesm12@gmail.com> Date: Mon Sep 6 15:26:13 2021 -0600 Merge branch 'development' into FS-215 commit a4c81f2 Merge: 0d09c3a 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:23:06 2021 +0100 Merge branch 'development' into shitcan-savedflags commit f6d46b6 Merge: ee804d5 23caa4e Author: Ryan <Wild1145@users.noreply.github.com> Date: Sat Sep 4 01:07:33 2021 +0100 Merge branch 'development' into FS-215 commit ee804d5 Author: Video <videogamesm12@gmail.com> 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 0d09c3a Merge: e2ccd14 4c3f188 Author: Ryan <Wild1145@users.noreply.github.com> Date: Sun Aug 29 20:09:03 2021 +0100 Merge branch 'development' into shitcan-savedflags commit e2ccd14 Author: Video <videogamesm12@gmail.com> Date: Fri Aug 27 16:54:55 2021 -0600 Unsaves SavedFlags commit 5849947 Author: Video <videogamesm12@gmail.com> Date: Mon Nov 29 02:35:36 2021 -0700 This should fix it commit f190bbe Author: Video <videogamesm12@gmail.com> Date: Tue Nov 23 00:27:57 2021 -0700 FS-292
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Should be good enough, but feedback would be lovely.