Telesphoreo
30e38d44a9
No maven
2022-03-25 15:44:24 -05:00
Telesphoreo
ea418bb916
Compiles
2022-03-25 15:42:21 -05:00
Telesphoreo
7d1705c79f
Merge branch 'development' of https://github.com/AtlasMediaGroup/TotalFreedomMod into development
2022-03-25 15:30:02 -05:00
Paldiu
2551d184ca
Merge pull request #211 from AtlasMediaGroup/RELEASE-2022.02
...
Release 2022.02
2022-03-11 18:09:21 -06:00
Video
f9eabf27d5
Merge pull request #205 from AtlasMediaGroup/fs-442
...
FS-442
2022-03-06 16:15:53 -07:00
Video
846154a723
will this work
2022-03-06 14:37:45 +00:00
Ryan Wild
804614d011
Bump to 2022.02-RC01 Release
...
Primarily adds 1.17 support, other fixes may be present, please see full release notes for info.
2022-02-23 23:23:14 +00:00
Paldiu
2c22c6c52d
Merge pull request #194 from AtlasMediaGroup/Wild1145-patch-1
...
Update various dependencies based on Freedom-01 State
2022-02-23 17:10:09 -06:00
Ryan
5ef0f29ffe
Merge branch 'development' into Wild1145-patch-1
2022-02-23 22:48:53 +00:00
Ryan
11134f4109
Merge pull request #197 from AtlasMediaGroup/FS-292
...
Uplifts the plugin to 1.17.1
2022-02-23 22:48:32 +00:00
Ryan
e7992c7eb4
Merge branch 'development' into Wild1145-patch-1
2022-02-22 21:17:02 +00:00
Ryan
82e966dfb0
Delete java11-maven.yml
2022-02-22 20:50:41 +00:00
Paldiu
f457c4cde2
Merge branch 'development' into FS-292
2022-02-21 18:08:29 -06:00
Video
004a0f3d7c
Update Groups.java
...
This should resolve the issues with spawn eggs and mobs.
2022-02-21 17:04:53 -07:00
Video
cf5199f28e
Squashed commit of the following:
...
commit 43c68579e5
Merge: 2618d97a
b711ed51
Author: elmon <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
elmon
43c68579e5
Merge pull request #190 from AtlasMediaGroup/Elmon11-patch-2
...
order of messages fix
2022-02-21 10:01:39 +01:00
Ryan
127ee7d9f9
Move CodeQL to Java 17
2022-02-18 16:50:45 +00:00
Ryan
c873fd4abc
Update pom.xml
2022-02-16 21:02:00 +00:00
Ryan
fa90e1d239
Update various dependencies based on Freedom-01 State
...
Various plugins have been updated but not reflected back here. This PR Corrects that.
2022-02-05 23:25:57 +00:00
elmon
b711ed517f
Merge branch 'development' into Elmon11-patch-2
2022-01-24 22:16:24 +01:00
Nathan Curran
2618d97a3e
Remove requireNonNull method from getIp, which causes NPE - resolves FS-429 ( #187 )
...
Co-authored-by: Paldiu <pawereus@gmail.com>
2022-01-24 12:42:47 +11:00
Nathan Curran
1c4647290a
Merge branch 'development' into Elmon11-patch-2
2022-01-24 12:41:47 +11:00
elmon
f00f67a844
order of messages fix
...
https://media.discordapp.net/attachments/874713176082636882/934559012991680532/unknown.png
2022-01-23 13:26:22 +01:00
Paldiu
850f12103c
Merge pull request #188 from AtlasMediaGroup/Wild1145-patch-1
...
Correct CoreProtect Version
2022-01-17 11:35:09 -06:00
Telesphoreo
7d71fc0a29
Pterodactyl integration is broken again
2022-01-16 17:48:23 -06:00
Telesphoreo
a33fd0d978
deadass just guessed the letters
2022-01-16 17:24:17 -06:00
Ryan
7fd77f3cbb
Correct CoreProtect Version
...
To align with the version running on Freedom-01 at the moment.
2022-01-16 18:22:16 +00:00
Video
2eb0ab4cb1
Merge pull request #179 from AtlasMediaGroup/FS-212
...
Makes spawnmob configurable, increases the default limit to 25 (FS-212)
2021-12-22 20:56:46 -07:00
Video
2612aaec31
Makes spawnmob configurable and increases the default limit to 25
2021-12-15 21:46:56 -07:00
Video
6e7ad73152
Nevermind that didn't work
2021-11-29 07:03:29 -07:00
Video
af6411b82c
Wait a second
...
This *should* work...
2021-11-29 06:54:04 -07:00
Video
e9ba958a4e
Squashed commit of the following:
...
commit 35965b0b10
Merge: aa20a6e5
1253732f
Author: Video <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
8cff0124ea
Merge pull request #93 from AtlasMediaGroup/FS-37
...
Fixes FS-37
2021-11-29 06:36:20 -07:00
Video
1162f10ebb
Merge branch 'development' into FS-37
2021-11-29 06:31:18 -07:00
Video
35965b0b10
Merge pull request #174 from AtlasMediaGroup/FS-256
...
Forces the server to recalculate the permissions server-wide in /opall (FS-256)
2021-11-29 06:31:11 -07:00
Video
1253732f77
Merge branch 'development' into FS-256
2021-11-29 06:25:25 -07:00
Video
7ce173e02b
Merge branch 'development' into FS-37
2021-11-29 06:24:34 -07:00
Video
aa20a6e579
Merge pull request #129 from AtlasMediaGroup/FS-7
...
Allow players to pay other players coins [FS-7]
2021-11-29 06:23:57 -07:00
Video
e1bee32163
Forces the server to recalculate the permissions server-wide in /opall
2021-11-29 03:27:07 -07:00
Video
4d006ed172
Merge branch 'development' into FS-37
2021-11-29 03:04:42 -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
1ecfb0b066
Merge branch 'development' into FS-7
2021-11-29 03:01:22 -07:00
Video
706229004c
Merge pull request #131 from AtlasMediaGroup/FS-273
...
Moves /rainbowtrail to the shop (FS-273)
2021-11-29 03:00:15 -07:00
Video
a4adfa9bee
Merge branch 'development' into FS-273
2021-11-29 02:46:41 -07:00
Video
225ade8753
Merge branch 'development' into FS-7
2021-11-29 02:46:02 -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
8cbfde8bbc
Merge branch 'development' into FS-37
2021-11-29 02:41:49 -07:00
Video
a42cb6aff9
Merge pull request #125 from AtlasMediaGroup/shitcan-savedflags
...
Shitcans SavedFlags
2021-11-29 02:41:34 -07:00
Video
5849947c6b
This should fix it
2021-11-29 02:35:36 -07:00
Video
01fdf766ee
Merge branch 'development' into shitcan-savedflags
2021-11-23 09:28:48 -07:00
Video
afe755f5c1
Merge branch 'development' into FS-7
2021-11-23 09:26:59 -07:00
Video
5f97e68e0e
fuck it, it works
2021-11-23 09:26:49 -07:00
Video
1b5bbd1c05
Merge branch 'development' into FS-273
2021-11-23 09:16:21 -07:00
Video
2ecfb88604
Merge pull request #130 from AtlasMediaGroup/FS-215
...
Makes [Discord] a hyperlink (FS-215)
2021-11-23 09:15:16 -07:00
Video
8356e831a5
Redundancy fix and better protection system
2021-11-23 09:11:16 -07:00
Video
ab00cb840f
Merge branch 'development' into FS-273
2021-11-23 03:31:45 -07:00
Video
bb2ddf1129
Merge branch 'development' into FS-215
2021-11-23 03:31:19 -07:00
Video
bba5ec922b
Merge branch 'development' into FS-37
2021-11-23 03:31:13 -07:00
Video
58c21bb1aa
Merge branch 'development' into shitcan-savedflags
2021-11-23 03:30:48 -07:00
Video
f190bbeac1
FS-292
2021-11-23 00:27:57 -07:00
Video
42143c1163
Merge pull request #168 from AtlasMediaGroup/main
...
merge down into development
2021-11-22 12:35:18 -07:00
Ryan
6453e4efca
Merge pull request #145 from AtlasMediaGroup/RELEASE-2021.09
...
Release 2021.09
2021-11-22 18:43:06 +00:00
Paldiu
9155ac90b5
Official Release
2021-11-22 12:29:54 -06:00
Video
1e1367d08f
Bump to RC03
2021-11-13 02:58:36 -07:00
Video
3f690e2ca1
Merge pull request #167 from AtlasMediaGroup/whoops
...
Fixes an oopsie I made whilst sleep deprived
2021-11-13 02:48:51 -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
Telesphoreo
a395197305
Actually generate a pom.xml for Maven publication
2021-10-17 14:51:05 -05:00
Telesphoreo
b5b71f8bb2
Update workflow
2021-10-17 14:19:33 -05:00
Telesphoreo
c592b1f141
Don't even know why these are here
2021-10-09 21:34:16 -05:00
Telesphoreo
f0ba148b81
Fix not being able to sync the project despite being able to build it
2021-10-09 21:16:20 -05:00
Telesphoreo
a8826c22cc
Not sure we need these repos anymore
2021-10-09 19:55:15 -05:00
Telesphoreo
17629f9366
Oop
2021-10-09 19:46:27 -05:00
Telesphoreo
725375a597
Merge branch 'development' of https://github.com/TotalFreedomMC/TotalFreedomMod into development
2021-10-09 19:42:13 -05:00
Telesphoreo
30fb1ebbd5
Fix Gradle build so you don't have to have Git
2021-10-09 19:42:11 -05:00
Telesphoreo
78e85787e6
Delete SECURITY.md
2021-10-09 19:21:51 -05:00
Telesphoreo
2636f2c768
Update README.md
2021-10-09 19:21:22 -05:00
Video
68adaed997
Merge branch 'development' into FS-37
2021-10-09 00:09:24 -06:00
Video
ecce62f6b4
Merge branch 'development' into FS-273
2021-10-09 00:01:22 -06:00
Video
cf9fdc6fe4
Merge branch 'development' into FS-215
2021-10-08 01:43:33 -06:00
Paldiu
a728ec24d4
Merge pull request #156 from AtlasMediaGroup/critical-inspect-bugfix
...
Critical Bugfix
2021-10-04 17:59:10 -05:00
Video
74a71b1843
Important bugfix
...
It appears someone had an extremely big brain moment.
2021-10-04 16:02:39 -06:00
Ryan
4d469cdc0a
Move from Java 16 to Java 17 ( #149 )
...
* Move from Java 16 to Java 17
* Update java17-maven.yml
2021-10-03 15:57:47 +01:00
Ryan Wild
4c287ca9b8
Bump to RC02
2021-10-03 15:50:33 +01:00
Video
912bc1a1e4
Merge pull request #154 from AtlasMediaGroup/development
...
Development
2021-10-03 07:02:37 -06:00
Video
a598c933ec
Merge pull request #151 from AtlasMediaGroup/FS-421
...
Two fixes (FS-421)
2021-10-03 06:52:45 -06:00
Video
936f0b621e
Stupid simple fix
...
Fixes an oopsie I made and an oopsie someone else made which broke the entire plugin.
2021-10-03 06:45:02 -06:00
Video
387ea6f71e
Merge branch 'development' into FS-215
2021-10-01 00:35:12 -06:00
Wild1145
e122c4c5fa
Bump to 2021.09-RC01 Release
2021-09-19 17:32:05 +01:00
dependabot[bot]
180cd81132
Bump junit-jupiter from 5.7.2 to 5.8.0 ( #139 )
...
Bumps [junit-jupiter](https://github.com/junit-team/junit5 ) from 5.7.2 to 5.8.0.
- [Release notes](https://github.com/junit-team/junit5/releases )
- [Commits](https://github.com/junit-team/junit5/compare/r5.7.2...r5.8.0 )
---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-13 09:58:54 +01:00
Ryan
d814853036
Merge branch 'development' into FS-273
2021-09-12 13:49:05 +01:00
Ryan
a1ecf88109
Merge branch 'development' into FS-215
2021-09-12 13:48:59 +01:00
Ryan
5a6a5ff75d
Merge branch 'development' into FS-7
2021-09-12 13:48:50 +01:00
Ryan
fdba119d5d
Merge branch 'development' into shitcan-savedflags
2021-09-12 13:48:44 +01:00
Ryan
087b8dd7ea
Merge branch 'development' into FS-37
2021-09-12 13:48:21 +01:00
dependabot[bot]
213a43380e
Bump git-commit-id-plugin from 4.0.2 to 4.9.10 ( #113 )
...
Bumps git-commit-id-plugin from 4.0.2 to 4.9.10.
---
updated-dependencies:
- dependency-name: pl.project13.maven:git-commit-id-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-12 12:13:56 +01:00
dependabot[bot]
8a31b4c5c0
Bump javassist from 3.27.0-GA to 3.28.0-GA ( #110 )
...
Bumps [javassist](https://github.com/jboss-javassist/javassist ) from 3.27.0-GA to 3.28.0-GA.
- [Release notes](https://github.com/jboss-javassist/javassist/releases )
- [Commits](https://github.com/jboss-javassist/javassist/commits )
---
updated-dependencies:
- dependency-name: org.javassist:javassist
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-12 11:33:52 +01:00
Video
3818aab454
Merge branch 'development' into FS-37
2021-09-12 03:04:08 -06:00
Video
61857dd06f
Merge branch 'development' into shitcan-savedflags
2021-09-12 03:01:37 -06:00
Video
bd647afe92
Merge branch 'development' into FS-215
2021-09-12 02:50:39 -06:00
dependabot[bot]
0e12f5e792
Bump commons-lang3 from 3.11 to 3.12.0 ( #111 )
...
Bumps commons-lang3 from 3.11 to 3.12.0.
---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-12 09:09:28 +01:00
Video
69f17ef2d7
Merge branch 'development' into FS-215
2021-09-12 02:01:56 -06:00
Video
aebe1acec2
Merge pull request #136 from AtlasMediaGroup/multiple-birds-one-stone
...
Multiple fixes, one commit
2021-09-12 01:57:32 -06:00
Video
938b3aa630
Merge branch 'development' into multiple-birds-one-stone
2021-09-11 20:53:16 -06:00
dependabot[bot]
6772333eb4
Bump junit-jupiter from 5.4.2 to 5.7.2 ( #103 )
...
Bumps [junit-jupiter](https://github.com/junit-team/junit5 ) from 5.4.2 to 5.7.2.
- [Release notes](https://github.com/junit-team/junit5/releases )
- [Commits](https://github.com/junit-team/junit5/compare/r5.4.2...r5.7.2 )
---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-12 00:10:47 +01:00
dependabot[bot]
0204961834
Bump commons-io from 2.8.0 to 2.11.0 ( #117 )
...
Bumps commons-io from 2.8.0 to 2.11.0.
---
updated-dependencies:
- dependency-name: commons-io:commons-io
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-11 23:53:41 +01:00
dependabot[bot]
2f332a8c42
Bump annotations from 20.1.0 to 22.0.0 ( #104 )
...
Bumps [annotations](https://github.com/JetBrains/java-annotations ) from 20.1.0 to 22.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases )
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md )
- [Commits](https://github.com/JetBrains/java-annotations/compare/20.1.0...22.0.0 )
---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-11 18:48:33 +01:00
dependabot[bot]
e288668c92
Bump maven-antrun-plugin from 1.8 to 3.0.0 ( #102 )
...
Bumps [maven-antrun-plugin](https://github.com/apache/maven-antrun-plugin ) from 1.8 to 3.0.0.
- [Release notes](https://github.com/apache/maven-antrun-plugin/releases )
- [Commits](https://github.com/apache/maven-antrun-plugin/compare/maven-antrun-plugin-1.8...maven-antrun-plugin-3.0.0 )
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-antrun-plugin
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-11 18:42:31 +01:00
Ryan
caeda219fa
Merge branch 'development' into FS-37
2021-09-11 15:26:37 +01:00
Ryan
e50101df43
Merge branch 'development' into multiple-birds-one-stone
2021-09-11 15:24:52 +01:00
Ryan
ee1b27fa0d
Merge branch 'development' into FS-215
2021-09-11 01:24:00 +01:00
Ryan
6ca61d9c6c
Merge branch 'development' into FS-7
2021-09-11 01:23:52 +01:00
Ryan
2d18d461fe
Merge branch 'development' into shitcan-savedflags
2021-09-11 01:23:44 +01:00
Ryan
47e6386907
Merge branch 'development' into FS-273
2021-09-11 01:23:13 +01:00
Ryan
0a9b95bfce
Move to new ATLAS Nexus ( #138 )
...
* Move to new ATLAS Nexus
Turns out jFrog is super expensive and 10GB of Bandwidth doesn't go far, this should make things a lot better :)
* Update pom.xml
* Update pom.xml
2021-09-11 01:19:08 +01:00
Video
fedf80b834
Merge branch 'development' into FS-7
2021-09-10 01:39:16 -06:00
Video
2bdf14f38c
Merge branch 'development' into FS-215
2021-09-06 15:26:13 -06:00
Video
b1062fbb6c
Merge branch 'development' into FS-273
2021-09-06 14:39:32 -06:00
Video
f00f075551
Merge branch 'development' into multiple-birds-one-stone
2021-09-06 14:38:42 -06:00
dependabot[bot]
44ff621d73
Bump bstats-bukkit from 1.8 to 2.2.1 ( #99 )
...
Bumps [bstats-bukkit](https://github.com/Bastian/bStats-Metrics ) from 1.8 to 2.2.1.
- [Release notes](https://github.com/Bastian/bStats-Metrics/releases )
- [Commits](https://github.com/Bastian/bStats-Metrics/commits/v2.2.1 )
---
updated-dependencies:
- dependency-name: org.bstats:bstats-bukkit
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
Resolves FS-419
2021-09-06 20:21:49 +01: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
3ca9835257
Merge branch 'development' into FS-37
2021-09-06 01:16:04 -06:00
Video
f69feed469
fixed
2021-09-06 01:14:21 -06:00
Video
8253f94ac4
Merge branch 'development' into FS-273
2021-09-06 01:12:00 -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
a4c81f202c
Merge branch 'development' into shitcan-savedflags
2021-09-04 01:23:06 +01:00
Ryan
da82b27016
Merge branch 'development' into FS-37
2021-09-04 01:07:55 +01:00
Ryan
daf0126f45
Merge branch 'development' into FS-273
2021-09-04 01:07:39 +01:00
Ryan
f6d46b6178
Merge branch 'development' into FS-215
2021-09-04 01:07:33 +01:00
Ryan
a2d11d4b93
Merge branch 'development' into FS-7
2021-09-04 01:07:28 +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
Video
a51f5c9bbf
FS-273
2021-09-03 13:53:33 -06:00
Video
ee804d52ff
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.
2021-09-03 12:52:15 -06:00
Video
dc490659c1
Begins implementing FS-7
...
should be good enough, but feedback would be lovely
2021-09-03 00:07:20 -06:00
Ryan
0d09c3a550
Merge branch 'development' into shitcan-savedflags
2021-08-29 20:09:03 +01:00
dependabot[bot]
4c3f188bb8
Bump actions/setup-java from 2.2.0 to 2.3.0 ( #122 )
...
Bumps [actions/setup-java](https://github.com/actions/setup-java ) from 2.2.0 to 2.3.0.
- [Release notes](https://github.com/actions/setup-java/releases )
- [Commits](https://github.com/actions/setup-java/compare/v2.2.0...v2.3.0 )
---
updated-dependencies:
- dependency-name: actions/setup-java
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2021-08-29 20:08:43 +01:00
Video
e2ccd14eb3
Unsaves SavedFlags
2021-08-27 16:54:55 -06:00
Video
af1df22812
Merge branch 'development' into FS-37
2021-08-26 23:05:58 -06: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
Ryan
464ed85f1b
Update java16-maven.yml
2021-08-26 16:18:58 +01:00
Ryan
7dd235b166
Update java11-maven.yml
2021-08-26 16:18:49 +01:00
Ryan
1474a80875
Merge branch 'development' into FS-37
2021-08-26 13:26:44 +01:00
Ryan
f45466ee24
Create java16-maven.yml
2021-08-26 13:01:20 +01:00
Ryan
d70b7bbec2
Split out Java 11 and Java 16 for faster runs
2021-08-26 13:00:19 +01:00
dependabot[bot]
541c66c3de
Bump codacy/codacy-analysis-cli-action from 1.1.0 to 4.0.0 ( #101 )
...
Bumps [codacy/codacy-analysis-cli-action](https://github.com/codacy/codacy-analysis-cli-action ) from 1.1.0 to 4.0.0.
- [Release notes](https://github.com/codacy/codacy-analysis-cli-action/releases )
- [Commits](https://github.com/codacy/codacy-analysis-cli-action/compare/1.1.0...4.0.0 )
---
updated-dependencies:
- dependency-name: codacy/codacy-analysis-cli-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-21 21:50:45 +01:00
Ryan
77fd4ff66a
Merge branch 'development' into FS-37
2021-08-21 21:34:04 +01:00
Ryan
d901cbaa81
Update pom.xml ( #121 )
...
* Update pom.xml
* Fix version from re-upload
2021-08-21 21:25:56 +01:00
Wild1145
538ed7020d
Merge branch 'development' of https://github.com/AtlasMediaGroup/TotalFreedomMod into development
2021-08-21 15:36:32 +01:00
Wild1145
18e6ef16be
Merge branch 'main' of https://github.com/AtlasMediaGroup/TotalFreedomMod into development
2021-08-21 15:36:26 +01:00
dependabot[bot]
a335a2acf7
Bump maven-checkstyle-plugin from 3.1.1 to 3.1.2 ( #114 )
...
Bumps [maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin ) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/apache/maven-checkstyle-plugin/releases )
- [Commits](https://github.com/apache/maven-checkstyle-plugin/compare/maven-checkstyle-plugin-3.1.1...maven-checkstyle-plugin-3.1.2 )
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-21 15:21:18 +01:00
Ryan
2eb6cc0036
Correct CoreProtect POM Version ( #108 )
...
Co-authored-by: Video <videogamesm12@gmail.com>
2021-08-18 23:45:56 +01:00
dependabot[bot]
dccc315869
Bump actions/setup-java from 1.4.3 to 2.2.0 ( #98 )
...
* Bump actions/setup-java from 1.4.3 to 2.2.0
Bumps [actions/setup-java](https://github.com/actions/setup-java ) from 1.4.3 to 2.2.0.
- [Release notes](https://github.com/actions/setup-java/releases )
- [Commits](https://github.com/actions/setup-java/compare/v1.4.3...v2.2.0 )
---
updated-dependencies:
- dependency-name: actions/setup-java
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
* Fix the breaking change the 2.x branch of the action added
There is a breaking change which Dependabot hasn't picked up on which causes this to not play ball. This should resolve said issue.
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Wild1145 <Wild1145@users.noreply.github.com>
2021-08-17 20:50:03 +01:00
Video
33aca2a482
Merge branch 'development' into FS-37
2021-08-10 22:38:51 -06:00
Video
0582c2e5be
Merge pull request #94 from AtlasMediaGroup/FS-381
...
Enables Lava Damage by default (FS-381)
2021-08-10 22:38:24 -06:00
Ryan
159eda73a1
Merge branch 'development' into FS-37
2021-08-10 17:34:12 +01:00
Ryan
101987cc17
Merge branch 'development' into FS-381
2021-08-10 17:34:03 +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
Ryan
3be0ffba4e
Merge branch 'development' into FS-381
2021-08-10 17:31:26 +01:00
Ryan
da2d25252b
Merge branch 'development' into FS-37
2021-08-10 17:31:13 +01:00
Video
c8a4382a7b
Merge pull request #96 from AtlasMediaGroup/FS-218
...
Adds functionality for a one-time message to be sent to new players (FS-218)
2021-08-10 07:41:42 -06: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
fc3fe871b3
FS-381
2021-08-05 00:43:01 -06:00
Video
e99aaa2eb4
Fixes FS-37
...
Fixes an oversight introduced in 76bb2d08ac
in which the configuration is loaded twice.
2021-08-05 00:32:23 -06:00
Ryan Wild
62529a6171
Merge branch 'main' of https://github.com/AtlasMediaGroup/TotalFreedomMod into development
2021-07-17 13:18:18 +01:00
Paldiu
0caf972248
Merge pull request #90 from AtlasMediaGroup/FS-309
...
2 bugfixes, one command (FS-309)
2021-07-16 09:05:57 -05:00
Video
4ac9844534
Merge branch 'development' into FS-309
2021-07-12 22:53:44 -06:00
Ryan
d99f3e657b
Let's actually do dependency uplifts ( #89 )
2021-07-08 20:48:27 +01: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
6fd075fe96
Start building Java 16 ( #84 )
...
* Start building Java 16
* Re-apply Fleek's change
* Removed the shitty Github auto formatted white space.
* Update to the maven build in Github workflows
Given TravisCI has started to charge, I guess this might be what we move back to using as our main way to verify if something can actually build.
* Update maven.yml
* Delete .travis.yml
2021-06-24 21:21:39 +01:00
Video
f57fc56f4a
Merge pull request #83 from AtlasMediaGroup/FS-239-to-FS-242
...
Logs even more punishment types (FS-239, FS-240, FS-241, FS-242)
2021-06-19 03:20:47 -06: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
4e78027f0c
Merge pull request #79 from AtlasMediaGroup/FS-307
...
Fixes the EntityWiper not toggling properly (FS-307)
2021-06-17 06:12:26 -06:00
Video
721f4f9fc3
Merge branch 'development' into FS-307
2021-06-17 05:56:56 -06:00
Video
24ad2611a9
Merge pull request #81 from AtlasMediaGroup/FS-201
...
Admins can now see commands of everyone, regardless of rank (FS-201)
2021-06-17 05:54:10 -06:00
Video
c238f251f2
Merge branch 'development' into FS-201
2021-06-17 05:46:40 -06:00
Video
02848e3439
Merge pull request #82 from AtlasMediaGroup/FS-199
...
Prevents entities of type PLAYER from being purged in /entitywipe (FS-199)
2021-06-17 05:46:28 -06:00
Video
9550f54e2b
Merge branch 'development' into FS-199
2021-06-17 05:37:30 -06:00
Video
39dade78e3
Merge pull request #80 from AtlasMediaGroup/FS-24-Round-2
...
Code quality improvements (FS-24)
2021-06-17 05:35:55 -06:00
Video
5b6d8b01a4
Merge branch 'development' into FS-24-Round-2
2021-06-17 05:25:42 -06:00
Video
96bc83cead
Merge pull request #78 from AtlasMediaGroup/FS-207
...
Two fixes, one commit (FS-207)
2021-06-17 04:58:26 -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
Ryan
06025b2e69
Updated permissions to re-baseline with the dev server ( #75 )
...
Updating this to be based off of the dev server as it seems this has not been updated in some time. Primary purpose is to add the crackshot bypass removal for everyone (Though allow admins to bypass) and to add a start of network manager perms in the hopes it makes it more usable going forward.
2021-06-13 19:51:27 +01: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
Ryan Wild
a498104777
Merge branch 'main' of github.com:AtlasMediaGroup/TotalFreedomMod into development
2021-06-07 16:22:43 +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
Ryan
ac615f54f7
Add //g to blocked commands ( #62 )
...
Co-authored-by: Nathan Curran <30569566+Focusvity@users.noreply.github.com>
2021-05-21 22:44:51 +01:00
Nathan Curran
21af722e23
Name change for Fleek ( #64 )
2021-05-17 20:31:34 +10:00
Nathan Curran
b1196fcf00
Added new dependency to allow TFM to compile ( #65 )
2021-05-17 06:50:09 +01: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
Ryan
7258d7f1bf
Merge pull request #58 from AtlasMediaGroup/FS-221
...
Remove a number of wipe commands we don't want anyway
2021-05-04 12:59:31 +01:00
Video
8a504bff07
Merge branch 'development' into FS-221
2021-05-03 22:15:20 -06:00
Ryan
c00e64f736
Merge pull request #54 from VideoGameSmash12/FS-137
...
Assistant executive discord integration (FS-137)
2021-05-03 20:14:35 +01:00
Ryan
9e73db0f24
Merge branch 'development' into FS-137
2021-05-03 19:46:59 +01:00
Ryan
951c061d77
Merge pull request #57 from AtlasMediaGroup/Elmon11-patch-2
...
grammar fix
2021-05-03 19:46:37 +01:00
Ryan
579d3e0719
Merge branch 'development' into Elmon11-patch-2
2021-05-03 19:13:39 +01:00
Ryan
9777733d04
Merge pull request #53 from VideoGameSmash12/ride-typo
...
Fixes typo in /ride
2021-05-03 19:13:26 +01:00
Ryan
05e118dcb4
Merge branch 'development' into ride-typo
2021-05-03 18:21:16 +01:00
Ryan
7a0d6f49f4
Merge pull request #52 from VideoGameSmash12/FS-156
...
Fixes typo in the Lightning Rod's name (FS-156)
2021-05-03 18:20:20 +01:00
Ryan
19f1b7f6bd
Merge branch 'development' into Elmon11-patch-2
2021-05-03 15:45:54 +01:00
Ryan
b12afbdc1f
Merge branch 'development' into FS-137
2021-05-03 15:45:45 +01:00
Ryan
49e77d4f93
Merge branch 'development' into ride-typo
2021-05-03 15:45:36 +01:00
Ryan
eb9107bedf
Merge branch 'development' into FS-156
2021-05-03 15:45:25 +01:00
Ryan
951c699ed0
Remove a number of wipe commands we don't want anyway
...
We shouldn't be wiping any of this data within the server now anyway so let's not tempt fate again.
2021-05-03 15:44:05 +01:00
Elmon11
6895e46375
Merge branch 'development' into ride-typo
2021-05-02 14:15:15 +02:00
Elmon11
1cf46c7337
grammar fix
2021-05-02 14:03:48 +02:00
Video
407b63e48b
Fixes FS-137
2021-04-26 01:23:24 -06:00
Video
be562fe722
ok, done (FS-156)
2021-04-26 00:58:28 -06:00
Video
928ab41d7f
Update Command_ride.java
2021-04-26 00:37:16 -06:00