Chaoscaot/VelocityCore
Archiviert
1
0
Fork 0
geforkt von SteamWar/BungeeCore
Code Pull-Requests Aktivität
1.685 Commits 11 Branches 0 Tags 7,5 MiB
f2a8cb064e
Commit graph

1685 Commits

Dieser Branch
Dieser Branch
Alle Branches
Autor SHA1 Nachricht Datum
Lixfel
076a7d9bf2 Work around new forge mod loader 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-01-02 17:23:37 +01:00
Lixfel
49ac19602b Merge pull request 'Team Color' (#164) from team-color into master 
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-01-02 09:35:15 +01:00
Chaoscaot
e0d158b152 Fix Color 2021-01-01 13:30:13 +01:00
Chaoscaot
0ef5f6dcb9 Fixing Stuff... 2021-01-01 02:15:12 +01:00
Chaoscaot
8128d44011 Imports... 2020-12-30 17:12:28 +01:00
Chaoscaot
fec517f5a1 WIP 2020-12-30 13:28:09 +01:00
Chaoscaot
5fb8a617a7 Merge branch 'master' into ban-rework 2020-12-30 12:56:17 +01:00
Chaoscaot
633ff8c44d Merge remote-tracking branch 'origin/ban-rework' into ban-rework 
# Conflicts:
#	src/de/steamwar/messages/BungeeCore.properties
 2020-12-30 12:56:08 +01:00
Chaoscaot
4d752e033c Fixing 2020-12-29 14:47:58 +01:00
Chaoscaot
69e8a4e24f Using more of Color 2020-12-29 01:38:47 +01:00
Chaoscaot
a2169ec3e1 Fixing 2020-12-28 19:16:51 +01:00
Chaoscaot
065ab72625 Improve Color List 2020-12-28 17:54:24 +01:00
Chaoscaot
14479271cd Optimize Imports 2020-12-28 17:38:26 +01:00
Chaoscaot
d86122a278 Fixing old Dependencies 2020-12-28 17:37:38 +01:00
Chaoscaot
7d67c7615b Add Teamcolor 2020-12-28 17:33:24 +01:00
Lixfel
e5dd2a69ad Hotfix check 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-12-20 17:22:55 +01:00
Lixfel
03a0ed8898 Hotfix check 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-12-20 14:05:39 +01:00
Lixfel
f0c2fad218 Hotfix check list 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-12-20 14:02:24 +01:00
Lixfel
0e31a6cd90 Hotfix check list 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-12-20 13:55:50 +01:00
jojo
823fabec16 Merge branch 'master' into ban-rework 
# Conflicts:
#	src/de/steamwar/messages/BungeeCore.properties
 2020-12-19 17:29:33 +01:00
Lixfel
f431fa7147 Test bundle clear 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-12-19 14:31:41 +01:00
Lixfel
3c4c10288f Test bundle clear 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-12-19 14:29:20 +01:00
Lixfel
82d350f3ee Test bundle clear 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-12-19 14:25:34 +01:00
Lixfel
31f325421a Check refactoring: Using Message, informing about previous checks 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-12-19 14:12:19 +01:00
Lixfel
bf0bd042a8 Fix bbc 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-12-19 12:36:05 +01:00
Lixfel
39d81f7e86 Merge pull request 'Extending AntiWDL capabilities' (#162) from wdl into master 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2020-12-19 12:27:03 +01:00
Lixfel
43c895e3a4 Merge pull request 'Fix bannumgehungs timings' (#161) from bannumgehungs-fix into master 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2020-12-19 12:22:17 +01:00
Lixfel
49ed45a346 Extending AntiWDL capabilities 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-12-19 12:21:26 +01:00
Lixfel
a5dc11cac1 Fix bannumgehungs timings 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-12-19 12:08:18 +01:00
Lixfel
adf0d6b716 Merge pull request 'Extraced Inventory API Changes from BungeeSchemGUI' (#156) from switem-api into master 
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2020-12-15 19:42:04 +01:00
Chaoscaot
b634b8adf0 Merge branch 'master' into ban-rework 
# Conflicts:
#	src/de/steamwar/messages/BungeeCore.properties
 2020-12-11 23:05:36 +01:00
Lixfel
e917e7f465 Merge pull request 'Ban time on ban Avoiding' (#158) from ban-listener-time into master 
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2020-12-10 19:40:33 +01:00
Chaoscaot
95b5925b5f Fixing Message Again... 2020-12-10 19:35:43 +01:00
Chaoscaot
c0330635a6 Fixing Message 2020-12-10 19:31:28 +01:00
Chaoscaot
68ce7330ef Fixing Double Execution of Code 2020-12-10 19:18:50 +01:00
Chaoscaot
dcff5ed22f Add Extending Ban of Account with same IP 2020-12-10 15:17:25 +01:00
Chaoscaot
ed79088560 Add Ban Time to Banumgehungs message and moved Messages to properties 2020-12-10 15:00:48 +01:00
Lixfel
518ba7bd35 Hotfix 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-12-09 07:11:20 +01:00
Chaoscaot
9a3756f3d0 Extraced Inventory API Changes from BungeeSchemGUI 2020-12-08 17:09:19 +01:00
Lixfel
cacc2f158a Merge pull request 'rework-BauServerHelp' (#152) from rework-BauServerHelp into master 
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2020-12-07 21:06:17 +01:00
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
Lixfel
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
Lixfel
8caf77d576 Fix additional typo 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-27 23:55:40 +01:00
Lixfel
f5c834df11 Fix typo 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-27 23:53:06 +01:00
Lixfel
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
Lixfel
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