Archiviert
1
0
Commit graph

379 Commits

Autor SHA1 Nachricht Datum
f5c834df11 Fix typo
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-27 23:53:06 +01:00
b3fbce3c2b Merge branch 'master' into moreMultiLingual
# Conflicts:
#	src/de/steamwar/messages/BungeeCore.properties
2020-11-27 23:50:09 +01:00
jojo
ad2d48ccde Merge branch 'master' into rework-BauServerHelp
# Conflicts:
#	src/de/steamwar/messages/BungeeCore.properties
2020-11-27 20:03:45 +01:00
feb0b36d61 Merge pull request 'Add PollResult Command' (#153) from pollresult into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-11-27 17:11:53 +01:00
Chaoscaot
71ad90ea2f Fixing Error Logging 2020-11-27 15:17:31 +01:00
Chaoscaot
06d18866b6 Add Multilang 2020-11-24 16:38:47 +01:00
Chaoscaot
842c6e046c Changing Messages 2020-11-23 18:58:32 +01:00
Chaoscaot
01f40b9440 Changing Messages 2020-11-23 18:26:04 +01:00
d9f1617235 Fix chat-msgs
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-22 08:49:54 +01:00
jojo
56b01d6ee6 Update Messages
Update HelpCommand
2020-11-20 09:53:43 +01:00
Chaoscaot
a3179483fd Changing Messages 2020-11-20 09:45:33 +01:00
Chaoscaot
8682bb9b66 Add PollResult Command 2020-11-20 01:06:47 +01:00
jojo
6c68aab3dd Fix HelpCommand 2020-11-19 22:35:19 +01:00
jojo
4ba2b56d19 Update '/help bau' 2020-11-19 22:03:50 +01:00
jojo
730b56e4ec Add /mute Multilingual support
Update properties
2020-11-19 17:20:01 +01:00
Chaoscaot
2d9f686ba8 Update Message Mute 2020-11-19 17:14:56 +01:00
Chaoscaot
293b037ffd Update Message 2020-11-19 17:13:02 +01:00
Chaoscaot
63ce857c45 Add MoreMultilingualTransfer 2020-11-18 14:23:46 +01:00
Chaoscaot
814c2f851d Merge branch 'moreMultiLingual' into ban-rework
# Conflicts:
#	src/de/steamwar/bungeecore/commands/BanCommand.java
2020-11-18 14:07:53 +01:00
Chaoscaot
3cb5eac639 Fixing Everything 2020-11-18 14:03:52 +01:00
Chaoscaot
4137ebb61b Fixing... 2020-11-16 15:47:28 +01:00
Chaoscaot
cfb12dfb75 Fixing Ban extended 2020-11-15 20:45:34 +01:00
Chaoscaot
aa73889ffe Fixing BannedUserIp Delete 2020-11-15 13:04:53 +01:00
Chaoscaot
5ee2d10308 Fixing BannedUserIp Delete 2020-11-15 13:04:31 +01:00
Chaoscaot
4dd593243e Fixing Recursive SQL Select 2020-11-15 12:23:44 +01:00
Chaoscaot
6607b736ee Fixing... 2020-11-15 11:02:23 +01:00
Chaoscaot
f20be78c59 Announce Bans and Mutes 2020-11-14 23:31:11 +01:00
Chaoscaot
2c026a1d21 Imports... 2020-11-14 23:25:39 +01:00
Chaoscaot
986b53fbf8 Reworked Ban and Mute 2020-11-14 23:23:49 +01:00
8c3df0e1dd Fix server order
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-06 13:41:05 +01:00
994f758d7c Merge pull request 'Added LiteLoader Blocking' (#144) from liteloader into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-11-01 19:02:10 +01:00
89d57e3f48 More multilingual transfer
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-01 18:26:21 +01:00
Chaoscaot
6b589ec5de LiteLoader 2020-11-01 09:38:16 +01:00
Chaoscaot
2f257929a8 LiteLoader 2020-10-31 11:11:11 +01:00
ff1c72233b Merge pull request 'Rework of the Codesite Group System' (#139) from change-color into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-10-31 10:47:42 +01:00
ad811d829c Merge pull request 'Remove PUB (Öffentlich) team from /team info after /softreload' (#145) from TeamInfo into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-10-31 10:44:12 +01:00
Chaoscaot
12e27ca6c0 Changed YouTube Name 2020-10-30 23:13:10 +01:00
Chaoscaot
bffb3f6c99 LireLoader 2020-10-30 23:05:49 +01:00
Chaoscaot
5d5df4ed2a Changed Supporter Color to &9 2020-10-30 22:40:57 +01:00
Chaoscaot
edd81c6ca6 Add Chatcolor to UserGroup 2020-10-30 22:34:29 +01:00
jojo
e46c608e4c Remove PUB (Öffentlich) team from /team info after /softreload 2020-10-30 22:33:44 +01:00
Chaoscaot
f1bac4c9d2 Merge branch 'master' into change-color 2020-10-30 22:17:05 +01:00
Chaoscaot
915c8d1d25 Fixing... 2020-10-30 22:16:55 +01:00
Chaoscaot
f411bc5d77 Merge branch 'master' into liteloader
# Conflicts:
#	src/de/steamwar/bungeecore/commands/FightCommand.java
2020-10-30 22:12:37 +01:00
Chaoscaot
7893d7a691 Added LiteLoader Blocking 2020-10-30 22:11:27 +01:00
a74af339aa Merge branch 'master' into eventMode
# Conflicts:
#	src/de/steamwar/bungeecore/SubserverSystem.java
2020-10-30 21:53:25 +01:00
Chaoscaot
be1aa30cd3 Removed Ban Limiting 2020-10-30 21:46:20 +01:00
Chaoscaot
349e67ed5c Refactored Ban Command to only allow downwards bans 2020-10-30 19:45:16 +01:00
Chaoscaot
6483729608 Refactored UserGroup 2020-10-30 17:08:17 +01:00
Chaoscaot
caeb47b3d2 Merge branch 'master' into change-color 2020-10-30 16:06:14 +01:00
84c2c2f825 Fix port clash
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-30 15:16:34 +01:00
f39b7787d9 Implementing event mode for event bungee
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-30 14:49:45 +01:00
b63b5f021c Shorten name for ranked matches
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-30 08:03:11 +01:00
f721cfaed6 Hotfix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-30 07:33:50 +01:00
c2f3ab8094 Fix errors in impl.
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-29 20:54:25 +01:00
055aaa2aca Untested tablist name handling
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-29 12:06:12 +01:00
Chaoscaot
5913ee5f42 Changed Color of Mods. and Supps. 2020-10-28 22:35:08 +01:00
Chaoscaot
02d1845582 Unified Color and Groups for Tablist and Chat 2020-10-28 19:26:18 +01:00
790d37300e Merge pull request 'Fixed Fabric not Allowed on Testarena' (#138) from fixed-fabric into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-10-27 15:29:43 +01:00
Chaoscaot
bf895903f8 Fixing... 2020-10-24 19:20:31 +02:00
jojo
23cd9b2334 Remove PUB (Öffentlich) team from /team info after /softreload 2020-10-24 19:01:03 +02:00
81ece47bb3 Merge pull request 'Remove duplicate E-Mail exception in database' (#136) from DuplicateEMail into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-10-24 15:19:43 +02:00
746bf6db08 Merge pull request 'Allow HH:mm on /ban and /mute' (#132) from ban-time-update into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-10-24 15:19:24 +02:00
jojo
b6973b73f7 Remove duplicate E-Mail exception in database 2020-10-24 14:52:14 +02:00
jojo
67695b6ce3 Fix Leader remove on /team 2020-10-24 13:14:53 +02:00
Chaoscaot
25ed4e7f00 Fixing... 2020-10-20 22:16:47 +02:00
Chaoscaot
a959b20370 Fixing... 2020-10-20 22:10:57 +02:00
Chaoscaot
c3ff72373b Fixing... 2020-10-20 22:08:08 +02:00
Chaoscaot
50770242a7 Fixed Badlion not Disabling Mods 2020-10-18 16:07:48 +02:00
Chaoscaot
38f90d025a Allow HH:mm on /ban and /mute 2020-10-18 00:50:18 +02:00
131134b8b8 Removing Developer exception
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-15 21:15:54 +02:00
Chaoscaot
05c0bfac58 Fixed Language 2020-10-12 13:20:31 +02:00
Chaoscaot
2911721cba Add Fabric Challenge 2020-10-12 13:17:20 +02:00
Chaoscaot
d3cbf29a3f Add Fabric Challenge 2020-10-12 13:15:53 +02:00
Chaoscaot
bebf5cdebb Fixing Joining World 2020-10-12 13:06:11 +02:00
Chaoscaot
780ecb41d4 Fixed Bugs when coming from Bauserver 2020-10-12 12:58:09 +02:00
f99c4580ce Merge pull request 'Allow Fabric' (#127) from allow-fabric into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-10-12 12:46:05 +02:00
Chaoscaot
2fe2074910 Changed to Server Switch Event 2020-10-12 11:51:44 +02:00
Chaoscaot
080fae613b Moved Fabric 2020-10-12 11:32:00 +02:00
Chaoscaot
13767c6d83 Removed Fabric 2020-10-12 11:22:07 +02:00
Chaoscaot
a50b41db2b Allow Fabric 2020-10-11 22:55:26 +02:00
Chaoscaot
eb9c7df29d Add First Join 2020-10-11 13:37:40 +02:00
Chaoscaot
a19e5db5e6 Added Support for UserID 2020-10-10 23:58:34 +02:00
Chaoscaot
de1243870a Changed SQL Statement 2020-10-10 23:49:12 +02:00
Chaoscaot
e334045364 Add Whois show Playtime 2020-10-10 15:43:09 +02:00
Chaoscaot
97c87a983f Show Map on ChallengeCommand 2020-10-03 09:48:20 +02:00
Chaoscaot
b75cc6a00d Fix Self Add 2020-09-30 15:00:38 +02:00
f7b68eeb95 Hotfix help
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-29 20:22:56 +02:00
Chaoscaot
0c7999864d Changed Wargear to 1.15 2020-09-27 12:52:26 +02:00
7b7f4e8d17 Merge pull request 'Moved Item' (#119) from packet-system into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-09-26 20:56:43 +02:00
Chaoscaot
4f44d9b393 Changed Message 2020-09-26 20:44:13 +02:00
Chaoscaot
8f0549b6dd Forgot Return 2020-09-26 12:45:04 +02:00
Chaoscaot
29d7cf0819 Refactored Some Code 2020-09-26 12:44:31 +02:00
Chaoscaot
96bc29b105 Moved Item 2020-09-26 11:50:29 +02:00
Chaoscaot
9eee6a6f23 Moved Item 2020-09-26 11:48:38 +02:00
ff113967e8 Merge pull request 'Packet System + Bungee GUI' (#111) from packet-system into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-09-26 09:21:45 +02:00
Chaoscaot
30290b33b6 Code Cleanup 2020-09-24 14:10:15 +02:00
Chaoscaot
f6fed4ed8e Add Blocked Message 2020-09-23 20:28:10 +02:00
Chaoscaot
f95675284e Ignore Bau Add requests 2020-09-23 20:10:33 +02:00
Chaoscaot
0da5db17fb Merge remote-tracking branch 'origin/master' into packet-system 2020-09-23 19:36:14 +02:00