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

643 Commits

Dieser Branch
Dieser Branch
Alle Branches
Autor SHA1 Nachricht Datum
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
Lixfel
2c55a89bbb Merge pull request 'Fix MsgCommand and RCommand' (#176) from moreML into master 
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-02-05 11:57:02 +01:00
Chaoscaot
d7b784c03c Fix Team List 2021-02-05 11:55:20 +01:00
Chaoscaot
30cd8c2c7c Fix Bau Allowed Message 2021-02-05 11:49:45 +01:00
Chaoscaot
8114bb2922 Fix Bau Add Message 2021-02-05 11:48:37 +01:00
Chaoscaot
61ce5cd860 Fix MsgCommand and RCommand 2021-02-05 11:45:21 +01:00
Lixfel
b7fed24475 Merge pull request 'moreML' (#175) from moreML into master 
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-02-05 11:36:27 +01:00
Chaoscaot
cfbf1c0850 Fix Fight & Hover Messages 2021-02-05 11:34:55 +01:00
Chaoscaot
5cac4af7a4 Fix ChallengeCommand 2021-02-05 11:32:46 +01:00
Lixfel
7bc1751ed7 Merge pull request 'Message Fixing' (#174) from moreML into master 
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-02-05 11:30:01 +01:00
Chaoscaot
11c55d9419 Fix JoinmeCommand 2021-02-05 11:29:34 +01:00
Chaoscaot
7e9cc37e2d Fix Team and ServerTeamchatCommand 2021-02-05 11:25:33 +01:00
Chaoscaot
a840671ced Fix Challenge Broadcast 2021-02-05 11:23:57 +01:00
Chaoscaot
02e4398301 Fix Join not Found 2021-02-05 11:22:48 +01:00
Lixfel
cd7ee79cdc Remove debug messages 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-02-05 07:55:22 +01:00
Lixfel
18cb65a28b Fix tablist 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-02-05 07:54:39 +01:00
Lixfel
e1cd7b9c52 Fix team event overview 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-02-05 07:38:56 +01:00
Lixfel
4fb3411842 Merge pull request 'More MultiLang' (#169) from moreML into master 
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-02-05 07:30:51 +01:00
Lixfel
eac3600d48 Merge pull request 'Fix of Perma ban on Avoiding Alert' (#173) from perma-fix into master 
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-02-04 08:22:15 +01:00
Chaoscaot
575ef6fb08 Fix of Perma ban on Avoiding Alert 2021-02-02 23:42:00 +01:00
Lixfel
5d35e08af5 Hotfix ban system 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-02-01 18:42:54 +01:00
Lixfel
a323661bc9 Remove spam 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-01-30 17:11:27 +01:00
Chaoscaot
d8d4d2d04b Fix Merge Confilcts 2021-01-30 11:17:37 +01:00
Chaoscaot
611074fa0b Merge branch 'master' into moreML 
# Conflicts:
#	src/de/steamwar/bungeecore/BungeeCore.java
#	src/de/steamwar/bungeecore/commands/UnbanCommand.java
#	src/de/steamwar/messages/BungeeCore.properties
 2021-01-30 11:15:27 +01:00
Lixfel
ae7dc04fd5 Merge pull request 'Ban System Rework' (#150) from ban-rework into master 
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-01-30 08:42:33 +01:00
Chaoscaot
47aed8ab81 Fix Colorscheme 2021-01-29 20:53:54 +01:00
Chaoscaot
46efab09c2 Fix Colorscheme 2021-01-29 20:51:35 +01:00
Lixfel
54d9d2dc26 Merge pull request 'May the spam begin' (#171) from spam into master 
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-01-28 20:19:40 +01:00