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
35965b0b10
aa20a6e5
1253732f
1253732f77
e1bee321
aa20a6e579
70622900
1ecfb0b0
e1bee32163
1ecfb0b066
225ade87
706229004c
a42cb6af
a4adfa9b
a4adfa9bee
1b5bbd1c
225ade8753
afe755f5
a42cb6aff9
2ecfb886
01fdf766
01fdf766ee
58c21bb1
afe755f5c1
5f97e68e
5f97e68e0e
1b5bbd1c05
8356e831
2ecfb88604
42143c11
bb2ddf11
8356e831a5
ab00cb840f
ecce62f6
bb2ddf1129
cf9fdc6f
58c21bb1aa
fdba119d
ecce62f6b4
d8148530
a598c933
cf9fdc6fe4
387ea6f7
387ea6f71e
a1ecf881
180cd811
d814853036
47e63869
213a4338
a1ecf88109
bd647afe
5a6a5ff75d
6ca61d9c
fdba119d5d
61857dd0
61857dd06f
2d18d461
0e12f5e7
bd647afe92
69f17ef2
69f17ef2d7
ee1b27fa
aebe1ace
ee1b27fa0d
2bdf14f3
0a9b95bf
6ca61d9c6c
fedf80b8
2d18d461fe
a4c81f20
47e6386907
b1062fbb
fedf80b834
a2d11d4b
44ff621d
2bdf14f38c
f6d46b61
b1062fbb6c
f69feed4
f69feed469
8253f94ac4
daf0126f
54cb0cfa
a4c81f202c
0d09c3a5
23caa4e8
daf0126f45
a51f5c9b
f6d46b6178
ee804d52
a2d11d4b93
dc490659
a51f5c9bbf
ee804d52ff
dc490659c1
0d09c3a550
e2ccd14e
4c3f188b
e2ccd14eb3