Archiviert
1
0
Commit graph

1779 Commits

Autor SHA1 Nachricht Datum
1cbec668d1 Merge branch 'master' into BauLock
# Conflicts:
#	src/de/steamwar/bungeecore/commands/HelpCommand.java
2022-09-09 15:49:04 +02:00
6ab0d3d983 Remove could not decode from ErrorLogger
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-09-09 08:40:55 +02:00
MoBrot
d4cd8a16a0 +Removed not used if statement 2022-09-08 21:32:41 +02:00
MoBrot
9a5b938fba +Fixed Owner message when locked 2022-09-08 21:28:21 +02:00
MoBrot
fe0d0eaffb +Add Owner message when bau is locked for Team 2022-09-08 20:49:17 +02:00
yoyosource
42898b0d4d Hotfix npe 2022-09-08 19:45:20 +02:00
yoyosource
88724c75e3 Merge remote-tracking branch 'origin/master' 2022-09-08 18:24:38 +02:00
yoyosource
e3e68af80f Hotfix ServerTeamchatCommand 2022-09-08 18:24:31 +02:00
3d958800fc Remove sorted checker in fabric
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-09-08 17:29:25 +02:00
150cf78607 Merge pull request 'Overload protection' () from overloadProtection into master
Reviewed-on: 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2022-09-06 20:51:14 +02:00
yoyosource
19c02ad786 Merge remote-tracking branch 'origin/overloadProtection' into BauCommand 2022-09-06 20:06:03 +02:00
43d5cb47bb Overload protection
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-09-06 19:08:00 +02:00
yoyosource
4c44bc0a83 Update BauCommand 2022-09-06 17:13:15 +02:00
yoyosource
2676f97cfb Hotfix TypeMappers 2022-09-06 16:45:56 +02:00
baef387fdb Merge pull request 'Commands' () from Commands into master
Reviewed-on: 
Reviewed-by: Lixfel <lixfel@steamwar.de>
2022-09-06 15:44:36 +02:00
yoyosource
16c3f93741 Fix stuff 2022-09-06 15:36:27 +02:00
yoyosource
2325190cf1 Fix stuff 2022-09-03 14:33:00 +02:00
MoBrot
ef6435b176 +Fix BauCommand.setLocked
+Fix BauCommand.isLocked
+Update BauLockState.NONE to BauLockState.NOBODY
+Move Userconfig.getUserLockState to BauCommand
2022-09-02 14:27:27 +02:00
yoyosource
669375e751 Update ChallengeCommand
Update FightCommand
Update HistoricCommand
2022-09-01 18:39:08 +02:00
yoyosource
7de6402a63 Update ChallengeCommand 2022-09-01 18:24:56 +02:00
yoyosource
cb591fda59 WIP 2022-09-01 18:01:51 +02:00
e58fe20082 Merge pull request 'Improve Blocked Logging' () from improve_blocked_logging into master
Reviewed-on: 
Reviewed-by: Lixfel <lixfel@steamwar.de>
2022-08-29 14:35:48 +02:00
Chaoscaot
d14d748911 Improve Blocked Logging 2022-08-29 14:33:34 +02:00
f5675811ba Hotfix join permissions
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-08-28 08:43:07 +02:00
f1f159a330 Finish BuilderCloud command
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-08-27 18:01:16 +02:00
143a9aed4a Merge pull request 'Added BuilderCloudCommand' () from BuilderCloud into master
Reviewed-on: 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2022-08-27 17:51:03 +02:00
6b89afd07d Finish BuilderCloud command
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-08-27 17:16:02 +02:00
d17a4f882e Merge branch 'master' into BuilderCloud 2022-08-27 14:27:50 +02:00
bd86c81e7f Merge pull request 'Fix tablist failure on softreload' () from fixSoftreload into master
Reviewed-on: 
Reviewed-by: Chaoscaot <chaoscaot@zohomail.eu>
2022-08-23 22:14:28 +02:00
a6407d6bb0 Fix tablist failure on softreload
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-08-23 18:10:52 +02:00
d232d18fda Merge pull request 'Fix 7/ replacer' () from fix7replacer into master
Reviewed-on: 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2022-08-23 17:31:17 +02:00
b76164ac8d Merge pull request 'Add english aliases' () from multilingAliases into master
Reviewed-on: 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2022-08-23 17:22:32 +02:00
4217afef59 Fix 7/ replacer
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-08-23 17:21:49 +02:00
a27f74af56 Fix build
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-08-23 16:59:53 +02:00
a782f811fc Add english aliases
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-08-23 16:57:19 +02:00
yoyosource
5c127e0887 Rebuild 2022-08-22 21:10:35 +02:00
yoyosource
3f99585b35 Rebuild 2022-08-22 21:09:27 +02:00
yoyosource
e29fb553f0 Remove deprecated guard api 2022-08-22 20:25:36 +02:00
yoyosource
6d717eb1b0 Update CommonCore 2022-08-22 18:43:59 +02:00
yoyosource
3550b2c4fd Merge remote-tracking branch 'origin/master' 2022-08-22 18:43:45 +02:00
yoyosource
c4204cd54d Update CommonCore 2022-08-22 18:43:36 +02:00
ea94195db8 Fix folder inconsistencies
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-08-22 16:07:21 +02:00
e4cd94aecd Fix lobbyconnection on disconnect
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-08-22 14:31:04 +02:00
b8404a74a7 Update to paper 1.19.2
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-08-22 06:50:53 +02:00
328d904f69 Merge pull request 'Bye Bye Mail.' () from emaillessWeb into master
Reviewed-on: 
Reviewed-by: Chaoscaot <chaoscaot@zohomail.eu>
2022-08-20 19:37:03 +02:00
bd1420cc90 Bye Bye Mail.
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-08-20 19:35:46 +02:00
5cf577c9e5 Bye Bye Mail.
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-08-20 19:22:21 +02:00
11106ab240 Bye Bye Mail.
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-08-20 19:15:28 +02:00
43a9b92b41 Bye Bye Mail.
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-08-20 19:10:26 +02:00
698f710138 Use /servers for server starts
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-08-20 18:15:02 +02:00