SteamWar/BungeeCore
SteamWar/BungeeCore
Archiviert
13
2
Fork 1
Code Issues 14 Pull-Requests 4 Releases Wiki Aktivität
670 Commits 13 Branches 0 Tags 15 MiB
dcfa2c701a
Commit graph

670 Commits

Dieser Branch
Dieser Branch
Alle Branches
Autor SHA1 Nachricht Datum
Chaoscaot
0ea0cf1b3f Merge branch 'master' into schem_aleart 
# Conflicts:
#	src/de/steamwar/bungeecore/Message.java
#	src/de/steamwar/messages/BungeeCore.properties
 2021-04-14 19:26:19 +02:00
Lixfel
3a23ab5f36 Merge pull request 'Fixed Team Leader is Member' (#198) from Team_Leader_Fix into master 
Reviewed-on: #198
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-04-14 14:24:22 +02:00
zOnlyKroks
2a16c8c66b Fixed Team Leader is Member 2021-04-14 14:23:06 +02:00
Chaoscaot
3ec2e103b5 Fixed Schem Alert 2021-04-13 14:53:41 +02:00
Lixfel
5559970552 Fix msgs 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-13 07:37:31 +02:00
Lixfel
073ed4c436 Fix msgs 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-13 07:32:27 +02:00
Lixfel
e4106df682 Merge pull request 'Added Multi Leader Feature' (#196) from Multi_Leader into master 
Reviewed-on: #196
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-04-13 07:26:23 +02:00
Lixfel
f59350bab7 Fix leader 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-13 07:25:32 +02:00
zOnlyKroks
dc49ddff4d Fixed team remove command 2021-04-13 07:22:57 +02:00
zOnlyKroks
2bbcb283b4 Used Lambda 2021-04-12 12:33:10 +02:00
zOnlyKroks
bc39e6f307 Fixed Formating of Code 2021-04-12 12:32:05 +02:00
zOnlyKroks
f3a6269331 Added Multi Leader Feature 2021-04-11 15:45:35 +02:00
Lixfel
fc20d9c671 Merge pull request 'Improve @Ping a lot' (#195) from new_@ping into master 
Reviewed-on: #195
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-04-10 18:38:09 +02:00
Lixfel
0b4bb79800 Merge pull request 'Remove BungeeCore.properties BAU_HELP MESSAGE' (#194) from Permission into master 
Reviewed-on: #194
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-04-05 17:33:26 +02:00
Chaoscaot
d0422fc453 Remove Unused Import 2021-04-04 18:36:24 +02:00
Chaoscaot
1773d3df66 Improve @Ping a lot 2021-04-04 18:35:28 +02:00
yoyosource
d5648d9d0b Remove BungeeCore.properties BAU_HELP MESSAGE 2021-04-04 18:09:21 +02:00
YoyoNow
fd2fbadc4f Merge pull request 'Remove BauweltMember.build' (#193) from Permission into master 
Reviewed-on: #193
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-04-04 18:03:56 +02:00
yoyosource
74c1d2feac Merge branch 'master' into Permission 
# Conflicts:
#	src/de/steamwar/bungeecore/commands/BauCommand.java
 2021-04-04 17:55:29 +02:00
yoyosource
56b6e9d94b Remove BauweltMember.build 2021-04-04 17:52:13 +02:00
Lixfel
29c5dc3407 Fix wait for termination 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-03 09:06:00 +02:00
Lixfel
e83d2686cb Merge pull request 'Adjust config for new fight system' (#192) from newFightSystem into master 
Reviewed-on: #192
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-03-31 20:07:00 +02:00
Lixfel
0dcb831142 Fix missing config 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-03-30 20:03:56 +02:00
Lixfel
1824dda857 Fix license header 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-03-30 19:48:51 +02:00
Lixfel
4c2f4fdbcd Implement prepare 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-03-30 19:47:34 +02:00
Lixfel
5ee46a2ca3 Adjust config for new fight system 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-03-30 19:13:35 +02:00
Lixfel
5424a739d9 Adjust config for new fight system 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-03-30 19:12:00 +02:00
Lixfel
a079b25c14 Adjust config for new fight system 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-03-30 19:08:09 +02:00
Lixfel
2301a618eb Merge pull request 'Add Static Server Fabric Check' (#189) from staticserverblock into master 
Reviewed-on: #189
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-03-20 12:09:46 +01:00
Chaoscaot
3ea273767d Add Static Server Fabric Check 2021-03-04 21:14:19 +01:00
Lixfel
b5b6a624c6 Test git hooks 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-03-02 07:23:07 +01:00
Lixfel
2368953e23 Merge pull request 'Event deadline' (#188) from event-deadline into master 
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-03-01 21:05:15 +01:00
Lixfel
c795692e79 Event deadline 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-03-01 20:53:32 +01:00
Lixfel
a7653261c9 Merge pull request 'Fix Error in Team Invite Message' (#186) from ml_fix into master 
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-02-22 11:51:32 +01:00
Chaoscaot
b3bf45846a Fix Error in Team Invite Message 2021-02-20 22:51:02 +01:00
Lixfel
553ae15eac Merge pull request 'Fix Change Leader Message' (#184) from fix-change-leader into master 
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-02-18 15:44:50 +01:00
Chaoscaot
916d228fac Fix Change Leader Message 2021-02-14 00:09:24 +01:00
Lixfel
8c03503c4f Merge pull request 'Fix Missing Timeformat for Ban Message' (#183) from fix_ban_timeformat into master 
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-02-13 08:31:35 +01:00
Chaoscaot
8a2d5f315f Expanding Some Things 2021-02-13 00:53:09 +01:00
Lixfel
48000f7704 Merge pull request 'Fixing Various thing with new Message System' (#181) from fix-message into master 
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-02-11 17:04:12 +01:00
Chaoscaot
f6a6177185 Fixing Various thing with new Message System 2021-02-11 17:02:24 +01:00
Lixfel
91a8b8b54e Merge pull request 'Fixed UNKNOWN_TEAM Message' (#180) from fix-message into master 
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-02-05 14:29:09 +01:00
Chaoscaot
2a9a36d53e Fixed UNKNOWN_TEAM Message 2021-02-05 14:28:21 +01:00
Lixfel
7b21fd4c4f Merge pull request 'Fixed Wrong Message' (#179) from fix-message into master 
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-02-05 13:55:06 +01:00
Chaoscaot
a9982de3db Fixed Wrong Message 2021-02-05 13:53:14 +01:00
Lixfel
fa60eeb121 Test ttl 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-02-05 13:25:46 +01:00
Lixfel
e9b8940de0 Merge pull request 'Reloadable Resource Bundle' (#178) from moreML into master 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-02-05 12:49:03 +01:00
Chaoscaot
6f6327d60f Add ResourcereloadCommand 2021-02-05 12:29:41 +01:00
Chaoscaot
9ad9a2c835 Add ResourcereloadCommand 2021-02-05 12:28:35 +01:00
Chaoscaot
e661d876b1 Temp Tp Fix 2021-02-05 12:04:06 +01:00