Commit Graph

2035 Commits

Author SHA1 Message Date
ca4670ed89
Merge pull request #290 from speedxx/development
getDeterminer() -> getArticle()
2020-10-25 12:43:34 -05:00
speed
adf71cb020
Update RankManager.java 2020-10-25 13:24:41 -04:00
Seth
6e84fdad23
Login messages
Last commit from me. Don't have the power but to me Packs is the new Lead Developer
2020-10-25 09:27:56 -07:00
2ecfd9610f br 2020-10-19 19:07:44 -05:00
bb33778fc9 [Maven] FAWE 2020-10-16 22:33:33 -05:00
d4d1000c16
Merge pull request #289 from Focusvity/pr/discord
Enable media tag to be included in messages
2020-10-16 21:36:38 -05:00
Nathan Curran
5a96204f1b
Tidy things up a bit 2020-10-16 17:51:21 +11:00
Nathan Curran
3bd72dacda
Enable media tag to be included in messages 2020-10-16 17:33:58 +11:00
a4c8dad865
Merge pull request #288 from Focusvity/pr/perm-config-fix
Fix NPE
2020-10-15 21:40:14 -05:00
Nathan Curran
82e7a3b659
Fix NPE (https://github.com/TFPatches/TotalFreedomMod/issues/287) 2020-10-16 13:37:25 +11:00
586fa98c32
Merge pull request #286 from Focusvity/pr/discord-media
Use Component API for attachments
2020-10-15 21:37:15 -05:00
Nathan Curran
a8f95bcb19
Use Component API for attachments 2020-10-16 13:20:20 +11:00
Seth
82d92565e7
lol 2020-10-13 13:37:11 -07:00
Seth
533e4fe369
Login messages for players. Still need to come up with login messaghes 2020-10-02 02:27:06 -07:00
Seth
f8304aecd7
fix 24 hour bans 2020-09-29 23:54:17 -07:00
Seth
ac6e58ff9e
and this is why I approve things before it goes on the server 2020-09-29 17:24:28 -07:00
4be2a1e05b throwback thursday 2020-09-27 22:53:11 -05:00
59831ef1f3 Finish the job 2020-09-27 22:17:01 -05:00
54e6e2f9b1 relying on someone else to look this over to see if i missed anything 2020-09-27 21:51:15 -05:00
d203772a9a This somehow got reverted back to the old version
Reblocks bigtree in the plotworld as it is used to grief. Players can still use the /tool tree comamnd from WorldEdit to achieve the same thing
2020-09-26 14:52:13 -05:00
55522e8191 quick bump for the october 2020 update 2020-09-25 20:36:58 -05:00
Seth
ac3d0fca88
Allow executives to manage the shop 2020-09-18 18:04:21 -07:00
eb6514332e fix the config issues 2020-09-14 21:58:46 -05:00
098d3e4cf1 i hope thisll work 2020-09-14 20:54:14 -05:00
Seth
81eb333b6a
Pterodactyl 2020-09-14 02:36:25 -07:00
3057421d6d Fixed the last bug for now 2020-09-12 14:42:12 -05:00
9cb96e81ac Fix all the bugs 2020-09-11 22:27:26 -05:00
d67189e170 e 2020-09-07 15:14:30 -05:00
CoolJWB
451ef8f009
Merge pull request #280 from CoolJWB/development
Potion command fix & performance
2020-09-06 21:28:22 +02:00
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
43b266f17d Update NMS + Use PaperLib for teleportAsync 2020-08-30 19:13:46 -05:00
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
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
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
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
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