TheDeusGroup/TFM-4.3-Reloaded
1
0
Fork 0
mirror of https://github.com/TheDeus-Group/TFM-4.3-Reloaded.git synced 2024-12-23 03:44:57 +00:00
Code Issues Projects Releases Wiki Activity
972 commits 3 branches 32 tags 40 MiB
Commit graph

972 commits

This branch
This branch
All branches
Author SHA1 Message Date
business-goose
a9e1e2f9e7 Add @saxnbt to list of developers 2022-03-21 20:13:09 +00:00
business-goose
c9d4caffed Revert "Default tag to their rank's tag" 
This reverts commit 37f7c97637.
 2022-03-21 20:11:30 +00:00
business-goose
37f7c97637 Default tag to their rank's tag 2022-03-21 20:08:09 +00:00
business-goose
8e4f0381e2 Merge branch 'main' of https://github.com/TheDeus-Group/TFM-4.3-Reloaded 2022-03-21 20:06:55 +00:00
Business Goose
dbb706783b
Merge pull request #18 from saxnbt/main 
Add saveable tags
 2022-03-21 20:06:30 +00:00
Eva
9030869fb0
Create playerTags.yml 2022-03-21 20:01:47 +00:00
Eva
4a376fb674
Update TotalFreedomMod.java 2022-03-21 20:01:17 +00:00
Eva
d6b5585a49
Update PlayerListener.java 2022-03-21 20:00:03 +00:00
Eva
54faffdfec
Update Command_tag.java 2022-03-21 19:59:29 +00:00
Eva
1bb4f57b5a
Create TagConfiguration.java 2022-03-21 19:59:00 +00:00
business-goose
68a93fc9c1 Add support for admin chat discord bridge 2022-03-21 19:11:17 +00:00
business-goose
7539c9e117 Revert "Register commands through Bukkit" 
This reverts commit 2d543a92
 2022-03-21 17:29:19 +00:00
business-goose
846c4350e7 Cleanup code 2022-03-21 17:11:24 +00:00
business-goose
ef4d2c46d8 Round TPS instead of flooring 2022-03-21 17:11:04 +00:00
business-goose
ae97ecacd1 Add uptime discord command and add penis exception (closes #10) 2022-03-21 16:58:59 +00:00
business-goose
c2b7cc9e19 Merge remote-tracking branch 'origin/main' 2022-03-21 16:46:18 +00:00
business-goose
2fbec562f7 Explicitly log Discord messages (closes #13) 2022-03-21 16:31:50 +00:00
Business Goose
c69ca08b1b
Merge pull request #14 from LunaWasFlaggedAgain/main 
Register commands through Bukkit
 2022-03-21 16:28:54 +00:00
business-goose
9741bae1fe Add admin console discord command (closes #1) and fix discord command arguments not being properly sent to the executed discord command. 2022-03-21 16:28:24 +00:00
business-goose
dcac3e3822 Add TPS command (closes #7) 2022-03-21 16:28:23 +00:00
Luna
df834a44a4 Merge branch 'main' of github.com:LunaWasFlaggedAgain/TFM-4.3-Reloaded 2022-03-21 13:26:31 -03:00
Luna
349704cfa5 use TotalFreedoMod.plugin instead of setup() 2022-03-21 13:26:14 -03:00
Luna
5732aeb697
add me to credits 
idk
 2022-03-21 13:04:18 -03:00
Luna
2d543a925a Register commands through Bukkit 2022-03-21 13:02:24 -03:00
business-goose
e1e466b454 Add getMaxMem(), getTotalMem(), getFreeMem() and getUptime() to the Server class 2022-03-21 14:35:31 +00:00
business-goose
06f80b244e Add server.getTPS() which queries Essentials for the TPS 2022-03-21 14:29:39 +00:00
business-goose
23fdf715f5 Make a discord command handler 2022-03-21 14:24:30 +00:00
Business Goose
06499c69b1
Merge pull request #11 from LunaWasFlaggedAgain/main 
Fix /premium command
 2022-03-21 13:09:29 +00:00
Luna
8cd08fbb72 Fix /premium command 2022-03-21 10:04:11 -03:00
business-goose
63c1b71056 Add attachment support (thanks to @LunaWasFlaggedAgain) & fix markdown sanitization sanitizing too much (i.e. the server has stopped, started etc.) 2022-03-21 10:13:02 +00:00
business-goose
8c39aa8fef Minimize jar 2022-03-21 10:12:18 +00:00
business-goose
5ad82c0dea Remove unused comment 2022-03-21 09:30:06 +00:00
business-goose
792f3d0590 Add color code support for chat format 2022-03-21 09:29:32 +00:00
business-goose
583e8909e9 Merge branch 'main' of https://github.com/TheDeus-Group/TFM-4.3-Reloaded 2022-03-21 09:28:50 +00:00
business-goose
5c2e785669 Add color code support for Discord bridge 2022-03-21 09:26:24 +00:00
Business Goose
22c174f9ef
Merge pull request #9 from saxnbt/patch-4 
Sanitize Markdowns
 2022-03-21 08:56:05 +00:00
Eva
fb6f45a6a5
Sanitize Markdowns 
This should hopefully fix the markdown issue, it is the same regex used in my other bot (SBot) which uses a discord bridge and works effectively.
 2022-03-21 00:46:15 +00:00
Business Goose
67e84fb498
Merge pull request #5 from saxnbt/patch-3 
please fix this haram typo
 2022-03-20 21:32:57 +00:00
Eva
ccfc5e037f
please fix this haram typo 2022-03-20 21:31:34 +00:00
Business Goose
8e8d95ce9b
Merge pull request #2 from TheDeus-Group/development 
Optimize discord list command
 2022-03-20 17:56:09 +00:00
business-goose
cb7f603928 Remove old commented out code 2022-03-20 17:52:05 +00:00
business-goose
26275745d0 Optimize the way we list players from Discord 2022-03-20 17:03:50 +00:00
business-goose
3eb979e36b Add getWithRank() and getInGameUsernames(), also implement getOrdinal() and getPlural() 2022-03-20 17:02:00 +00:00
business-goose
4c13ea79cc Use CraftBukkit API instead of Bukkit API 2022-03-20 17:01:30 +00:00
business-goose
80a240bf09 Make announcer no longer spam the Discord bridge 2022-03-20 16:01:28 +00:00
business-goose
0cc0839861 Add plurals for most ranks and add ordinals that rank them by power. 2022-03-20 15:23:02 +00:00
business-goose
565152e09a Initial commit 2022-03-20 12:35:43 +00:00
Jerom van der Sar
21c0833f14 Rename dependency names to match wiki 2015-06-07 17:21:05 +02:00
JeromSar
c002fbc537 Handle player online check in AsyncPlayerPreLoginEvent 
Apparently, online players with the same username are kicked before PlayerLoginEvent is called. This commit moves the online player check to AsyncPlayerPreloginEvent so the default behaviour can still be modified

Fixes #642
 2015-05-30 20:51:49 +02:00
JeromSar
a4d8f4646e Properly block /jail and /unjail 
They're both aliases, /togglejail is the actual command
 2015-05-30 20:13:11 +02:00