yoyosource
|
b6e1e80b00
|
Update stuff
|
2022-03-10 22:04:23 +01:00 |
|
yoyosource
|
54753ce1f8
|
Add UserGroup shortforms
|
2022-03-10 19:00:46 +01:00 |
|
yoyosource
|
621cb64fb3
|
Add SchemElo
Add UserElo
Remove Elo.java
|
2022-03-10 18:52:21 +01:00 |
|
yoyosource
|
1363ecced8
|
Hotfix NPE
|
2022-03-10 15:22:02 +01:00 |
|
|
|
95698ff276
|
Merge branch 'master' into Ranked
|
2022-03-10 11:51:12 +01:00 |
|
yoyosource
|
a1dd46d1d0
|
Remove ranked flag
|
2022-03-10 11:50:57 +01:00 |
|
|
|
9cb0378346
|
Merge pull request 'Add new rank system' (#303) from Ranked into master
Reviewed-on: SteamWar/BungeeCore#303
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2022-03-10 11:45:38 +01:00 |
|
yoyosource
|
750cf0ee97
|
Remove RankCommand.java
|
2022-03-09 20:56:01 +01:00 |
|
yoyosource
|
9ec6ea5090
|
Add FightEndsHandler
Add FightEndsPacket
|
2022-03-09 20:43:06 +01:00 |
|
yoyosource
|
d29ef7749d
|
Add new rank system
|
2022-03-09 14:52:28 +01:00 |
|
Chaos
|
680a969435
|
build(bot_upload): Rebuild
|
2022-03-06 17:51:34 +01:00 |
|
Chaoscaot
|
5249b0aee6
|
Merge branch 'master' into bot_upload
|
2022-03-06 17:49:44 +01:00 |
|
Chaos
|
646b23af08
|
fix(bot_upload): Use Punishment
|
2022-03-06 17:49:21 +01:00 |
|
|
|
a3e1db4fbb
|
Fix Forge 1.12.2
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-03-06 16:57:25 +01:00 |
|
|
|
93abe90b1a
|
Fix exceptions
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-03-05 16:54:51 +01:00 |
|
yoyosource
|
a5669ef7e2
|
Fix possible exceptions
|
2022-03-05 12:25:45 +01:00 |
|
yoyosource
|
a0aea29b1b
|
Fix discord bot loading
|
2022-03-04 23:46:21 +01:00 |
|
yoyosource
|
a148b858d6
|
Merge remote-tracking branch 'origin/master'
|
2022-03-04 23:46:07 +01:00 |
|
yoyosource
|
e306567ca5
|
Fix discord bot loading
|
2022-03-04 23:46:00 +01:00 |
|
|
|
3b640f99d3
|
Merge branch 'master' into bot_upload
|
2022-03-03 21:27:33 +01:00 |
|
|
|
45dc9c148e
|
Fix team changeleader -> promote
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-02-28 17:38:04 +01:00 |
|
|
|
c88ac55b89
|
Fix forge autoban disconnect
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-02-06 18:09:00 +01:00 |
|
|
|
50ee5c6e95
|
Hotfix forge disconnect
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-02-06 17:52:24 +01:00 |
|
|
|
9ca14b7565
|
Fix Forgemods
Signed-off-by: Lixfel <lixfel@steamwar.de>
|
2022-02-06 16:36:52 +01:00 |
|
|
|
f97f135efc
|
Better Forge failure debugging
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-02-05 17:57:55 +01:00 |
|
|
|
ffa5dc8bc2
|
No authenticating errors
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-02-05 17:47:41 +01:00 |
|
|
|
265daaa44d
|
Fix Java 8 start
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-02-05 17:45:55 +01:00 |
|
|
|
29b228bd8d
|
Fix whois -a
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-02-05 17:39:29 +01:00 |
|
|
|
d1e62690dd
|
Fix delete future teams
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-02-05 17:36:18 +01:00 |
|
|
|
0f47914c4d
|
Hotfix message
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-02-04 12:59:47 +01:00 |
|
|
|
cce444719d
|
Fix build
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-02-04 12:56:51 +01:00 |
|
|
|
bc8042816d
|
Add opens for 1.18
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-02-04 12:39:52 +01:00 |
|
|
|
3bacd8486e
|
Merge pull request 'Forge Mod detection' (#292) from ModDetection1.13+ into master
Reviewed-on: SteamWar/BungeeCore#292
Reviewed-by: Lixfel <lixfel@steamwar.de>
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2022-02-03 22:06:16 +01:00 |
|
Chaos
|
4fa7437b27
|
Yes
|
2022-02-03 22:02:56 +01:00 |
|
|
|
7e3563838b
|
Fix permissions
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-02-03 21:17:08 +01:00 |
|
|
|
70056b838e
|
Fix missing value read
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-01-31 21:20:19 +01:00 |
|
zOnlyKroks
|
75e744435c
|
Performance
|
2022-01-31 17:21:18 +01:00 |
|
zOnlyKroks
|
0033de233b
|
FmlPing now multi versions
|
2022-01-31 16:58:48 +01:00 |
|
|
|
ec74034c0b
|
Fix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-01-31 08:34:27 +01:00 |
|
|
|
ddcb5e652e
|
Merge pull request 'Arena command' (#296) from arenaCommand into master
Reviewed-on: SteamWar/BungeeCore#296
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2022-01-31 08:28:56 +01:00 |
|
|
|
4e6daaa8c0
|
Java 8 for 1.8 - 1.10
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-01-29 13:56:24 +01:00 |
|
|
|
2026893d95
|
Forge packet parsing
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-01-29 13:16:30 +01:00 |
|
|
|
ae3948f400
|
Arena command
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-01-29 12:17:48 +01:00 |
|
zOnlyKroks
|
5461c47ea2
|
Performance
|
2022-01-15 16:29:44 +01:00 |
|
|
|
6dc33c85dd
|
Merge branch 'master' into ModDetection1.13+
|
2022-01-15 16:26:07 +01:00 |
|
|
|
7f196f0801
|
Prevent starting multiple baus at once
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-01-14 14:35:21 +01:00 |
|
zOnlyKroks
|
88ec0ad7db
|
Performance
|
2022-01-14 12:08:00 +01:00 |
|
zOnlyKroks
|
3773d3cefc
|
Performance
|
2022-01-09 09:29:45 +01:00 |
|
|
|
271afd5f48
|
Merge branch 'master' into ModDetection1.13+
|
2022-01-08 09:58:42 +01:00 |
|
zOnlyKroks
|
28946876cf
|
Fixes
|
2022-01-08 09:57:45 +01:00 |
|
|
|
361077cc3e
|
Fix future event participations on team deletion
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-01-08 08:46:28 +01:00 |
|
|
|
1c50d61a28
|
Some minor bugfixes
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-01-07 22:03:06 +01:00 |
|
zOnlyKroks
|
9218544349
|
Primitive Version
|
2022-01-07 11:50:26 +01:00 |
|
|
|
55a5492a2d
|
Rebuild
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-01-05 16:00:45 +01:00 |
|
|
|
83df7665e2
|
Fix badlion
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-01-02 22:04:45 +01:00 |
|
|
|
28ca028b73
|
Fix badlion
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-01-02 21:39:17 +01:00 |
|
|
|
1725a180d7
|
Fix badlion
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-01-02 21:34:19 +01:00 |
|
|
|
9fa89644ee
|
Fix badlion
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-01-02 21:34:04 +01:00 |
|
|
|
51fd1ea35a
|
Fix badlion
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-01-02 21:19:43 +01:00 |
|
|
|
f75e24787f
|
Implement execute command handler for lobby
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-01-02 11:31:57 +01:00 |
|
zOnlyKroks
|
b77cce9921
|
.
|
2022-01-01 18:43:43 +01:00 |
|
zOnlyKroks
|
891eb0db92
|
Merge remote-tracking branch 'origin/Playtime_Command' into Playtime_Command
|
2022-01-01 12:24:42 +01:00 |
|
zOnlyKroks
|
20dc8fca3e
|
.
|
2022-01-01 12:24:36 +01:00 |
|
|
|
5cd798a350
|
Merge branch 'master' into bot_upload
|
2022-01-01 11:36:11 +01:00 |
|
|
|
82db0c597a
|
Merge branch 'master' into Playtime_Command
|
2021-12-31 22:26:54 +01:00 |
|
zOnlyKroks
|
7220051c18
|
Rework
|
2021-12-31 22:21:25 +01:00 |
|
|
|
77a4bfb970
|
Merge pull request 'Fix WhoisCommand' (#289) from active_punishments into master
Reviewed-on: SteamWar/BungeeCore#289
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-12-31 13:34:52 +01:00 |
|
Chaoscaot
|
7dd2179612
|
Fix WhoisCommand
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-12-31 13:23:48 +01:00 |
|
|
|
4137d66607
|
Rebuild
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-31 09:02:38 +01:00 |
|
Chaoscaot
|
0ec38aed02
|
Fix Messages
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-12-30 22:09:21 +01:00 |
|
Chaoscaot
|
862176b0f0
|
Add Only Active Punishments on Whois
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-12-30 19:55:06 +01:00 |
|
Chaoscaot
|
533d33d2aa
|
Merge branch 'master' into bot_upload
|
2021-12-30 12:51:48 +01:00 |
|
Chaoscaot
|
f547667937
|
Doing PR Stuff
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-12-30 11:53:54 +01:00 |
|
zOnlyKroks
|
87db052478
|
Yoyo glücklich machen
|
2021-12-29 10:42:38 +01:00 |
|
zOnlyKroks
|
1cfa6359e8
|
Formatting
|
2021-12-29 10:38:05 +01:00 |
|
zOnlyKroks
|
01ff551213
|
Merge branch 'master' into Playtime_Command
|
2021-12-29 10:37:19 +01:00 |
|
zOnlyKroks
|
858e657974
|
Format
|
2021-12-29 10:30:15 +01:00 |
|
zOnlyKroks
|
071e88966e
|
Format
|
2021-12-29 10:23:58 +01:00 |
|
zOnlyKroks
|
94fe119330
|
Format
|
2021-12-29 10:19:53 +01:00 |
|
zOnlyKroks
|
1815c986d5
|
Format
|
2021-12-29 10:17:25 +01:00 |
|
zOnlyKroks
|
f1c85771a7
|
Format
|
2021-12-29 10:17:09 +01:00 |
|
zOnlyKroks
|
591395c64c
|
Format
|
2021-12-29 10:16:58 +01:00 |
|
zOnlyKroks
|
981be71d4e
|
Format
|
2021-12-29 10:15:24 +01:00 |
|
zOnlyKroks
|
73321e4b7e
|
Format
|
2021-12-29 10:11:39 +01:00 |
|
zOnlyKroks
|
803b591ff4
|
Format
|
2021-12-29 09:29:55 +01:00 |
|
|
|
35c16b1fae
|
Try with resources
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-28 16:16:16 +01:00 |
|
|
|
c928c480f2
|
Merge branch 'master' into replaying
|
2021-12-28 11:33:47 +01:00 |
|
|
|
7ad4d73674
|
Nice Replay display
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-27 19:36:51 +01:00 |
|
|
|
581acd4891
|
Merge pull request 'Old Bug, New Fix' (#287) from old_bugs into master
Reviewed-on: SteamWar/BungeeCore#287
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-12-27 18:54:17 +01:00 |
|
Chaoscaot
|
7730ea29fe
|
Old Bug, New Fix
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-12-27 18:14:45 +01:00 |
|
yoyosource
|
27b8fa969f
|
Update TablistManager
|
2021-12-27 14:15:21 +01:00 |
|
|
|
d6e01e6bae
|
Merge branch 'master' into replaying
# Conflicts:
# src/de/steamwar/bungeecore/BungeeCore.java
# src/de/steamwar/bungeecore/SubserverSystem.java
# src/de/steamwar/bungeecore/sql/Statement.java
|
2021-12-27 13:14:14 +01:00 |
|
Chaoscaot
|
98d06544ef
|
Doing PR Stuff
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-12-25 22:44:29 +01:00 |
|
zOnlyKroks
|
6b0fb7ca6f
|
)
|
2021-12-24 17:37:53 +01:00 |
|
zOnlyKroks
|
86e9c17d73
|
Yoyo ist nen formatting freak
|
2021-12-24 17:36:22 +01:00 |
|
zOnlyKroks
|
896ea6b6d4
|
Formatting
|
2021-12-24 17:35:17 +01:00 |
|
zOnlyKroks
|
28f96c1708
|
Formatting
|
2021-12-24 17:29:41 +01:00 |
|
zOnlyKroks
|
9b487e929c
|
Fixes
|
2021-12-24 17:16:01 +01:00 |
|
|
|
6c6ecfccb3
|
Merge branch 'master' into Playtime_Command
|
2021-12-24 11:17:29 +01:00 |
|
zOnlyKroks
|
d72c8e612f
|
Command implementation
|
2021-12-24 11:16:29 +01:00 |
|
|
|
5002b07748
|
Fix stack overflow
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-23 17:38:08 +01:00 |
|
|
|
39c7254963
|
Simplify code
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-22 17:09:16 +01:00 |
|
yoyosource
|
6e6cf76479
|
Update TablistManager
|
2021-12-22 11:38:00 +01:00 |
|
yoyosource
|
02883f2bea
|
Update TablistManager
|
2021-12-22 11:29:43 +01:00 |
|
|
|
adbf041135
|
Merge branch 'master' into FixTablist
|
2021-12-22 10:17:48 +01:00 |
|
yoyosource
|
0cc93f433e
|
Fix TablistManager
|
2021-12-22 10:17:28 +01:00 |
|
|
|
864c51c3d9
|
Prevent arena start dos
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-19 16:50:29 +01:00 |
|
yoyosource
|
1087cdb74c
|
Add better Tablist Slim behaviour
|
2021-12-18 14:20:35 +01:00 |
|
|
|
75b823f780
|
Fix renaming
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-17 06:52:08 +01:00 |
|
Chaoscaot
|
da9b5d82ab
|
Merge branch 'master' into bot_upload
|
2021-12-16 17:24:26 +01:00 |
|
Chaoscaot
|
fe80ede6e0
|
Fix of 20+ Bans on lndi
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-12-16 17:10:27 +01:00 |
|
|
|
71befae83b
|
Merge pull request 'Use default java instead of hardcoded java' (#275) from defaultJava into master
Reviewed-on: SteamWar/BungeeCore#275
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-12-16 15:45:43 +01:00 |
|
|
|
191ccc6ed9
|
Merge pull request 'Fix possible world names for paper' (#273) from fixWorldNames into master
Reviewed-on: SteamWar/BungeeCore#273
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-12-16 15:45:33 +01:00 |
|
Chaoscaot
|
8a43110100
|
Add Discord Bot Upload
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-12-12 20:40:25 +01:00 |
|
|
|
276cdf1762
|
Use default java instead of hardcoded java
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-11 16:54:06 +01:00 |
|
|
|
c98e2c381d
|
Autopermabann on jndi:ldap
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-10 09:19:01 +01:00 |
|
|
|
defc261e5e
|
Hotfix: No paper baus
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-10 09:08:47 +01:00 |
|
Chaoscaot
|
d3d48d9514
|
Fix Poll Commands
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-12-05 12:54:39 +01:00 |
|
|
|
87ccd1a6d8
|
Fix possible world names for paper
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-04 07:57:06 +01:00 |
|
|
|
3be85af4bb
|
Merge pull request 'FAWE 1.12 should now be Java 16/17 compatible' (#272) from omniJ9 into master
Reviewed-on: SteamWar/BungeeCore#272
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-12-02 21:37:32 +01:00 |
|
|
|
2dd8cf3f8b
|
Fix check without rank
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-02 17:46:39 +01:00 |
|
|
|
78874e0800
|
FAWE 1.12 should now be Java 16/17 compatible
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-02 17:08:00 +01:00 |
|
|
|
9f7eca9689
|
Display sorted
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-02 09:41:53 +01:00 |
|
|
|
9fc112d882
|
Merge branch 'master' into configRefactoring
|
2021-12-02 08:46:58 +01:00 |
|
|
|
6bb90af3bc
|
Fix loading of non startable gamemodes
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-02 08:45:01 +01:00 |
|
|
|
582924fb7d
|
GDPR query processor
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-11-25 14:47:37 +01:00 |
|
|
|
a6ea418047
|
WIP GDPR query processor
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-11-23 19:59:50 +01:00 |
|
|
|
866d57f8dc
|
WIP GDPR query processor
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-11-23 19:27:03 +01:00 |
|
|
|
0339067295
|
Merge branch 'master' into configRefactoring
|
2021-11-23 11:26:43 +01:00 |
|
Chaoscaot
|
d31f3a31d1
|
Fix CheckCommand
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-11-20 21:05:34 +01:00 |
|
Chaoscaot
|
ea8e5831c4
|
Update from Spigot
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-11-20 11:29:04 +01:00 |
|
Chaoscaot
|
2e5f0de710
|
Everthings Tested!
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-11-14 12:00:29 +01:00 |
|
|
|
e32a223476
|
Using new config
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-11-12 17:14:56 +01:00 |
|
Chaoscaot
|
3ac81810c4
|
Fixing Merge Conflicts & Updating!
|
2021-11-12 15:52:15 +01:00 |
|
Chaoscaot
|
a9172929be
|
Merge remote-tracking branch 'origin/master' into schem_nodes
# Conflicts:
# src/de/steamwar/bungeecore/commands/CheckCommand.java
# src/de/steamwar/bungeecore/sql/CheckedSchematic.java
# src/de/steamwar/bungeecore/sql/Schematic.java
# src/de/steamwar/bungeecore/sql/SchematicMember.java
|
2021-11-12 14:35:58 +01:00 |
|
|
|
75d5e00c68
|
Reduce OOM-Crashes
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-26 17:08:48 +02:00 |
|
|
|
d6aefa9ec7
|
Merge pull request 'Comma seperated team info' (#266) from commaTeamInfo into master
Reviewed-on: SteamWar/BungeeCore#266
|
2021-10-25 09:17:36 +02:00 |
|
|
|
87641dbfc2
|
Prevent ConcurrentModException
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-25 09:16:01 +02:00 |
|
|
|
62681be8d4
|
Comma seperated team info
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-25 09:13:48 +02:00 |
|
|
|
9ba20d7426
|
Ciao on OutOfMemory!
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-24 16:26:27 +02:00 |
|
|
|
317df7b7a8
|
Improved stability
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-22 20:13:31 +02:00 |
|
|
|
eb8b5e3bc6
|
Fix tablist size
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-12 18:07:28 +02:00 |
|
|
|
1c3208934d
|
Fix FAWE 1.9-1.12
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-12 13:42:47 +02:00 |
|
|
|
d37a68f373
|
Fix missing log4jconfiguration file
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-12 13:11:23 +02:00 |
|
|
|
bffbacc289
|
Merge remote-tracking branch 'origin/Punishment++'
# Conflicts:
# src/de/steamwar/bungeecore/commands/DevCommand.java
# src/de/steamwar/bungeecore/sql/SteamwarUser.java
|
2021-10-12 11:54:41 +02:00 |
|
|
|
d7b6abb1ca
|
Merge pull request 'Use OpenJ9' (#260) from openj9 into master
Reviewed-on: SteamWar/BungeeCore#260
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-10-12 11:45:12 +02:00 |
|
|
|
7debcf1782
|
Merge pull request 'Fix tablist issues' (#261) from tablist into master
Reviewed-on: SteamWar/BungeeCore#261
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-10-12 11:44:42 +02:00 |
|
|
|
adeb5de034
|
Fix whois NPE on never connected user
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-10 08:20:30 +02:00 |
|
|
|
2352410f2b
|
Fix tablist issues
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-09 22:51:08 +02:00 |
|
|
|
0c5c9e7d42
|
Reduce arena RAM
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-09 21:53:50 +02:00 |
|
|
|
801d9da2e1
|
OpenJ9
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-09 16:06:31 +02:00 |
|
|
|
6210cdf16d
|
WIP tablist
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-09 16:06:14 +02:00 |
|
|
|
e66dd48b89
|
Merge pull request 'Fix Bot' (#258) from fix-bot into master
Reviewed-on: SteamWar/BungeeCore#258
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-10-09 15:57:37 +02:00 |
|
|
|
3fbfcbe288
|
Merge pull request 'Cyclic port running to reduce failing server starts' (#255) from cyclicPorts into master
Reviewed-on: SteamWar/BungeeCore#255
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-10-09 15:45:00 +02:00 |
|
Chaoscaot
|
1cc289c11e
|
Fix Bot
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-10-09 12:57:53 +02:00 |
|
|
|
53138d89f8
|
Merge branch 'master' into Punishment++
|
2021-10-08 11:31:38 +02:00 |
|
|
|
9bf5146114
|
Hotfix tablist
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-08 07:27:40 +02:00 |
|
|
|
89f1a17c91
|
Hotfix tablist
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-08 07:25:06 +02:00 |
|
|
|
e9ee427c26
|
Merge branch 'master' into fightInfoPacket
|
2021-10-08 07:10:59 +02:00 |
|
yoyosource
|
fe2c6fc0b5
|
Update messages
|
2021-10-07 10:55:59 +02:00 |
|
yoyosource
|
2ef2f81496
|
Update imports
|
2021-10-07 10:28:53 +02:00 |
|
yoyosource
|
976bc4ed87
|
Merge remote-tracking branch 'origin/Punishment++' into Punishment++
|
2021-10-06 11:28:21 +02:00 |
|
yoyosource
|
0f5087c76c
|
Add Punishment.PunishmentType.NoSchemSubmitting
|
2021-10-06 11:28:11 +02:00 |
|
|
|
2f0643779f
|
Merge branch 'master' into Punishment++
|
2021-10-06 11:16:47 +02:00 |
|
yoyosource
|
4f7ccf2028
|
Fix stuff
|
2021-10-02 21:24:32 +02:00 |
|
|
|
3f417d8ecb
|
Cyclic port running to reduce failing server starts
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-02 19:07:50 +02:00 |
|
|
|
aebb37e10e
|
Fix discord bot shutdown
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-02 07:48:21 +02:00 |
|
yoyosource
|
b24c3d0d6b
|
Merge branch 'master' into Punishment++
# Conflicts:
# src/de/steamwar/bungeecore/sql/SteamwarUser.java
|
2021-10-01 12:12:01 +02:00 |
|
yoyosource
|
a3d768b1f1
|
Making listener stuff volatile to fix NPE's with multiple threads accessing them
|
2021-10-01 10:55:29 +02:00 |
|
|
|
ef8928d3bd
|
Better encapsulation
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-01 10:41:58 +02:00 |
|
|
|
c3c666c305
|
Encapsulate DiscordBot errors
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-01 10:38:48 +02:00 |
|
|
|
f9b42ad0c1
|
Prevent username triggering
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-30 16:21:24 +02:00 |
|
yoyosource
|
ecaba65f79
|
Update Punishment, messages not final
|
2021-09-30 13:47:21 +02:00 |
|
|
|
33924752c8
|
Fix unregistering
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-30 12:30:11 +02:00 |
|
|
|
5bcc87aa1e
|
Fix autoreconnect
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-30 12:26:54 +02:00 |
|
|
|
abd5aab9bf
|
Merge pull request 'Long DiscordId' (#242) from long_discord into master
Reviewed-on: SteamWar/BungeeCore#242
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2021-09-30 12:20:26 +02:00 |
|
yoyosource
|
064796ec48
|
Fix Node NumberFormatException
|
2021-09-27 16:55:54 +02:00 |
|
yoyosource
|
5918a2530a
|
Fix Node NumberFormatException
|
2021-09-27 16:55:00 +02:00 |
|
|
|
1f02790bc7
|
Merge pull request 'Update DiscordBot integration' (#250) from DiscordBot into master
Reviewed-on: SteamWar/BungeeCore#250
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2021-09-27 16:53:11 +02:00 |
|
yoyosource
|
c51415443f
|
Fix Node NumberFormatException
|
2021-09-27 16:46:26 +02:00 |
|
yoyosource
|
0cdcfc12a8
|
Update DiscordBot integration
|
2021-09-27 16:42:07 +02:00 |
|
|
|
1d8966865f
|
Merge branch 'master' into long_discord
|
2021-09-27 16:28:46 +02:00 |
|
yoyosource
|
3d49d907a4
|
Fix messages
|
2021-09-27 09:37:50 +02:00 |
|
yoyosource
|
bb9627b74c
|
Add punishment implementations
|
2021-09-27 09:29:51 +02:00 |
|
yoyosource
|
0b6b2c6b6b
|
Update Punishments and commands for each punishment
|
2021-09-27 08:47:56 +02:00 |
|
yoyosource
|
a886936cf3
|
Add grouping to messages
|
2021-09-26 23:38:43 +02:00 |
|
yoyosource
|
b5a9ecc999
|
Remove unintended imports
|
2021-09-26 23:36:41 +02:00 |
|
yoyosource
|
3cfd3f5beb
|
Update Punishment system
Simplify Punishment code overhead
|
2021-09-26 23:34:15 +02:00 |
|
|
|
f8d6b73c0f
|
Fix deadlock #3 :/
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-26 21:46:35 +02:00 |
|
|
|
49f7dc9911
|
Fix deadlock #2 :/
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-21 19:05:28 +02:00 |
|
|
|
2b2fc2b00e
|
Fix deadlock
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-19 16:41:42 +02:00 |
|
|
|
45cc55c4a1
|
Memory threshold
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-17 08:48:57 +02:00 |
|
|
|
74df8a82a3
|
Memory threshold
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-17 08:45:47 +02:00 |
|
|
|
a8d62d6115
|
Fix inversion + debugoutput
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-17 07:58:10 +02:00 |
|
|
|
265fa45371
|
Prefer local node
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-17 07:56:26 +02:00 |
|
|
|
563a5f45f6
|
Merge branch 'master' into nodeSystem
# Conflicts:
# src/de/steamwar/bungeecore/BungeeCore.java
|
2021-09-17 07:47:22 +02:00 |
|
Chaoscaot
|
8ad5184d25
|
Merge remote-tracking branch 'origin/long_discord' into long_discord
|
2021-09-16 22:22:15 +02:00 |
|
Chaoscaot
|
d41bb58fac
|
Fix null Issues
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-09-16 22:21:36 +02:00 |
|
|
|
9f985e4199
|
Merge branch 'master' into long_discord
|
2021-09-16 17:14:23 +02:00 |
|
|
|
d73c0ea7ea
|
Auto core count detection
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-16 17:12:22 +02:00 |
|
|
|
85fe4ba264
|
Object oriented subserver node system
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-16 16:45:47 +02:00 |
|
|
|
eb4aaaf434
|
New ErrorLogger implementation matching new SpigotCore implementation
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-16 13:10:00 +02:00 |
|
|
|
39ccff44a5
|
Fix performance and bugs
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-16 12:43:22 +02:00 |
|
|
|
71e89fb44a
|
Merge branch 'master' into replaying
|
2021-09-16 12:21:37 +02:00 |
|
|
|
947333b788
|
Merge pull request 'Update Heap size of ListCommand' (#243) from ListCommandHeap into master
Reviewed-on: SteamWar/BungeeCore#243
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2021-09-11 21:05:30 +02:00 |
|
|
|
8daedc4e74
|
Rework to new SQL api
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-11 09:26:14 +02:00 |
|
|
|
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: SteamWar/BungeeCore#241
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-09-08 19:47:57 +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: SteamWar/BungeeCore#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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
90883d6982
|
Merge branch 'master' into BetterDiscord
|
2021-08-24 10:03:35 +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 |
|
yoyosource
|
82a67448f3
|
Merge branch 'discord-bot'
|
2021-07-30 12:31:18 +02:00 |
|
yoyosource
|
65798840be
|
Add TeamCommand
Fix IngameChatListener at everyone and at here
|
2021-07-30 12:31:04 +02:00 |
|
yoyosource
|
70d79b24dd
|
Hotfix ChatListener for Discord chat
|
2021-07-30 12:10:50 +02:00 |
|
yoyosource
|
be5f5a033f
|
Hotfix IngameChatListener
|
2021-07-30 10:55:02 +02:00 |
|
yoyosource
|
de606f7527
|
Hotfix TablistManager NPE
|
2021-07-30 10:52:52 +02:00 |
|
yoyosource
|
9993a3bdf8
|
Fix AnnouncementListener
|
2021-07-30 10:49:51 +02:00 |
|
yoyosource
|
21894f0b15
|
Fix DiscordTicketListener Button text
|
2021-07-30 09:52:43 +02:00 |
|
yoyosource
|
46d22b66aa
|
Fix IngameChatListener
|
2021-07-30 09:46:05 +02:00 |
|
yoyosource
|
d666689465
|
Fix IngameChatListener
|
2021-07-30 09:44:55 +02:00 |
|
yoyosource
|
67566c2327
|
Merge branch 'master' into discord-bot
# Conflicts:
# src/de/steamwar/bungeecore/bot/listeners/IngameChatListener.java
|
2021-07-30 09:16:04 +02:00 |
|
yoyosource
|
4f83b67cab
|
Hotfix at mentions in Discord
|
2021-07-30 00:55:56 +02:00 |
|
yoyosource
|
8d6f40601c
|
Hotfix IngameChatListener
|
2021-07-30 00:52:14 +02:00 |
|
yoyosource
|
d13e6a56a6
|
Hotfix IngameChatListener
|
2021-07-30 00:51:32 +02:00 |
|
yoyosource
|
fd45a9873e
|
Hotfix IngameChatListener
|
2021-07-30 00:47:20 +02:00 |
|
yoyosource
|
a452ee6faf
|
Hotfix ChatListener
|
2021-07-30 00:42:55 +02:00 |
|
yoyosource
|
4390de1739
|
Hotfix IngameChatListener
|
2021-07-30 00:41:58 +02:00 |
|
yoyosource
|
664ea28ba6
|
Hotfix IngameChatListener
|
2021-07-30 00:41:19 +02:00 |
|
yoyosource
|
3db7dc7c35
|
Hotfix IngameChatListener
|
2021-07-30 00:41:03 +02:00 |
|
yoyosource
|
95b3fd9821
|
Fix BungeeCore.properties
|
2021-07-30 00:18:51 +02:00 |
|
yoyosource
|
7394cc859c
|
Fix SlashCommandListener
|
2021-07-29 22:22:43 +02:00 |
|
yoyosource
|
850a0d212e
|
Add BanCommand and MuteCommand
|
2021-07-29 22:20:15 +02:00 |
|
yoyosource
|
10cc652c39
|
Fix SlashCommandListener
|
2021-07-29 20:35:02 +02:00 |
|
yoyosource
|
a0f9764a4b
|
Add SlashCommandListener
Add WhoisCommand
|
2021-07-29 20:27:43 +02:00 |
|
yoyosource
|
df990e3bc9
|
Fix DiscordRulesMessage
Fix DiscordSchemAlert
Fix DiscordTicketMessage
|
2021-07-29 18:23:47 +02:00 |
|
yoyosource
|
1a8e8690ac
|
Add SchematicsManager
Fix '1 Spielern' to '1 Spieler'
|
2021-07-29 18:14:29 +02:00 |
|
yoyosource
|
54499a7c3e
|
Add BanCommand
Add MuteCommand
|
2021-07-29 17:22:50 +02:00 |
|
yoyosource
|
d9c819d096
|
Fix ChatListener for Discord chat
|
2021-07-29 17:08:31 +02:00 |
|
yoyosource
|
b7164cf005
|
Fix privateChat with Bot
|
2021-07-29 17:04:07 +02:00 |
|
yoyosource
|
a8d00de1e2
|
Remove massive resend
|
2021-07-29 16:56:58 +02:00 |
|
yoyosource
|
a0482c8867
|
Merge branch 'master' into discord-bot
|
2021-07-29 16:45:55 +02:00 |
|
yoyosource
|
268fa2d508
|
Add IngameChatListener
Add ServerTeamchatCommand
|
2021-07-29 16:40:39 +02:00 |
|
yoyosource
|
3394968b9e
|
Hotfix BungeeCore
|
2021-07-29 00:18:39 +02:00 |
|
yoyosource
|
3c253eaca5
|
Hotfix BungeeCore
|
2021-07-29 00:14:28 +02:00 |
|
yoyosource
|
4b7a76ae2f
|
Hotfix BungeeCore
|
2021-07-29 00:13:59 +02:00 |
|
yoyosource
|
e978d7f0ca
|
Hotfix DiscordRanks
|
2021-07-29 00:10:44 +02:00 |
|
|
|
daa800a182
|
Merge branch 'master' into discord-bot
|
2021-07-29 00:02:40 +02:00 |
|
Chaoscaot
|
7d2ebed84c
|
Add Schem alert
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-07-29 00:02:16 +02:00 |
|
|
|
342f0cf7cc
|
Merge branch 'master' into Tablist
|
2021-07-29 00:00:06 +02:00 |
|
Chaoscaot
|
1576d74900
|
Add Nick and Message
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-07-28 22:34:44 +02:00 |
|
Chaoscaot
|
cc1eb7dd74
|
Add Nick and Message
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-07-28 22:34:01 +02:00 |
|
Chaoscaot
|
3179c626ca
|
Adjust Message
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-07-28 22:00:13 +02:00 |
|
Chaoscaot
|
111e65281a
|
Adjusting Color
|
2021-07-28 21:41:23 +02:00 |
|
Chaoscaot
|
8de19123b9
|
Latest and Greatest
|
2021-07-28 21:39:35 +02:00 |
|
yoyosource
|
95ab4d3344
|
Fix DiscordRanks
|
2021-07-28 21:13:44 +02:00 |
|
yoyosource
|
aeaed0db99
|
Fix DiscordRanks
|
2021-07-28 21:00:10 +02:00 |
|
yoyosource
|
293ac47b58
|
Add DiscordRanks
|
2021-07-28 20:57:44 +02:00 |
|
yoyosource
|
80a5b0e0a4
|
Add DiscordRanks
|
2021-07-28 20:55:57 +02:00 |
|
yoyosource
|
398b3e9b5a
|
Add DiscordRanks
|
2021-07-28 20:41:46 +02:00 |
|
yoyosource
|
f3a448a68e
|
Merge remote-tracking branch 'origin/discord-bot' into discord-bot
|
2021-07-28 20:29:56 +02:00 |
|
yoyosource
|
2579e7adcb
|
Add DiscordRanks
|
2021-07-28 20:29:48 +02:00 |
|
