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 <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 b711ed517f
Merge: 1c464729
2618d97a
Author: elmon <elmon11bussiness@gmail.com>
Date: Mon Jan 24 22:16:24 2022 +0100
Merge branch 'development' into Elmon11-patch-2
commit 2618d97a3e
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 1c4647290a
Merge: f00f67a8
850f1210
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 f00f67a844
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 850f12103c
Merge: 2eb0ab4c
7fd77f3c
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 7fd77f3cbb
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 2eb0ab4cb1
Merge: 8cff0124
2612aaec
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 2612aaec31
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 8cff0124ea
Merge: 35965b0b
1162f10e
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 1162f10ebb
Merge: 7ce173e0
35965b0b
Author: Video <videogamesm12@gmail.com>
Date: Mon Nov 29 06:31:18 2021 -0700
Merge branch 'development' into FS-37
commit 35965b0b10
Merge: aa20a6e5
1253732f
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 1253732f77
Merge: e1bee321
aa20a6e5
Author: Video <videogamesm12@gmail.com>
Date: Mon Nov 29 06:25:25 2021 -0700
Merge branch 'development' into FS-256
commit 7ce173e02b
Merge: 4d006ed1
aa20a6e5
Author: Video <videogamesm12@gmail.com>
Date: Mon Nov 29 06:24:34 2021 -0700
Merge branch 'development' into FS-37
commit aa20a6e579
Merge: 70622900
1ecfb0b0
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 e1bee32163
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 4d006ed172
Merge: 8cbfde8b
70622900
Author: Video <videogamesm12@gmail.com>
Date: Mon Nov 29 03:04:42 2021 -0700
Merge branch 'development' into FS-37
commit 1ecfb0b066
Merge: 225ade87
70622900
Author: Video <videogamesm12@gmail.com>
Date: Mon Nov 29 03:01:22 2021 -0700
Merge branch 'development' into FS-7
commit 706229004c
Merge: a42cb6af
a4adfa9b
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 a4adfa9bee
Merge: 1b5bbd1c
a42cb6af
Author: Video <videogamesm12@gmail.com>
Date: Mon Nov 29 02:46:41 2021 -0700
Merge branch 'development' into FS-273
commit 225ade8753
Merge: afe755f5
a42cb6af
Author: Video <videogamesm12@gmail.com>
Date: Mon Nov 29 02:46:02 2021 -0700
Merge branch 'development' into FS-7
commit 8cbfde8bbc
Merge: bba5ec92
a42cb6af
Author: Video <videogamesm12@gmail.com>
Date: Mon Nov 29 02:41:49 2021 -0700
Merge branch 'development' into FS-37
commit a42cb6aff9
Merge: 2ecfb886
01fdf766
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 01fdf766ee
Merge: 58c21bb1
2ecfb886
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 09:28:48 2021 -0700
Merge branch 'development' into shitcan-savedflags
commit afe755f5c1
Merge: 5f97e68e
2ecfb886
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 09:26:59 2021 -0700
Merge branch 'development' into FS-7
commit 5f97e68e0e
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 09:26:49 2021 -0700
fuck it, it works
commit 1b5bbd1c05
Merge: 8356e831
2ecfb886
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 09:16:21 2021 -0700
Merge branch 'development' into FS-273
commit 2ecfb88604
Merge: 42143c11
bb2ddf11
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 8356e831a5
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 09:11:16 2021 -0700
Redundancy fix and better protection system
commit ab00cb840f
Merge: ecce62f6
42143c11
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 03:31:45 2021 -0700
Merge branch 'development' into FS-273
commit bb2ddf1129
Merge: cf9fdc6f
42143c11
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 03:31:19 2021 -0700
Merge branch 'development' into FS-215
commit bba5ec922b
Merge: 68adaed9
42143c11
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 03:31:13 2021 -0700
Merge branch 'development' into FS-37
commit 58c21bb1aa
Merge: fdba119d
42143c11
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 03:30:48 2021 -0700
Merge branch 'development' into shitcan-savedflags
commit 68adaed997
Merge: 087b8dd7
a598c933
Author: Video <videogamesm12@gmail.com>
Date: Sat Oct 9 00:09:24 2021 -0600
Merge branch 'development' into FS-37
commit ecce62f6b4
Merge: d8148530
a598c933
Author: Video <videogamesm12@gmail.com>
Date: Sat Oct 9 00:01:22 2021 -0600
Merge branch 'development' into FS-273
commit cf9fdc6fe4
Merge: 387ea6f7
a598c933
Author: Video <videogamesm12@gmail.com>
Date: Fri Oct 8 01:43:33 2021 -0600
Merge branch 'development' into FS-215
commit 387ea6f71e
Merge: a1ecf881
180cd811
Author: Video <videogamesm12@gmail.com>
Date: Fri Oct 1 00:35:12 2021 -0600
Merge branch 'development' into FS-215
commit d814853036
Merge: 47e63869
213a4338
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Sep 12 13:49:05 2021 +0100
Merge branch 'development' into FS-273
commit a1ecf88109
Merge: bd647afe
213a4338
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Sep 12 13:48:59 2021 +0100
Merge branch 'development' into FS-215
commit 5a6a5ff75d
Merge: 6ca61d9c
213a4338
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Sep 12 13:48:50 2021 +0100
Merge branch 'development' into FS-7
commit fdba119d5d
Merge: 61857dd0
213a4338
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Sep 12 13:48:44 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit 087b8dd7ea
Merge: 3818aab4
213a4338
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Sep 12 13:48:21 2021 +0100
Merge branch 'development' into FS-37
commit 3818aab454
Merge: caeda219
0e12f5e7
Author: Video <videogamesm12@gmail.com>
Date: Sun Sep 12 03:04:08 2021 -0600
Merge branch 'development' into FS-37
commit 61857dd06f
Merge: 2d18d461
0e12f5e7
Author: Video <videogamesm12@gmail.com>
Date: Sun Sep 12 03:01:37 2021 -0600
Merge branch 'development' into shitcan-savedflags
commit bd647afe92
Merge: 69f17ef2
0e12f5e7
Author: Video <videogamesm12@gmail.com>
Date: Sun Sep 12 02:50:39 2021 -0600
Merge branch 'development' into FS-215
commit 69f17ef2d7
Merge: ee1b27fa
aebe1ace
Author: Video <videogamesm12@gmail.com>
Date: Sun Sep 12 02:01:56 2021 -0600
Merge branch 'development' into FS-215
commit caeda219fa
Merge: 3ca98352
0a9b95bf
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 11 15:26:37 2021 +0100
Merge branch 'development' into FS-37
commit ee1b27fa0d
Merge: 2bdf14f3
0a9b95bf
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 11 01:24:00 2021 +0100
Merge branch 'development' into FS-215
commit 6ca61d9c6c
Merge: fedf80b8
0a9b95bf
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 11 01:23:52 2021 +0100
Merge branch 'development' into FS-7
commit 2d18d461fe
Merge: a4c81f20
0a9b95bf
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 11 01:23:44 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit 47e6386907
Merge: b1062fbb
0a9b95bf
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 11 01:23:13 2021 +0100
Merge branch 'development' into FS-273
commit fedf80b834
Merge: a2d11d4b
44ff621d
Author: Video <videogamesm12@gmail.com>
Date: Fri Sep 10 01:39:16 2021 -0600
Merge branch 'development' into FS-7
commit 2bdf14f38c
Merge: f6d46b61
44ff621d
Author: Video <videogamesm12@gmail.com>
Date: Mon Sep 6 15:26:13 2021 -0600
Merge branch 'development' into FS-215
commit b1062fbb6c
Merge: f69feed4
44ff621d
Author: Video <videogamesm12@gmail.com>
Date: Mon Sep 6 14:39:32 2021 -0600
Merge branch 'development' into FS-273
commit 3ca9835257
Merge: da82b270
54cb0cfa
Author: Video <videogamesm12@gmail.com>
Date: Mon Sep 6 01:16:04 2021 -0600
Merge branch 'development' into FS-37
commit f69feed469
Author: Video <videogamesm12@gmail.com>
Date: Mon Sep 6 01:14:21 2021 -0600
fixed
commit 8253f94ac4
Merge: daf0126f
54cb0cfa
Author: Video <videogamesm12@gmail.com>
Date: Mon Sep 6 01:12:00 2021 -0600
Merge branch 'development' into FS-273
commit a4c81f202c
Merge: 0d09c3a5
23caa4e8
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 4 01:23:06 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit da82b27016
Merge: af1df228
23caa4e8
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 4 01:07:55 2021 +0100
Merge branch 'development' into FS-37
commit daf0126f45
Merge: a51f5c9b
23caa4e8
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 4 01:07:39 2021 +0100
Merge branch 'development' into FS-273
commit f6d46b6178
Merge: ee804d52
23caa4e8
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 4 01:07:33 2021 +0100
Merge branch 'development' into FS-215
commit a2d11d4b93
Merge: dc490659
23caa4e8
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 4 01:07:28 2021 +0100
Merge branch 'development' into FS-7
commit a51f5c9bbf
Author: Video <videogamesm12@gmail.com>
Date: Fri Sep 3 13:53:33 2021 -0600
FS-273
commit ee804d52ff
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 dc490659c1
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 0d09c3a550
Merge: e2ccd14e
4c3f188b
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Aug 29 20:09:03 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit e2ccd14eb3
Author: Video <videogamesm12@gmail.com>
Date: Fri Aug 27 16:54:55 2021 -0600
Unsaves SavedFlags
commit af1df22812
Merge: 1474a808
f380898b
Author: Video <videogamesm12@gmail.com>
Date: Thu Aug 26 23:05:58 2021 -0600
Merge branch 'development' into FS-37
commit 1474a80875
Merge: 77fd4ff6
f45466ee
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Thu Aug 26 13:26:44 2021 +0100
Merge branch 'development' into FS-37
commit 77fd4ff66a
Merge: 33aca2a4
d901cbaa
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Aug 21 21:34:04 2021 +0100
Merge branch 'development' into FS-37
commit 33aca2a482
Merge: 159eda73
0582c2e5
Author: Video <videogamesm12@gmail.com>
Date: Tue Aug 10 22:38:51 2021 -0600
Merge branch 'development' into FS-37
commit 159eda73a1
Merge: da2d2525
6874b2ce
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Tue Aug 10 17:34:12 2021 +0100
Merge branch 'development' into FS-37
commit da2d25252b
Merge: e99aaa2e
c8a4382a
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Tue Aug 10 17:31:13 2021 +0100
Merge branch 'development' into FS-37
commit e99aaa2eb4
Author: Video <videogamesm12@gmail.com>
Date: Thu Aug 5 00:32:23 2021 -0600
Fixes FS-37
Fixes an oversight introduced in 76bb2d08ac
in which the configuration is loaded twice.
2022-02-21 16:45:03 -07:00
Video
e9ba958a4e
Squashed commit of the following:
...
commit 35965b0b10
Merge: aa20a6e5
1253732f
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 1253732f77
Merge: e1bee321
aa20a6e5
Author: Video <videogamesm12@gmail.com>
Date: Mon Nov 29 06:25:25 2021 -0700
Merge branch 'development' into FS-256
commit aa20a6e579
Merge: 70622900
1ecfb0b0
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 e1bee32163
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 1ecfb0b066
Merge: 225ade87
70622900
Author: Video <videogamesm12@gmail.com>
Date: Mon Nov 29 03:01:22 2021 -0700
Merge branch 'development' into FS-7
commit 706229004c
Merge: a42cb6af
a4adfa9b
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 a4adfa9bee
Merge: 1b5bbd1c
a42cb6af
Author: Video <videogamesm12@gmail.com>
Date: Mon Nov 29 02:46:41 2021 -0700
Merge branch 'development' into FS-273
commit 225ade8753
Merge: afe755f5
a42cb6af
Author: Video <videogamesm12@gmail.com>
Date: Mon Nov 29 02:46:02 2021 -0700
Merge branch 'development' into FS-7
commit a42cb6aff9
Merge: 2ecfb886
01fdf766
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 01fdf766ee
Merge: 58c21bb1
2ecfb886
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 09:28:48 2021 -0700
Merge branch 'development' into shitcan-savedflags
commit afe755f5c1
Merge: 5f97e68e
2ecfb886
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 09:26:59 2021 -0700
Merge branch 'development' into FS-7
commit 5f97e68e0e
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 09:26:49 2021 -0700
fuck it, it works
commit 1b5bbd1c05
Merge: 8356e831
2ecfb886
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 09:16:21 2021 -0700
Merge branch 'development' into FS-273
commit 2ecfb88604
Merge: 42143c11
bb2ddf11
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 8356e831a5
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 09:11:16 2021 -0700
Redundancy fix and better protection system
commit ab00cb840f
Merge: ecce62f6
42143c11
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 03:31:45 2021 -0700
Merge branch 'development' into FS-273
commit bb2ddf1129
Merge: cf9fdc6f
42143c11
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 03:31:19 2021 -0700
Merge branch 'development' into FS-215
commit 58c21bb1aa
Merge: fdba119d
42143c11
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 03:30:48 2021 -0700
Merge branch 'development' into shitcan-savedflags
commit ecce62f6b4
Merge: d8148530
a598c933
Author: Video <videogamesm12@gmail.com>
Date: Sat Oct 9 00:01:22 2021 -0600
Merge branch 'development' into FS-273
commit cf9fdc6fe4
Merge: 387ea6f7
a598c933
Author: Video <videogamesm12@gmail.com>
Date: Fri Oct 8 01:43:33 2021 -0600
Merge branch 'development' into FS-215
commit 387ea6f71e
Merge: a1ecf881
180cd811
Author: Video <videogamesm12@gmail.com>
Date: Fri Oct 1 00:35:12 2021 -0600
Merge branch 'development' into FS-215
commit d814853036
Merge: 47e63869
213a4338
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Sep 12 13:49:05 2021 +0100
Merge branch 'development' into FS-273
commit a1ecf88109
Merge: bd647afe
213a4338
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Sep 12 13:48:59 2021 +0100
Merge branch 'development' into FS-215
commit 5a6a5ff75d
Merge: 6ca61d9c
213a4338
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Sep 12 13:48:50 2021 +0100
Merge branch 'development' into FS-7
commit fdba119d5d
Merge: 61857dd0
213a4338
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Sep 12 13:48:44 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit 61857dd06f
Merge: 2d18d461
0e12f5e7
Author: Video <videogamesm12@gmail.com>
Date: Sun Sep 12 03:01:37 2021 -0600
Merge branch 'development' into shitcan-savedflags
commit bd647afe92
Merge: 69f17ef2
0e12f5e7
Author: Video <videogamesm12@gmail.com>
Date: Sun Sep 12 02:50:39 2021 -0600
Merge branch 'development' into FS-215
commit 69f17ef2d7
Merge: ee1b27fa
aebe1ace
Author: Video <videogamesm12@gmail.com>
Date: Sun Sep 12 02:01:56 2021 -0600
Merge branch 'development' into FS-215
commit ee1b27fa0d
Merge: 2bdf14f3
0a9b95bf
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 11 01:24:00 2021 +0100
Merge branch 'development' into FS-215
commit 6ca61d9c6c
Merge: fedf80b8
0a9b95bf
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 11 01:23:52 2021 +0100
Merge branch 'development' into FS-7
commit 2d18d461fe
Merge: a4c81f20
0a9b95bf
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 11 01:23:44 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit 47e6386907
Merge: b1062fbb
0a9b95bf
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 11 01:23:13 2021 +0100
Merge branch 'development' into FS-273
commit fedf80b834
Merge: a2d11d4b
44ff621d
Author: Video <videogamesm12@gmail.com>
Date: Fri Sep 10 01:39:16 2021 -0600
Merge branch 'development' into FS-7
commit 2bdf14f38c
Merge: f6d46b61
44ff621d
Author: Video <videogamesm12@gmail.com>
Date: Mon Sep 6 15:26:13 2021 -0600
Merge branch 'development' into FS-215
commit b1062fbb6c
Merge: f69feed4
44ff621d
Author: Video <videogamesm12@gmail.com>
Date: Mon Sep 6 14:39:32 2021 -0600
Merge branch 'development' into FS-273
commit f69feed469
Author: Video <videogamesm12@gmail.com>
Date: Mon Sep 6 01:14:21 2021 -0600
fixed
commit 8253f94ac4
Merge: daf0126f
54cb0cfa
Author: Video <videogamesm12@gmail.com>
Date: Mon Sep 6 01:12:00 2021 -0600
Merge branch 'development' into FS-273
commit a4c81f202c
Merge: 0d09c3a5
23caa4e8
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 4 01:23:06 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit daf0126f45
Merge: a51f5c9b
23caa4e8
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 4 01:07:39 2021 +0100
Merge branch 'development' into FS-273
commit f6d46b6178
Merge: ee804d52
23caa4e8
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 4 01:07:33 2021 +0100
Merge branch 'development' into FS-215
commit a2d11d4b93
Merge: dc490659
23caa4e8
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 4 01:07:28 2021 +0100
Merge branch 'development' into FS-7
commit a51f5c9bbf
Author: Video <videogamesm12@gmail.com>
Date: Fri Sep 3 13:53:33 2021 -0600
FS-273
commit ee804d52ff
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 dc490659c1
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 0d09c3a550
Merge: e2ccd14e
4c3f188b
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Aug 29 20:09:03 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit e2ccd14eb3
Author: Video <videogamesm12@gmail.com>
Date: Fri Aug 27 16:54:55 2021 -0600
Unsaves SavedFlags
2021-11-29 06:40:26 -07:00
Video
a29392cab2
Squashed commit of the following:
...
commit 706229004c
Merge: a42cb6af
a4adfa9b
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 a4adfa9bee
Merge: 1b5bbd1c
a42cb6af
Author: Video <videogamesm12@gmail.com>
Date: Mon Nov 29 02:46:41 2021 -0700
Merge branch 'development' into FS-273
commit a42cb6aff9
Merge: 2ecfb886
01fdf766
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 01fdf766ee
Merge: 58c21bb1
2ecfb886
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 09:28:48 2021 -0700
Merge branch 'development' into shitcan-savedflags
commit 1b5bbd1c05
Merge: 8356e831
2ecfb886
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 09:16:21 2021 -0700
Merge branch 'development' into FS-273
commit 2ecfb88604
Merge: 42143c11
bb2ddf11
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 8356e831a5
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 09:11:16 2021 -0700
Redundancy fix and better protection system
commit ab00cb840f
Merge: ecce62f6
42143c11
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 03:31:45 2021 -0700
Merge branch 'development' into FS-273
commit bb2ddf1129
Merge: cf9fdc6f
42143c11
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 03:31:19 2021 -0700
Merge branch 'development' into FS-215
commit 58c21bb1aa
Merge: fdba119d
42143c11
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 03:30:48 2021 -0700
Merge branch 'development' into shitcan-savedflags
commit ecce62f6b4
Merge: d8148530
a598c933
Author: Video <videogamesm12@gmail.com>
Date: Sat Oct 9 00:01:22 2021 -0600
Merge branch 'development' into FS-273
commit cf9fdc6fe4
Merge: 387ea6f7
a598c933
Author: Video <videogamesm12@gmail.com>
Date: Fri Oct 8 01:43:33 2021 -0600
Merge branch 'development' into FS-215
commit 387ea6f71e
Merge: a1ecf881
180cd811
Author: Video <videogamesm12@gmail.com>
Date: Fri Oct 1 00:35:12 2021 -0600
Merge branch 'development' into FS-215
commit d814853036
Merge: 47e63869
213a4338
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Sep 12 13:49:05 2021 +0100
Merge branch 'development' into FS-273
commit a1ecf88109
Merge: bd647afe
213a4338
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Sep 12 13:48:59 2021 +0100
Merge branch 'development' into FS-215
commit fdba119d5d
Merge: 61857dd0
213a4338
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Sep 12 13:48:44 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit 61857dd06f
Merge: 2d18d461
0e12f5e7
Author: Video <videogamesm12@gmail.com>
Date: Sun Sep 12 03:01:37 2021 -0600
Merge branch 'development' into shitcan-savedflags
commit bd647afe92
Merge: 69f17ef2
0e12f5e7
Author: Video <videogamesm12@gmail.com>
Date: Sun Sep 12 02:50:39 2021 -0600
Merge branch 'development' into FS-215
commit 69f17ef2d7
Merge: ee1b27fa
aebe1ace
Author: Video <videogamesm12@gmail.com>
Date: Sun Sep 12 02:01:56 2021 -0600
Merge branch 'development' into FS-215
commit ee1b27fa0d
Merge: 2bdf14f3
0a9b95bf
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 11 01:24:00 2021 +0100
Merge branch 'development' into FS-215
commit 2d18d461fe
Merge: a4c81f20
0a9b95bf
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 11 01:23:44 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit 47e6386907
Merge: b1062fbb
0a9b95bf
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 11 01:23:13 2021 +0100
Merge branch 'development' into FS-273
commit 2bdf14f38c
Merge: f6d46b61
44ff621d
Author: Video <videogamesm12@gmail.com>
Date: Mon Sep 6 15:26:13 2021 -0600
Merge branch 'development' into FS-215
commit b1062fbb6c
Merge: f69feed4
44ff621d
Author: Video <videogamesm12@gmail.com>
Date: Mon Sep 6 14:39:32 2021 -0600
Merge branch 'development' into FS-273
commit f69feed469
Author: Video <videogamesm12@gmail.com>
Date: Mon Sep 6 01:14:21 2021 -0600
fixed
commit 8253f94ac4
Merge: daf0126f
54cb0cfa
Author: Video <videogamesm12@gmail.com>
Date: Mon Sep 6 01:12:00 2021 -0600
Merge branch 'development' into FS-273
commit a4c81f202c
Merge: 0d09c3a5
23caa4e8
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 4 01:23:06 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit daf0126f45
Merge: a51f5c9b
23caa4e8
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 4 01:07:39 2021 +0100
Merge branch 'development' into FS-273
commit f6d46b6178
Merge: ee804d52
23caa4e8
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 4 01:07:33 2021 +0100
Merge branch 'development' into FS-215
commit a51f5c9bbf
Author: Video <videogamesm12@gmail.com>
Date: Fri Sep 3 13:53:33 2021 -0600
FS-273
commit ee804d52ff
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 0d09c3a550
Merge: e2ccd14e
4c3f188b
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Aug 29 20:09:03 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit e2ccd14eb3
Author: Video <videogamesm12@gmail.com>
Date: Fri Aug 27 16:54:55 2021 -0600
Unsaves SavedFlags
2021-11-29 03:03:00 -07:00
Video
bf2323bed2
Squashed commit of the following:
...
commit a42cb6aff9
Merge: 2ecfb886
01fdf766
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 01fdf766ee
Merge: 58c21bb1
2ecfb886
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 09:28:48 2021 -0700
Merge branch 'development' into shitcan-savedflags
commit 2ecfb88604
Merge: 42143c11
bb2ddf11
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 bb2ddf1129
Merge: cf9fdc6f
42143c11
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 03:31:19 2021 -0700
Merge branch 'development' into FS-215
commit 58c21bb1aa
Merge: fdba119d
42143c11
Author: Video <videogamesm12@gmail.com>
Date: Tue Nov 23 03:30:48 2021 -0700
Merge branch 'development' into shitcan-savedflags
commit cf9fdc6fe4
Merge: 387ea6f7
a598c933
Author: Video <videogamesm12@gmail.com>
Date: Fri Oct 8 01:43:33 2021 -0600
Merge branch 'development' into FS-215
commit 387ea6f71e
Merge: a1ecf881
180cd811
Author: Video <videogamesm12@gmail.com>
Date: Fri Oct 1 00:35:12 2021 -0600
Merge branch 'development' into FS-215
commit a1ecf88109
Merge: bd647afe
213a4338
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Sep 12 13:48:59 2021 +0100
Merge branch 'development' into FS-215
commit fdba119d5d
Merge: 61857dd0
213a4338
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Sep 12 13:48:44 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit 61857dd06f
Merge: 2d18d461
0e12f5e7
Author: Video <videogamesm12@gmail.com>
Date: Sun Sep 12 03:01:37 2021 -0600
Merge branch 'development' into shitcan-savedflags
commit bd647afe92
Merge: 69f17ef2
0e12f5e7
Author: Video <videogamesm12@gmail.com>
Date: Sun Sep 12 02:50:39 2021 -0600
Merge branch 'development' into FS-215
commit 69f17ef2d7
Merge: ee1b27fa
aebe1ace
Author: Video <videogamesm12@gmail.com>
Date: Sun Sep 12 02:01:56 2021 -0600
Merge branch 'development' into FS-215
commit ee1b27fa0d
Merge: 2bdf14f3
0a9b95bf
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 11 01:24:00 2021 +0100
Merge branch 'development' into FS-215
commit 2d18d461fe
Merge: a4c81f20
0a9b95bf
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 11 01:23:44 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit 2bdf14f38c
Merge: f6d46b61
44ff621d
Author: Video <videogamesm12@gmail.com>
Date: Mon Sep 6 15:26:13 2021 -0600
Merge branch 'development' into FS-215
commit a4c81f202c
Merge: 0d09c3a5
23caa4e8
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 4 01:23:06 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit f6d46b6178
Merge: ee804d52
23caa4e8
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sat Sep 4 01:07:33 2021 +0100
Merge branch 'development' into FS-215
commit ee804d52ff
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 0d09c3a550
Merge: e2ccd14e
4c3f188b
Author: Ryan <Wild1145@users.noreply.github.com>
Date: Sun Aug 29 20:09:03 2021 +0100
Merge branch 'development' into shitcan-savedflags
commit e2ccd14eb3
Author: Video <videogamesm12@gmail.com>
Date: Fri Aug 27 16:54:55 2021 -0600
Unsaves SavedFlags
2021-11-29 02:44:23 -07:00
Video
f190bbeac1
FS-292
2021-11-23 00:27:57 -07:00
Video
abfa3b977c
Whoops
...
This commit fixes 2 things:
1. A redundant check that was completely unnecessary
2. A loophole in my original bugfix commit I didn't initially discover until afterwards which enables players to do the same thing except with right clicking instead
The block inspector should be completely rewritten in the future, but for now it works.
2021-11-13 02:35:30 -07:00
Video
74a71b1843
Important bugfix
...
It appears someone had an extremely big brain moment.
2021-10-04 16:02:39 -06:00
Video
032e54e2d4
Multiple birds, one commit
...
Here's a list of things I've fixed/mitigated:
- Range bans in ban-related commands (FS-209)
- Bug in /tempban where the duration in the broadcast is always wrong
- Over-complicated handling of /tempban durations (instead of trying to process them and silently fail, it'll flat out say that an invalid duration is well, invalid)
- Inconsistent "player not found" messages in banning commands
- (Mitigates) weird issue with case-sensitive usernames in banning commands when the server has restarted since a player last joined
- (Mitigates) banned IPs being inaccurate when a player was banned offline whilst containing multiple IPs in their playerdata
- Redoing how MovementValidator handled positive and negative infinity exploit items, completely removing the need for Mojangson in the first place and allowing the plugin to run without Essentials once more in the process (related to FS-406)
Here is what I've done in addition:
- Merged /tban and /noob into /tempban, which now bans for 5 minutes by default (FS-205)
2021-09-06 04:44:39 -06:00
Video
54cb0cfac4
FS-409 ( #124 )
...
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2021-09-05 14:51:43 +01:00
Ryan
23caa4e853
Dependency Fix & Improvements ( #132 )
...
* Upgrade Test
Going to see if switching to the new repo that went live 3 days ago and updating TFM to pull the latest version of Essentials is going to help things here. TFM is building locally so I haven't a fucking scooby doo why Github can't run the build because I've even tried dropping the M2 folder...
* Let's try again
Utter bullshit so far.
* Apparently we don't even use essentials...
No idea where the imports for EssentialsBridge are coming from...
* Various tweaks
Hopefully this might give some more joy, but if not it's removed a command I didn't want anyway and reduced our dependency tree.
I have also switched it to using the ATLAS Artafactory which will serve as an ongoing cache for dependencies and should start to speed up our Github builds as Maven is rubbish with many repo's.
2021-09-04 01:07:04 +01:00
Ivan
f380898bb7
yo remove my name ( #123 )
...
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2021-08-26 16:22:08 +01:00
Video
6874b2ce13
Fixes /setlevel by completely removing it (FS-82) ( #95 )
...
To quote Ryan:
> If /exp works (and we've said it has) then the scope of this ticket will be to just go remove the TFM command...
This does exactly that.
2021-08-10 17:33:48 +01:00
Video
3f89f3f48e
Shut the fuck up Codacy
2021-08-10 06:58:04 -06:00
Video
871acc2eeb
Actually, let's make it possible to disable it if needed
2021-08-10 04:13:23 -06:00
Video
a9c9979b1c
FS-218
2021-08-10 04:06:41 -06:00
Video
4ac9844534
Merge branch 'development' into FS-309
2021-07-12 22:53:44 -06:00
Ryan
92bbb62379
Temporarily re-naming /clearchat to /cleanchat ( #91 )
...
* Temporarily re-naming /clearchat to /cleanchat
Due to another plugin which currently doesn't quite have all the permissions working, this command is not currently able to be executed as it stands.
* Shhh I know I'm an idiot
2021-07-05 23:29:22 +01:00
Video
e4a0943af2
Merge branch 'development' into FS-309
2021-06-29 22:00:13 -06:00
Video
36bd8c0fad
2 bugfixes
...
- Fixes FS-309 by checking if a material provided is actually a block before caging someone.
- Fixes a bug that causes the command to throw an ArrayOutOfBoundsException if one were to use a command like `/cage player1 block`.
2021-06-29 21:52:46 -06:00
Nathan Curran
d77f59435b
Use 'getPlayer()' to prevent NPE (FS-159) ( #87 )
...
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2021-06-26 15:06:15 +01:00
Video
a08fd2afb6
Adds /seed command (FS-225) ( #85 )
...
* Create Command_seed.java
* Addresses requested changes
* My IDE decided to try to "fix" things with *s in imports
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2021-06-26 14:25:08 +01:00
Ryan
a6ca6b122c
Merge branch 'development' into FS-239-to-FS-242
2021-06-18 13:24:15 +01:00
Video
064e73f58b
ez ( #77 )
2021-06-18 13:16:52 +01:00
Video
32138b2e59
Order of operations fix
2021-06-17 13:41:25 -06:00
Video
e1c3bad4d0
Even more punishment log types
...
Here's what I've changed in this commit:
- Adds /blockcmd to the punishment log (FS-239)
- Adds /blockedit and /blockpvp to the punishment log (FS-240)
- Adds /cage to the punishment log (FS-241)
- Adds /orbit to the punishment log (FS-242)
- Changes the order of operations in some commands to be a bit more consistent
2021-06-17 06:56:52 -06:00
Video
721f4f9fc3
Merge branch 'development' into FS-307
2021-06-17 05:56:56 -06:00
Video
c238f251f2
Merge branch 'development' into FS-201
2021-06-17 05:46:40 -06:00
Video
9550f54e2b
Merge branch 'development' into FS-199
2021-06-17 05:37:30 -06:00
Video
5b6d8b01a4
Merge branch 'development' into FS-24-Round-2
2021-06-17 05:25:42 -06:00
Video
be700a90ce
Simple fix
2021-06-16 22:42:45 -06:00
Video
6d1fce1716
FS-201
2021-06-16 22:06:12 -06:00
Video
d3665f31fe
Shut up Codacy
2021-06-16 21:56:25 -06:00
Video
4188cb80fa
FS-54
2021-06-16 21:10:08 -06:00
Video
62fe72d99b
Code quality and consistency improvements
...
Here's all the changes I've made in this commit:
- Resolves FS-44 (AutoEject.java)
- Resolves FS-45 (BlockBlocker.java)
- Resolves FS-47 and FS-48 (InteractBlocker.java)
- Resolves FS-49 (Command_cage.java)
- Resolves FS-50 (Command_manageshop.java)
- Resolves FS-51 (Command_notes.java)
- Resolves FS-52 (Command_potion.java)
- Resolves FS-53 (Command_tag.java)
- Resolves FS-55 (ItemFun.java)
- Resolves FS-56 (Module_list.java)
- Resolves FS-57 (Module_players.java)
- Removes redundant code from InteractBlocker.java
- Misc. code consistency corrections (global)
2021-06-16 21:10:08 -06:00
Video
f4749559d2
FS-25
2021-06-16 21:10:08 -06:00
Video
ed815794ed
FS-26
2021-06-16 21:10:08 -06:00
Video
0c12a19d1d
FS-27
2021-06-16 21:10:08 -06:00
Video
96d47e8e0c
Update EntityWiper.java
2021-06-16 17:47:09 -06:00
Video
3027e2a18c
Two fixes, one commit
...
To kill two birds with one stone, I've done two fixes in this commit.
- Fixes issue that caused quiet warns to behave improperly (e.g. the warnings wouldn't increment if quiet)
- Added WARN to the PunishmentType list.
2021-06-16 17:29:57 -06:00
Video
da7e8f64aa
Continuation on that notes thing ( #74 )
...
I forgot to remove the dependency after I removed the code that used JSONMessage. This fixes that by removing both the repository and the dependency from the pom file.
2021-06-12 11:26:40 +01:00
Video
8c7bf365a0
Addresses FS-224 ( #70 )
2021-05-26 19:55:49 +10:00
Nathan Curran
eedb7a5375
Use long instead of int and use offset to check time (FS-181) ( #69 )
...
* Use long instead of int and use offset to check time (FS-181)
* Remove star import
2021-05-25 21:45:53 +10:00
Nathan Curran
d047cfc8ff
Calculate the player count without offline players (FS-247) ( #68 )
...
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2021-05-22 15:40:55 +01:00
Nathan Curran
9ff5da8d8f
Small modification to new TFGuilds (FS-255) ( #67 )
2021-05-22 15:06:34 +01:00
Nathan Curran
21af722e23
Name change for Fleek ( #64 )
2021-05-17 20:31:34 +10:00
Ryan
d170f6d323
Switched from -c to -ci ( #63 )
...
Resolves FS-219
2021-05-16 15:27:12 +01:00
Video
9dd0298f56
Bug fixes, improvements, and removals (FS-192) ( #46 )
...
* Three fixes
* Fixes /tempban throwing a NullPointerException when trying to get a player who isn't on the server but was in the past
* Fixes /tempban banning players for 24 hours regardless of the duration defined
* Fixes /list -t throwing a NullPointerException when performed from a non-player source (such as Telnet)
* Removes hubworld entriely
* Configurable blacklists for tag, muted commands, and wildcard
Changes:
* Moves globally blocked commands to the `global` subsection of the original `blocked_commands` section. You *will* need to update your configurations
* /wildcard's command blacklist is now configurable under the `wildcard` section in `blocked_commands`.
* The commands muted players can't use are now configurable under the `muted` section in `blocked_commands`.
* Removes some commented-out globally blocked command entries.
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2021-05-09 16:42:31 +01:00
Video
bdf4ca84e0
Why overcomplicating things is a horrifically bad idea ( #55 )
...
The longer I look into this plugin's code, the angrier I will become.
This fixes 2 bugs in the /potion command:
- Fixes non-admins being able to clear other players
- Fixes NPE caused when trying to add potion effects to players who are not on the server as a non-admin.
Both of these issues are caused by overcomplicating seemingly simple solutions, hence the name of this commit.
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
Co-authored-by: Nathan Curran <30569566+Focusvity@users.noreply.github.com>
2021-05-04 13:31:55 +01:00
Video
8a504bff07
Merge branch 'development' into FS-221
2021-05-03 22:15:20 -06:00