TotalFreedomMC/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TotalFreedomMod.git synced 2024-06-22 22:10:36 +00:00
Code Issues Projects Releases Wiki Activity
1856 commits 7 branches 35 tags 8.2 MiB
Commit graph

1856 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Bergh 7af53448be Potion command fix and refreshment 
The potion command didn't work for OPs due to some misstake that made it think that all commands were executed on other players (a staff only feature).
It now instead uses switches to execute for better performance and readability.
 2020-09-06 21:25:15 +02:00
William Bergh 2072c89f77 Merge branch 'development' of https://github.com/TFPatches/TotalFreedomMod into development 2020-09-06 18:52:04 +02:00
Telesphoreo 43b266f17d Update NMS + Use PaperLib for teleportAsync 2020-08-30 19:13:46 -05:00
Telesphoreo c61f7e78fd Update for 1.16.2 2020-08-30 14:39:07 -05:00
William Bergh 14ab1e95b5 Merge branch 'development' of https://github.com/TFPatches/TotalFreedomMod into development 2020-08-30 00:27:13 +02:00
Telesphoreo 44fe8f6f94
Merge pull request #279 from speedxx/development 
fix spectral arrows bypassing pvp blocking
 2020-08-28 10:16:37 -05:00
speedxx 1c487a6a60 fix spectral arrows bypassing pvp blocking 2020-08-27 14:55:39 -04:00
William Bergh 6f4cc8d4b5 Optimized FAWE bridge 2020-08-24 22:44:45 +02:00
Telesphoreo f98f6990ea
Merge pull request #278 from speedxx/patch-1 
:)
 2020-08-23 00:19:48 -05:00
speed 4c81c94702
:) 2020-08-22 13:04:03 -04:00
Seth aaa495cf41
Merge pull request #277 from speedxx/development 
use UUIDs for developers
 2020-08-19 19:42:54 -07:00
speedxx 72322f2e56 use UUIDs for developers 2020-08-19 21:19:15 -04:00
Telesphoreo 04fee7d5c1
Merge pull request #276 from speedxx/development 
fix vanish bug
 2020-08-18 23:18:34 -05:00
speedxx d38ddac311 fix vanish bug 2020-08-18 22:56:32 -04:00
CoolJWB d65f584707
Merge pull request #275 from CoolJWB/development 
Mistakes were made
 2020-08-18 17:24:30 +02:00
William Bergh ff42713f92 Mistakes were made 2020-08-18 17:22:43 +02:00
Telesphoreo 5047363f83
Merge pull request #274 from Focusvity/patch-1 
Make sure you check the code @CoolJWB
 2020-08-18 09:48:07 -05:00
Nathan Curran 34a0dae305
Make sure you check the code @CoolJWB 2020-08-18 18:23:19 +10:00
CoolJWB ebc07f6259
Merge pull request #273 from CoolJWB/development 
Updated my own code
 2020-08-18 09:40:56 +02:00
William Bergh 6a7a6e74e3 Update code 2020-08-18 09:37:19 +02:00
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
Telesphoreo f4007a7c9d Fix long standing bug with player notes 2020-08-17 23:53:21 -05:00
Telesphoreo f3a655d40d Merge branch 'development' of https://github.com/TFPatches/TotalFreedomMod into development 2020-08-17 21:21:21 -05:00
Telesphoreo 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
Telesphoreo 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
Telesphoreo 090c445aa9 seth kelly 2020-08-16 22:33:35 -05:00
Telesphoreo c936759b6c oup 2020-08-15 21:18:47 -05:00
Telesphoreo 36fc1a00b6 bru 2020-08-15 19:32:25 -05:00
Telesphoreo 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
Telesphoreo ed5d18c0df rip supervanish 2020-08-15 18:03:26 -05:00
Telesphoreo 04a7b633a4 it compiles now 2020-08-15 17:58:48 -05:00
Telesphoreo 7a810519f3 fuck intellij 2020-08-15 17:44:50 -05:00
Telesphoreo 53038ca3b2 fuck intellij 2020-08-15 17:42:46 -05:00
Telesphoreo e77d92407c Revert "forgot to pull" 
This reverts commit e4c9ea656e.
 2020-08-15 17:41:26 -05:00
Telesphoreo da80f1b69e Revert "Merge branch 'development' of https://github.com/TFPatches/TotalFreedomMod into development" 
This reverts commit 4407e9e6ec, reversing
changes made to e4c9ea656e.
 2020-08-15 17:41:23 -05:00
Telesphoreo 4407e9e6ec Merge branch 'development' of https://github.com/TFPatches/TotalFreedomMod into development 2020-08-15 17:09:03 -05:00
Telesphoreo 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