|
ef471c9ff9
|
Merge branch 'master' into replaying
# Conflicts:
# src/de/steamwar/bungeecore/sql/SteamwarUser.java
|
2021-09-11 09:05:57 +02:00 |
|
yoyosource
|
2d89d64288
|
Hotfix DiscordEventListener
|
2021-09-10 20:57:19 +02:00 |
|
yoyosource
|
689538f6c5
|
Hotfix DiscordBot command integration
|
2021-09-09 21:30:48 +02:00 |
|
yoyosource
|
ac2a952017
|
Update Heap size of ListCommand
|
2021-09-09 21:04:56 +02:00 |
|
|
1a8365e5c1
|
Merge pull request 'Add Discord Event Teilnahme' (#241) from event_register into master
Reviewed-on: #241
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-09-08 19:47:57 +02:00 |
|
|
8eaffa1051
|
Merge pull request 'Add Message Spliting' (#240) from betterDiscord into master
Reviewed-on: #240
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-09-08 19:47:26 +02:00 |
|
Chaoscaot
|
613b78688a
|
Add EventManager Update
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-09-08 19:44:40 +02:00 |
|
|
be2e1eaeed
|
Merge branch 'master' into betterDiscord
|
2021-09-08 19:41:24 +02:00 |
|
Chaoscaot
|
96f54cf6df
|
Simplyfy Int
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-09-08 19:40:59 +02:00 |
|
Chaoscaot
|
6490ce2848
|
Long DiscordId
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-09-08 13:51:42 +02:00 |
|
Chaoscaot
|
21dd3e3e0c
|
House Keeping
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-09-08 00:57:53 +02:00 |
|
Chaoscaot
|
e66990da29
|
Add Discord Event Teilnahme
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-09-07 23:55:07 +02:00 |
|
Chaoscaot
|
27293fc051
|
Add Message Spliting
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-09-07 16:49:32 +02:00 |
|
|
f479267e11
|
Merge pull request '-24s startup time.' (#238) from betterDiscord into master
Reviewed-on: #238
|
2021-09-07 15:37:32 +02:00 |
|
Chaoscaot
|
12186e4f78
|
Fixing
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-09-07 13:37:13 +02:00 |
|
|
3e676f3c39
|
Merge pull request 'Deny starting multiple testarenas at once (based on noBauPassthrough)' (#239) from denyMultiTestarenaStart into master
Reviewed-on: #239
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-09-07 07:44:11 +02:00 |
|
|
1852b667b8
|
Merge pull request 'Remove bau passthrough' (#210) from noBauPassthrough into master
Reviewed-on: #210
|
2021-09-07 07:43:32 +02:00 |
|
|
b604222450
|
Deny launching multiple bauservers
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-05 18:47:04 +02:00 |
|
|
7bd15ec63f
|
Merge branch 'master' into noBauPassthrough
# Conflicts:
# src/de/steamwar/bungeecore/listeners/ChatListener.java
|
2021-09-05 18:19:48 +02:00 |
|
Chaoscaot
|
a0ac0a0be2
|
Async (TM)
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-09-04 23:15:08 +02:00 |
|
|
f0e7f52fd6
|
-21s Start time.
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-04 22:18:38 +02:00 |
|
|
05c37c0df0
|
Hotfix SteamwarUser
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-04 21:15:30 +02:00 |
|
|
49105c4f73
|
Hotfix Ignoresystem
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-04 10:51:11 +02:00 |
|
|
26972b58b1
|
Merge pull request 'Remove JDBC RAM leak + improve performance' (#237) from betterSQL into master
Reviewed-on: #237
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-09-04 09:35:03 +02:00 |
|
|
5186526d0a
|
Remove JDBC RAM leak
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-03 12:20:24 +02:00 |
|
|
40aacaae33
|
General replay starter
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-08-28 10:11:07 +02:00 |
|
Chaoscaot
|
cf43600644
|
Fixing
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-08-27 18:59:54 +02:00 |
|
Chaoscaot
|
bb1a2d327e
|
Merge branch 'master' into schem_nodes
# Conflicts:
# src/de/steamwar/bungeecore/commands/CheckCommand.java
|
2021-08-27 16:09:56 +02:00 |
|
yoyosource
|
8140ea3ab3
|
Merge remote-tracking branch 'origin/master'
|
2021-08-24 14:24:09 +02:00 |
|
yoyosource
|
013330f18d
|
Hotfix DevCommand
|
2021-08-24 14:23:51 +02:00 |
|
|
7a16760d68
|
Merge pull request 'Fixup async Chat problems' (#235) from BetterDiscord into master
Reviewed-on: #235
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2021-08-24 10:03:43 +02:00 |
|
|
90883d6982
|
Merge branch 'master' into BetterDiscord
|
2021-08-24 10:03:35 +02:00 |
|
|
8c58c1a1d4
|
Merge pull request 'Add better AlertCommand' (#233) from BetterAlert into master
Reviewed-on: #233
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2021-08-24 10:03:15 +02:00 |
|
yoyosource
|
d623f47410
|
Fixup async Chat problems
|
2021-08-22 22:05:57 +02:00 |
|
|
47291dff27
|
Team highlightning
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-08-21 19:00:27 +02:00 |
|
|
3409353a83
|
Use new FightInfo
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-08-21 18:55:07 +02:00 |
|
yoyosource
|
bab56f895a
|
Add better AlertCommand
|
2021-08-21 17:43:12 +02:00 |
|
yoyosource
|
4865c2f9a6
|
Add UnbanCommand
|
2021-07-30 16:14:05 +02:00 |
|
yoyosource
|
d476fd12bd
|
Add ListCommand
|
2021-07-30 16:10:48 +02:00 |
|
yoyosource
|
c0ef12829b
|
Fix TeamCommand
Fix IngameChatListener
|
2021-07-30 15:47:12 +02:00 |
|
yoyosource
|
9e4dbcdbb8
|
Add TeamCommand Online type
|
2021-07-30 13:50:47 +02:00 |
|
yoyosource
|
ca52aa40df
|
Hotfix SchematicsManager
|
2021-07-30 13:23:27 +02:00 |
|
yoyosource
|
334547fa78
|
Hotfix TeamCommand
|
2021-07-30 13:15:05 +02:00 |
|
yoyosource
|
66c9d206e7
|
Hotfix TeamCommand
|
2021-07-30 13:14:38 +02:00 |
|
yoyosource
|
ebfe912627
|
Hotfix TeamCommand
|
2021-07-30 13:06:35 +02:00 |
|
yoyosource
|
9d69d13541
|
Fix TeamCommand
|
2021-07-30 13:02:26 +02:00 |
|
yoyosource
|
36e303cd44
|
Fix TeamCommand
|
2021-07-30 13:00:39 +02:00 |
|
yoyosource
|
8ac8964f24
|
Fix TeamCommand
|
2021-07-30 12:59:27 +02:00 |
|
yoyosource
|
8a6b0e048d
|
Add TeamCommand
|
2021-07-30 12:57:15 +02:00 |
|
yoyosource
|
65d5653e78
|
Fix IngameChatListener once again
|
2021-07-30 12:32:36 +02:00 |
|