Archiviert
1
0
Commit graph

1048 Commits

Autor SHA1 Nachricht Datum
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
351a134e1e Merge pull request 'Implementing event mode for event bungee' (#142) from eventMode into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-10-30 21:53:39 +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
7c9473a408 Merge pull request 'Shorten name for ranked matches' (#141) from shortenRanked into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-10-30 21:39:56 +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
210a0283b8 Merge pull request 'Untested tablist name handling' (#140) from untested into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-10-30 07:31:32 +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
1b0bbc0528 Merge pull request 'Remove PUB (Öffentlich) team from /team info after /softreload' (#137) from TeamInfo into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-10-24 21:00:16 +02: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
32579e753e Merge pull request 'Fix Leader remove on /team' (#135) from FixLeaderRemove into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-10-24 13:20:11 +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
9a4cead056 Merge pull request 'Fixed Badlion Mods' (#133) from badlion-fix into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-10-20 22:03:03 +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
a984cf4d9a Merge pull request 'Fixed Language' (#131) from fixed-fabric into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-10-12 13:21:33 +02:00
Chaoscaot
05c0bfac58 Fixed Language 2020-10-12 13:20:31 +02:00
722f9ad20d Merge pull request 'Add Fabric Challenge' (#130) from fixed-fabric into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-10-12 13:18:32 +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
a1cfa157ff Merge pull request 'Fixing Joining World' (#129) from fixed-fabric into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-10-12 13:07:17 +02:00
Chaoscaot
bebf5cdebb Fixing Joining World 2020-10-12 13:06:11 +02:00
1184da566e Merge pull request 'Fixed Fabric' (#128) from fixed-fabric into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-10-12 12:59:39 +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
a7ce6e50db Merge pull request 'Add Whois show Playtime' (#126) from whois-playtime into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-10-12 12:42:24 +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