William Bergh
1e36b484ac
Merge branch 'development' of https://github.com/TFPatches/TotalFreedomMod into development
...
Conflicts:
src/main/java/me/totalfreedom/totalfreedommod/Monitors.java
2020-08-18 09:32:05 +02:00
CoolJWB
efae9e314f
Merge pull request #264 from DragonSlayer2189/patch-4
...
added "kicked (user) quietly" msg
2020-08-18 09:29:35 +02:00
CoolJWB
ea946fe14f
Merge pull request #265 from DragonSlayer2189/patch-3
...
added "banned (user) quietly" message
2020-08-18 09:29:14 +02:00
CoolJWB
fc08761e70
Merge pull request #272 from Focusvity/pr/discord-msg
...
Prevent Discord from sending messages to the server
2020-08-18 09:27:05 +02:00
Nathan Curran
3f68677d99
Don't send empty messages
2020-08-18 15:52:19 +10:00
f4007a7c9d
Fix long standing bug with player notes
2020-08-17 23:53:21 -05:00
f3a655d40d
Merge branch 'development' of https://github.com/TFPatches/TotalFreedomMod into development
2020-08-17 21:21:21 -05:00
6b3a765c90
shorten Administrator
2020-08-17 21:21:13 -05:00
DragonSlayer2189
7e8a519c87
Update src/main/java/me/totalfreedom/totalfreedommod/command/Command_kick.java
...
Co-authored-by: Nathan Curran <30569566+Focusvity@users.noreply.github.com>
2020-08-17 19:00:07 -04:00
DragonSlayer2189
388e1fd52d
Update src/main/java/me/totalfreedom/totalfreedommod/command/Command_ban.java
...
Co-authored-by: Nathan Curran <30569566+Focusvity@users.noreply.github.com>
2020-08-17 18:59:26 -04:00
cdb28afba6
Merge pull request #271 from speedxx/development
...
index httpd module
2020-08-17 17:54:50 -05:00
speedxx
24575aba88
index httpd module
2020-08-17 18:17:45 -04:00
090c445aa9
seth kelly
2020-08-16 22:33:35 -05:00
c936759b6c
oup
2020-08-15 21:18:47 -05:00
36fc1a00b6
bru
2020-08-15 19:32:25 -05:00
7b9920dbc4
Merge pull request #268 from speedxx/development
...
stuff seth missed
2020-08-15 19:24:47 -05:00
speed
b0daf2066a
supervanish is gone
2020-08-15 20:17:54 -04:00
ed5d18c0df
rip supervanish
2020-08-15 18:03:26 -05:00
04a7b633a4
it compiles now
2020-08-15 17:58:48 -05:00
7a810519f3
fuck intellij
2020-08-15 17:44:50 -05:00
53038ca3b2
fuck intellij
2020-08-15 17:42:46 -05:00
e77d92407c
Revert "forgot to pull"
...
This reverts commit e4c9ea656e
2020-08-15 17:41:26 -05:00
da80f1b69e
Revert "Merge branch 'development' of https://github.com/TFPatches/TotalFreedomMod into development"
...
This reverts commit 4407e9e6ece4c9ea656e
2020-08-15 17:41:23 -05:00
4407e9e6ec
Merge branch 'development' of https://github.com/TFPatches/TotalFreedomMod into development
2020-08-15 17:09:03 -05:00
e4c9ea656e
forgot to pull
2020-08-15 17:08:39 -05:00
speedxx
63570d61d6
admins are seniors
2020-08-15 13:06:58 -04:00
speed
257a2eec33
no
2020-08-15 12:37:20 -04:00
speedxx
78b73b3b63
stuff seth missed
...
admin -> staff
2020-08-15 12:35:48 -04:00
William Bergh
d74846cde6
Fixed my bad code
2020-08-15 15:33:29 +02:00
Seth
3f4d34d172
Forgot to actually make sure this compiles lol
2020-08-14 23:48:31 -07:00
Seth
f5b5fcd5ef
Admins are now known as staff
...
To other developers: If you find places where staff are refered to as only admins pls fix it for me.
2020-08-14 23:44:57 -07:00
f42e047723
Merge pull request #267 from speedxx/development
...
fix exceptions, properly teleport player in /ride
2020-08-14 22:10:09 -05:00
speedxx
e79145ee54
fix exceptions, properly teleport player in /ride
...
- fixes ArrayIndexOutOfBoundsException in /ride
- teleport sender properly if target is in different world for /ride
- fixes IllegalArgumentException in /stopsound
2020-08-14 21:56:04 -04:00
DragonSlayer2189
6dbc99690a
added "kicked (user) quietly" msg
...
once again, did i do this right
2020-08-14 00:34:01 -04:00
DragonSlayer2189
8628e88e3a
added "banned (user) quietly" message
...
did i do this right, idk java
2020-08-14 00:29:50 -04:00
51e1191816
Increase range on tpr
2020-08-13 22:14:12 -05:00
e294ef8312
Reimplement vanish command
...
- SuperVanish has a wack permission system, and it didn't work in some rare circumstances. Added back TFMs vanish with the SuperVanish API
- Fixed the permission nodes so admins can see other admins, like how it was in TFM
2020-08-13 14:34:03 -05:00
541abb1ba8
whoever commented the shit out in the pom.xml: i hope both sides of your pillow are warm tonight
2020-08-12 22:07:15 -05:00
306c8bc8b9
ok
2020-08-12 18:51:10 -05:00
Seth
9f006325b4
This is no longer needed
2020-08-09 22:25:16 -07:00
Seth
aab4f55b7d
UUID definite bans
2020-08-09 22:25:04 -07:00
Seth
00f94e47f1
github is a love hate relationship
2020-08-09 17:49:52 -07:00
Seth
44b7307e4d
Revert "Revert "Permbans are now indefinite bans.""
...
This reverts commit 54df0e08f5
2020-08-09 17:49:35 -07:00
Seth
54df0e08f5
Revert "Permbans are now indefinite bans."
...
This reverts commit 4003db6dd9
2020-08-09 17:49:20 -07:00
Seth
4003db6dd9
Permbans are now indefinite bans.
2020-08-09 17:48:42 -07:00
Seth
f4f25c1590
useless
2020-08-09 17:47:53 -07:00
328225fe6e
Merge pull request #262 from speedxx/development
...
fix adminchat bug
2020-08-08 22:35:45 -05:00
speedxx
087e4a0d9c
fix adminchat bug
2020-08-08 23:20:06 -04:00
Seth
2ecde80b5f
AMP automation
2020-08-07 22:51:09 -07:00
Seth
075299dbd9
Merge pull request #261 from speedxx/development
...
-q arg for more commands
2020-08-07 18:45:00 -07:00
