Commit Graph

1829 Commits

Author SHA1 Message Date
Paldiu
a849e01ce5
Merge pull request #12 from AtlasMediaGroup/FS-59
admin chat discord formatting (FS-59)
2020-12-29 15:34:48 -05:00
Ryan
0703ea685e
Merge branch 'development' into FS-59 2020-12-28 22:51:21 +00:00
Ryan
91dc89013c
Merge pull request #14 from AtlasMediaGroup/mojangson-update
Mojangson update
2020-12-28 22:44:20 +00:00
speed
5b8cf2798e Update pom.xml 2020-12-28 17:05:52 -05:00
speed
98158e0f27 mojangson update 2020-12-28 17:04:14 -05:00
Paldiu
c0ac0365eb
Merge pull request #13 from AtlasMediaGroup/Elmon11-patch-1
Make gcmd not work on admins

//MERGE COMMIT:
At least one build check passed, the failing check is irrelevant.
2020-12-28 07:41:58 -05:00
Elmon11
0c60cbc739
Update Command_gcmd.java 2020-12-28 00:18:05 +01:00
Elmon11
402a6be5ad
Make gcmd not work on admins 2020-12-28 00:04:57 +01:00
speed
9d131f0f24 ok codacy 2020-12-26 19:11:15 -05:00
speed
b9606fa0e3 admin chat discord formatting (FS-59) 2020-12-26 18:54:15 -05:00
speed
210b0f8b43 unnecessary 2020-12-24 20:07:09 -05:00
speed
585fdb7992 fix verification toggle breaking everything (FS-39) 2020-12-24 19:48:52 -05:00
speed
6d05e9b924
Merge pull request #10 from AtlasMediaGroup/maven-sec
Moved Repo's to HTTPS
2020-12-24 19:33:04 -05:00
Ryan
fb314170c1
Moved Repo's to HTTPS 2020-12-24 22:52:35 +00:00
speed
218d720b06
Merge pull request #9 from AtlasMediaGroup/FS-12
Update social links in line with live config
2020-12-24 14:18:33 -05:00
Ryan
7bf97a03c4
Update social links in line with live config
The current server config has these links and those ones commented out. While I do now own them not all of them I'm actively using but thought it'd be good to keep this sync'd up.

Resolves FS-12
2020-12-24 18:36:27 +00:00
speed
de496970d9 remove reddit system
jraw free 🦀🦀🦀
2020-12-24 13:09:42 -05:00
speed
c8ec171b11 Update Discord.java 2020-12-23 20:13:26 -05:00
speed
caf126f543 elmon
fix underscore italic thing
2020-12-23 20:09:57 -05:00
speed
a717cce3b5 fix admins being able to see senior commands 2020-12-18 21:43:24 -05:00
speed
ce32490b4d Update Module_list.java 2020-12-16 17:46:27 -05:00
Elmon11
5d882d9052
Update Module_list.java 2020-12-16 23:42:44 +01:00
Elmon11
7dfd6c0b8b
Update Module_list.java 2020-12-16 23:37:14 +01:00
Ryan
fa5c774f45
Remove developer who has been suspended indefintely. 2020-12-15 20:53:07 +00:00
speed
c356ecd168 formatting & rename stuff 2020-12-14 19:05:13 -05:00
SupItsDillon
f8ce64d6c3
Merge pull request #8 from SupItsDillon/development
FS-5 Allow the verification system to be enabled / disabled in config (2)
2020-12-14 19:09:57 +00:00
speed
39d5b610a1 Update WorldRestrictions.java 2020-12-12 12:59:19 -05:00
SupItsDillon
50643eb9ff
Update Command_verify.java
ood code again
2020-12-09 16:03:40 +00:00
SupItsDillon
687166e0a4
Update Discord.java
formatting screwed up
2020-12-09 16:00:18 +00:00
SupItsDillon
98ead06355
Update Command_manuallyverify.java
ood file
2020-12-09 15:59:12 +00:00
SupItsDillon
cbc3795ef2
Update Command_playerverification.java
i should really keep my files updates
2020-12-09 15:55:45 +00:00
SupItsDillon
b9d608222e
Update Command_playerverification.java
fixed codacy issue
2020-12-09 15:48:27 +00:00
SupItsDillon
777a66f8da
Update Discord.java
correct updated file
2020-12-09 15:37:31 +00:00
SupItsDillon
6441deceab
Update Command_playerverification.java
codacy is being fussy
2020-12-08 19:35:02 +00:00
SupItsDillon
1fedb1fad3
Update Discord.java
forgot to change this aswell
2020-12-08 19:28:47 +00:00
SupItsDillon
8b1cef3b83
Update Discord.java
whoops i did change something i didnt want to
2020-12-08 19:26:00 +00:00
SupItsDillon
81ef3d624a
Update Discord.java
cant remember if i changed anything since last commit
2020-12-08 19:17:06 +00:00
SupItsDillon
b0c0f17043
Update Command_manuallyverify.java
discord verify enable disable
2020-12-08 19:16:28 +00:00
SupItsDillon
fb3cdf3603
Update Command_playerverification.java
discord enable disable verification
2020-12-08 19:15:55 +00:00
SupItsDillon
950c975e8f
Update Command_verify.java
discord verification config
2020-12-08 19:15:17 +00:00
SupItsDillon
79c8ea301d
Update config.yml
config option for discord verification
2020-12-08 16:10:14 +00:00
SupItsDillon
7a11c9062d
Update ConfigEntry.java
config option for verification
2020-12-08 16:09:26 +00:00
SupItsDillon
2037775276
Update Discord.java
stuff to disable or enable discord verification
2020-12-08 16:08:31 +00:00
SupItsDillon
4a3ce64412
Merge pull request #1 from AtlasMediaGroup/development
updated stuff
2020-12-08 16:07:04 +00:00
Ryan
681695150a
Merge pull request #6 from AtlasMediaGroup/Wild1145-patch-1
Block new CoreProtect stuff better
2020-12-05 21:10:27 +00:00
Elmon11
e98682a1af
Delete Command_gsay.java
https://forum.totalfreedom.me/d/114-why-is-gchat-now-gsay-back/13
2020-12-05 22:05:29 +01:00
Ryan
92534640d4
Block new CoreProtect stuff better 2020-12-05 19:01:09 +00:00
speed
695ccd0e71 /list -a
/list -s still exists
2020-12-04 10:37:40 -05:00
speed
0be2aa718f ok 2020-12-03 20:50:30 -05:00
speed
b3b9c2ef43 \ 2020-12-03 20:46:10 -05:00