Archiviert
1
0
Commit graph

1995 Commits

Autor SHA1 Nachricht Datum
Chaoscaot
3e31128dc3 Merge branch 'master' into ban-rework
# Conflicts:
#	src/de/steamwar/bungeecore/commands/BanCommand.java
#	src/de/steamwar/bungeecore/commands/MuteCommand.java
#	src/de/steamwar/messages/BungeeCore.properties
2020-11-28 11:30:06 +01:00
f48f6052cf Merge pull request 'More multilingual transfer' (#146) from moreMultiLingual into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-11-28 09:23:21 +01:00
jojo
56edd5c360 Optimize Imports 2020-11-28 08:24:58 +01:00
jojo
e6926116fb Optimize Imports 2020-11-28 08:06:36 +01:00
Chaoscaot
3035459c6a Merge branch 'master' into ban-rework
# Conflicts:
#	src/de/steamwar/messages/BungeeCore.properties
2020-11-28 02:03:43 +01:00
8caf77d576 Fix additional typo
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-27 23:55:40 +01:00
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