1727 Commits

Autor	SHA1	Nachricht	Datum
Lixfel	1e0eb5c039	Merge pull request 'Show no Chat Reports' (#436) from show_no_chat_reports into master ... Reviewed-on: #436 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2022-09-19 10:53:31 +02:00
yoyosource	43b123f2cf	Hotfix StatCommand	2022-09-18 13:46:39 +02:00
Chaoscaot	4c0afb4bbd	More Copyright	2022-09-18 11:53:29 +02:00
Chaoscaot	1168f8cc86	Add Copyright	2022-09-18 11:52:57 +02:00
Chaoscaot	a028db5462	Show no Chat Reports (Next to chat and Server List for NoChatReportsMod)	2022-09-18 11:51:36 +02:00
yoyosource	c36a6885cf	Fix merge conflicts	2022-09-17 11:34:51 +02:00
yoyosource	47dd2503cf	Merge branch 'master' into BauCommand ... # Conflicts: # src/de/steamwar/bungeecore/commands/BauCommand.java	2022-09-17 11:33:10 +02:00
MoBrot	27ddb447fe	Merge remote-tracking branch 'origin/BauLock' into BauLock	2022-09-16 23:39:12 +02:00
MoBrot	e483e32b31	+Add BauLock copyright header	2022-09-16 23:38:55 +02:00
Lixfel	be41928520	Merge branch 'master' into BauLock	2022-09-16 23:30:02 +02:00
MoBrot	3e9bd2768b	+Fixed player connect with teleport	2022-09-16 23:27:52 +02:00
yoyosource	eb8d8380d9	Update BauCommand	2022-09-14 17:54:25 +02:00
yoyosource	1a51e2c6a2	Merge branch 'master' into BauCommand ... # Conflicts: # src/de/steamwar/bungeecore/commands/BauCommand.java	2022-09-14 17:47:48 +02:00
Lixfel	160d482392	Merge pull request 'Add BauLock' (#415) from BauLock into master ... Reviewed-on: #415 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-09-14 11:51:49 +02:00
MoBrot	451de152b2	+Fixed noby and IllegalArgumentException	2022-09-13 22:52:38 +02:00
Lixfel	f9f0f83779	Don't kick players ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-09-13 22:34:59 +02:00
Chaoscaot	02c81068e7	Fix Double Bans	2022-09-12 17:54:42 +02:00
Lixfel	85c5201c82	Fix language ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-09-11 20:10:17 +02:00
Chaoscaot	2919283963	Whois Fixes	2022-09-11 20:04:24 +02:00
Lixfel	7377f5513a	Fix several issues ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-09-11 18:34:50 +02:00
Lixfel	fd1efaa22b	Fix case sensitivity ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-09-11 18:16:06 +02:00
Lixfel	29a30ec5bb	Fix missing return ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-09-11 18:11:58 +02:00
Lixfel	3e1d60245a	Fix fatal issues ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-09-11 18:08:42 +02:00
Chaoscaot	1af7b03987	Bump JDA & close Inpustream	2022-09-11 15:28:37 +02:00
Chaoscaot	d7530cae86	Add current infos to Whois	2022-09-09 20:38:37 +02:00
yoyosource	eee3dba1de	Simplify arena map typemapper	2022-09-09 16:35:05 +02:00
yoyosource	6206a80cc1	Merge remote-tracking branch 'origin/master'	2022-09-09 16:11:39 +02:00
yoyosource	9e579ee3d6	Hotfix case sensitive maps	2022-09-09 16:11:34 +02:00
Lixfel	1cbec668d1	Merge branch 'master' into BauLock ... # Conflicts: # src/de/steamwar/bungeecore/commands/HelpCommand.java	2022-09-09 15:49:04 +02:00
Lixfel	6ab0d3d983	Remove could not decode from ErrorLogger ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-09-09 08:40:55 +02:00
MoBrot	9a5b938fba	+Fixed Owner message when locked	2022-09-08 21:28:21 +02:00
MoBrot	fe0d0eaffb	+Add Owner message when bau is locked for Team	2022-09-08 20:49:17 +02:00
yoyosource	42898b0d4d	Hotfix npe	2022-09-08 19:45:20 +02:00
yoyosource	88724c75e3	Merge remote-tracking branch 'origin/master'	2022-09-08 18:24:38 +02:00
yoyosource	e3e68af80f	Hotfix ServerTeamchatCommand	2022-09-08 18:24:31 +02:00
Lixfel	3d958800fc	Remove sorted checker in fabric ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-09-08 17:29:25 +02:00
yoyosource	19c02ad786	Merge remote-tracking branch 'origin/overloadProtection' into BauCommand	2022-09-06 20:06:03 +02:00
Lixfel	43d5cb47bb	Overload protection ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-09-06 19:08:00 +02:00
yoyosource	4c44bc0a83	Update BauCommand	2022-09-06 17:13:15 +02:00
yoyosource	2676f97cfb	Hotfix TypeMappers	2022-09-06 16:45:56 +02:00
yoyosource	16c3f93741	Fix stuff	2022-09-06 15:36:27 +02:00
yoyosource	2325190cf1	Fix stuff	2022-09-03 14:33:00 +02:00
MoBrot	ef6435b176	+Fix BauCommand.setLocked ... +Fix BauCommand.isLocked +Update BauLockState.NONE to BauLockState.NOBODY +Move Userconfig.getUserLockState to BauCommand	2022-09-02 14:27:27 +02:00
yoyosource	669375e751	Update ChallengeCommand ... Update FightCommand Update HistoricCommand	2022-09-01 18:39:08 +02:00
yoyosource	7de6402a63	Update ChallengeCommand	2022-09-01 18:24:56 +02:00
yoyosource	cb591fda59	WIP	2022-09-01 18:01:51 +02:00
Chaoscaot	d14d748911	Improve Blocked Logging	2022-08-29 14:33:34 +02:00
Lixfel	f5675811ba	Hotfix join permissions ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-28 08:43:07 +02:00
Lixfel	f1f159a330	Finish BuilderCloud command ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-27 18:01:16 +02:00
Lixfel	6b89afd07d	Finish BuilderCloud command ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-27 17:16:02 +02:00
Lixfel	d17a4f882e	Merge branch 'master' into BuilderCloud	2022-08-27 14:27:50 +02:00
Lixfel	a6407d6bb0	Fix tablist failure on softreload ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-23 18:10:52 +02:00
Lixfel	d232d18fda	Merge pull request 'Fix 7/ replacer' (#423) from fix7replacer into master ... Reviewed-on: #423 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2022-08-23 17:31:17 +02:00
Lixfel	b76164ac8d	Merge pull request 'Add english aliases' (#422) from multilingAliases into master ... Reviewed-on: #422 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2022-08-23 17:22:32 +02:00
Lixfel	4217afef59	Fix 7/ replacer ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-23 17:21:49 +02:00
Lixfel	a27f74af56	Fix build ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-23 16:59:53 +02:00
Lixfel	a782f811fc	Add english aliases ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-23 16:57:19 +02:00
yoyosource	5c127e0887	Rebuild	2022-08-22 21:10:35 +02:00
yoyosource	3f99585b35	Rebuild	2022-08-22 21:09:27 +02:00
yoyosource	e29fb553f0	Remove deprecated guard api	2022-08-22 20:25:36 +02:00
Lixfel	ea94195db8	Fix folder inconsistencies ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-22 16:07:21 +02:00
Lixfel	e4cd94aecd	Fix lobbyconnection on disconnect ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-22 14:31:04 +02:00
Lixfel	b8404a74a7	Update to paper 1.19.2 ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-22 06:50:53 +02:00
Lixfel	bd1420cc90	Bye Bye Mail. ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-20 19:35:46 +02:00
Lixfel	5cf577c9e5	Bye Bye Mail. ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-20 19:22:21 +02:00
Lixfel	11106ab240	Bye Bye Mail. ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-20 19:15:28 +02:00
Lixfel	43a9b92b41	Bye Bye Mail. ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-20 19:10:26 +02:00
Lixfel	698f710138	Use /servers for server starts ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-20 18:15:02 +02:00
Lixfel	9439890131	Ignore took ms to process event in db ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-20 11:23:42 +02:00
yoyosource	abf4224788	Update WhoisCommand	2022-08-16 18:25:16 +02:00
MoBrot	c2211bdedf	Add HelCommand for /bau lock ... Add HelCommand for /bau unlock	2022-08-14 00:11:18 +02:00
MoBrot	39b63198d5	Add BungeeCore_de.properties "BAU_LOCKED_OPTIONS" Color correction ... Add BungeeCore.properties "BAU_LOCKED_OPTIONS" Color correction	2022-08-13 22:23:29 +02:00
MoBrot	19dad58712	Replace BauLock to UserConfig ... Update BauLockState.ALL to BauLockState.NONE Add "BAU_LOCKED_OPTIONS" in BungeeCore_de.properties Add "BAU_LOCKED_OPTIONS" in BungeeCore.properties	2022-08-13 21:18:54 +02:00
MoBrot	386395725d	Add BauLock ... Add BauCommand.isLocked Add BauLockState Add "BAU_LOCKED" and "BAU_UNLOCKED" in BungeeCore_de.properties Add "Bau_LOCKED" and "BAU_UNLOCKED" in BungeeCore.properties	2022-08-10 19:20:33 +02:00
Lixfel	e2f2968813	Close inventory on world reset ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-05 12:02:08 +02:00
Lixfel	d2d8bc0bf8	1.19.1 Buildserver ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-05 08:14:15 +02:00
Lixfel	dfab5e7630	1.19.1 Buildserver ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-04 17:48:54 +02:00
Lixfel	8599df7e4e	Fix CI again ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-04 17:10:17 +02:00
Lixfel	2f90bc2541	Fix CI ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-04 17:06:12 +02:00
Lixfel	a2f6a2c6ae	1.19.1 Support, API update ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-04 17:01:40 +02:00
MoBrot	229cf77035	Added BuilderCloudCommand ... Added BungeeCore.properties message Added BungeeCore_de.properties message Added ServerStarter for the BuilderCloud	2022-07-28 18:00:02 +02:00
Lixfel	32bd46c97d	Fix arena ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-07-22 10:25:14 +02:00
Lixfel	b562f1a24c	Merge pull request 'CommandArena' (#373) from CommandArena into master ... Reviewed-on: #373 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-07-22 08:53:21 +02:00
Lixfel	3266a2fdd0	Fix Command19 ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-07-21 12:25:14 +02:00
Lixfel	8aaad8647f	Fix Command19 ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-07-21 12:12:36 +02:00
Lixfel	0e376456e8	Potential tp fix, added link descriptor, MWG 1.19 build servers ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-07-21 11:31:53 +02:00
yoyosource	8bcefb102c	Update ArenaCommand	2022-07-18 16:19:48 +02:00
yoyosource	183248c0b1	Update ArenaCommand	2022-07-17 20:38:59 +02:00
yoyosource	93757ff86e	Merge branch 'master' into CommandArena	2022-07-17 20:34:19 +02:00
Lixfel	e30f4cc2ee	Fix strip ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-07-17 17:36:27 +02:00
Lixfel	3a54797d07	Use strip ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-07-17 17:34:15 +02:00
Lixfel	3053d5d301	Fix empty messages ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-07-17 17:31:11 +02:00
Lixfel	b80827ed1e	Fix local colorcodes ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-07-17 17:12:48 +02:00
Lixfel	c79f49b166	Remove OpenJDK ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-07-17 16:31:55 +02:00
Lixfel	cfa1ccc4b8	Test 1.19 OpenJDK ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-07-15 22:57:35 +02:00
yoyosource	92cc4cf897	Fix TpCommand for teamserver	2022-06-27 15:41:05 +02:00
yoyosource	4503ffce2e	Fix TpCommand for teamserver	2022-06-27 15:38:37 +02:00
yoyosource	d96d3caa43	Fix TpCommand for teamserver	2022-06-27 15:35:58 +02:00
yoyosource	f26fd7a700	Fix TpCommand for teamserver	2022-06-27 15:33:24 +02:00
yoyosource	2ce64e2203	Fix TpCommand for teamserver	2022-06-27 15:27:30 +02:00
yoyosource	732ad43e23	Fix TpCommand for teamserver	2022-06-27 15:25:06 +02:00
yoyosource	4b8950b369	Fix DevCommand	2022-06-26 17:45:23 +02:00
yoyosource	5c605df926	Fix TpCommand again	2022-06-26 16:23:08 +02:00
yoyosource	c8cf039987	Fix TpCommand again	2022-06-26 16:21:23 +02:00
yoyosource	61fff5ba08	Hotfix TpCommand	2022-06-26 16:17:44 +02:00
yoyosource	a6642d3d14	Update RCommand	2022-06-24 21:10:15 +02:00
Lixfel	0cd68d8ddc	Fix tablist order ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-23 15:15:00 +02:00
Lixfel	e327c939f7	Cleanup branch ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-23 10:00:26 +02:00
yoyosource	7302dd715c	Update deadline	2022-06-23 09:57:13 +02:00
yoyosource	4d8771eba1	Rebase onto master	2022-06-23 09:56:56 +02:00
yoyosource	e7b7cc01bc	Add schem deadline message to /event	2022-06-23 09:56:51 +02:00
yoyosource	1938eeefff	Add TabCompletionCache invalidation	2022-06-21 22:22:54 +02:00
YoyoNow	a34d847b3a	Merge branch 'master' into OptimizeMSGAndRCommand	2022-06-20 12:31:43 +02:00
Lixfel	1f1dcff9b5	Fix chat spoofing ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-19 15:24:06 +02:00
Lixfel	52e3da1e6e	Move network to own threads ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-19 13:00:23 +02:00
Lixfel	c30542970e	Fix npcs #4 ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-18 19:04:09 +02:00
Lixfel	cc6860b0a5	Fix npcs #3 ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-18 19:01:29 +02:00
Lixfel	78e602fd26	Fix npcs #3 ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-18 18:59:14 +02:00
Lixfel	c2338fe3d0	Fix npcs #2 ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-18 18:55:34 +02:00
Lixfel	593fe7389b	Fix npcs, revert failed fix ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-18 17:31:57 +02:00
Lixfel	cc01a4132d	Test fix tablist ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-18 16:07:06 +02:00
Lixfel	64567c1556	Fix softreload issues ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-18 14:32:25 +02:00
Lixfel	eb469896f9	Remove unnecessary put ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-18 14:17:38 +02:00
Lixfel	f7fbefec82	Make Tablist softreloadable ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-18 14:15:48 +02:00
Lixfel	616062354f	Fixes, working ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-18 14:07:00 +02:00
Lixfel	f2ed575f8c	Untested full tablist ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-18 13:17:23 +02:00
Lixfel	598dfcd8a0	Current tablist ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-18 13:16:44 +02:00
Lixfel	9703e9ea33	WIP new tablist ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-18 13:16:40 +02:00
yoyosource	eb81ffc9d8	Optimize MsgCommand ... Optimize RCommand	2022-06-17 09:53:04 +02:00
yoyosource	81913953d8	Update MsgCommand and RCommand to new Validator API	2022-06-16 23:10:27 +02:00
yoyosource	5eaa87885d	Hotfix SWCommand	2022-06-16 22:53:25 +02:00
yoyosource	c6a68fa2a1	Hotfix SWCommand	2022-06-16 22:27:45 +02:00
yoyosource	6192fd98c7	Hotfix SWCommand	2022-06-16 22:25:00 +02:00
yoyosource	059a945867	Hotfix SWCommand	2022-06-16 22:18:44 +02:00
yoyosource	c97233b68b	Hotfix SWCommand	2022-06-16 22:14:40 +02:00
yoyosource	cc839859a8	Hotfix SWCommand	2022-06-16 22:11:24 +02:00
yoyosource	742bc92f53	Hotfix WhoisCommand	2022-06-16 22:05:39 +02:00
yoyosource	cccba31c46	Hotfix SWCommand on hover	2022-06-16 21:09:50 +02:00
yoyosource	49043c4b0c	Fix TutorialCommand help messages	2022-06-16 21:03:04 +02:00
yoyosource	9b1a394cb2	Fix empty MsgCommand and RCommand	2022-06-16 20:54:07 +02:00
yoyosource	789bb62a14	Add Validator ... Update CommonCore	2022-06-16 20:41:52 +02:00
Lixfel	a4ad028f72	Fix imports ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-16 13:35:25 +02:00
Lixfel	dd9651d6c8	Merge pull request 'Update VerifyCommand' (#407) from CommandVerify into master ... Reviewed-on: #407 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:33:56 +02:00
Lixfel	d6e941bf72	Merge pull request 'Update WebregisterCommand' (#408) from CommandWebregister into master ... Reviewed-on: #408 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:33:09 +02:00
Lixfel	e156d3ad4a	Merge pull request 'Update WhoisCommand' (#409) from CommandWhois into master ... Reviewed-on: #409 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:32:22 +02:00
Lixfel	7c1925ad71	Merge pull request 'Update UnIgnoreCommand' (#406) from CommandUnIgnore into master ... Reviewed-on: #406 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:30:54 +02:00
Lixfel	3299620cd6	Merge pull request 'Update TutorialCommand' (#405) from CommandTutorial into master ... Reviewed-on: #405 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:30:30 +02:00
Lixfel	adee8f565b	Merge pull request 'Update StatCommand' (#402) from CommandStat into master ... Reviewed-on: #402 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:26:49 +02:00
Lixfel	01c721a753	Merge pull request 'Update SetLocaleCommand' (#401) from CommandSetLocale into master ... Reviewed-on: #401 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:26:27 +02:00
Lixfel	c3b3559875	Merge pull request 'Update ServerTeamchatCommand' (#400) from CommandServerTeamchat into master ... Reviewed-on: #400 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:25:54 +02:00
Lixfel	f00d1dc540	Merge pull request 'Update ServerSwitchCommand' (#399) from CommandServerSwitch into master ... Reviewed-on: #399 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:25:30 +02:00
Lixfel	c1a721cf4d	Merge pull request 'Update PollCommand' (#392) from CommandPoll into master ... Reviewed-on: #392 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:24:40 +02:00
Lixfel	60ca6fde85	Merge pull request 'Update ReplayCommand' (#398) from CommandReplay into master ... Reviewed-on: #398 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:24:08 +02:00
Lixfel	ecb3723c7c	Merge pull request 'Update RegelnCommand' (#397) from CommandRegeln into master ... Reviewed-on: #397 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:23:52 +02:00
Lixfel	6bcafde70c	Merge pull request 'Update RankCommand' (#396) from CommandRank into master ... Reviewed-on: #396 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:23:28 +02:00
Lixfel	90c1208cf5	Merge pull request 'Update RCommand' (#395) from CommandR into master ... Reviewed-on: #395 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:22:55 +02:00
Lixfel	5c534305d9	Merge pull request 'Update PunishmentCommand' (#394) from CommandPunishment into master ... Reviewed-on: #394 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:22:34 +02:00
Lixfel	f2a537da90	Merge pull request 'Update PollresultCommand' (#393) from CommandPollresult into master ... Reviewed-on: #393 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:17:45 +02:00
Lixfel	8ae6e90628	Merge pull request 'Update PlaytimeCommand' (#391) from CommandPlaytime into master ... Reviewed-on: #391 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:14:58 +02:00
Lixfel	7f5ef05235	Merge pull request 'Update PingCommand' (#390) from CommandPing into master ... Reviewed-on: #390 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:14:36 +02:00
Lixfel	7c898ac869	Merge pull request 'Update MsgCommand' (#389) from CommandMsg into master ... Reviewed-on: #389 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:14:14 +02:00
Lixfel	d55e2abdb4	Merge pull request 'Update LocalCommand' (#388) from CommandLocal into master ... Reviewed-on: #388 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:13:42 +02:00
Lixfel	734e8fc6c5	Merge pull request 'Update ListCommand' (#387) from CommandList into master ... Reviewed-on: #387 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:13:24 +02:00
Lixfel	045b693c92	Merge pull request 'Update KickCommand' (#386) from CommandKick into master ... Reviewed-on: #386 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:13:02 +02:00
Lixfel	0e430fee9b	Merge pull request 'Update IgnoreCommand' (#384) from CommandIgnore into master ... Reviewed-on: #384 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:11:18 +02:00
Lixfel	5bfac6c7b5	Merge pull request 'Update GDPRQuery' (#382) from CommandGDPRQuery into master ... Reviewed-on: #382 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:10:27 +02:00
Lixfel	1bfdecd6b0	Merge pull request 'Update EventreloadCommand' (#380) from CommandEventreload into master ... Reviewed-on: #380 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:03:28 +02:00
Lixfel	2aee854b5c	Merge pull request 'Update EventRescheduleCommand' (#379) from CommandEventReschedule into master ... Reviewed-on: #379 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:02:13 +02:00
Lixfel	41f89f5f0a	Merge pull request 'Update CheckCommand' (#377) from CommandCheck into master ... Reviewed-on: #377 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:00:46 +02:00
Lixfel	e46f68558a	Merge pull request 'Update DevCommand' (#378) from CommandDev into master ... Reviewed-on: #378 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:00:32 +02:00
Lixfel	dfb6f89b35	Merge pull request 'Update BugCommand' (#375) from CommandBug into master ... Reviewed-on: #375 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 12:50:48 +02:00
Lixfel	df9f6e44e3	Merge pull request 'Update AlertCommand' (#372) from CommandAlert into master ... Reviewed-on: #372 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 12:39:52 +02:00
yoyosource	4766e0ab96	Update WhoisCommand	2022-06-16 12:21:46 +02:00
yoyosource	d64a483bb6	Update WebregisterCommand	2022-06-16 12:19:23 +02:00
yoyosource	99807470ec	Update VerifyCommand	2022-06-16 12:18:15 +02:00
yoyosource	595929f4b2	Update UnIgnoreCommand	2022-06-16 12:17:01 +02:00
yoyosource	9e867a7457	Update TutorialCommand	2022-06-16 12:15:50 +02:00
yoyosource	29ed8b16b8	Update StatCommand	2022-06-16 11:19:50 +02:00
yoyosource	4cd0150042	Update SetLocaleCommand	2022-06-16 11:19:03 +02:00
yoyosource	b4b46b56a4	Update ServerTeamchatCommand	2022-06-16 11:18:13 +02:00
yoyosource	160136833e	Update ServerSwitchCommand	2022-06-16 11:16:47 +02:00
yoyosource	279577a536	Update ReplayCommand	2022-06-16 11:15:43 +02:00
yoyosource	67d816e90b	Update RegelnCommand	2022-06-16 11:10:19 +02:00
yoyosource	84ead29ddb	Update RCommand	2022-06-16 11:09:24 +02:00
yoyosource	21f020e13d	Update RankCommand	2022-06-16 11:08:12 +02:00
yoyosource	e4c07bc211	Update PunishmentCommand	2022-06-16 11:04:59 +02:00
yoyosource	a7541dc0c3	Update PollresultCommand	2022-06-16 10:57:12 +02:00
yoyosource	fd14666880	Update PollCommand	2022-06-15 20:18:31 +02:00
yoyosource	4134e564cc	Update PlaytimeCommand	2022-06-15 20:12:25 +02:00
yoyosource	6c301c987d	Update PingCommand	2022-06-15 20:11:21 +02:00
yoyosource	9f5e714912	Update MsgCommand	2022-06-15 20:10:09 +02:00
yoyosource	7236885590	Update LocalCommand	2022-06-15 20:07:29 +02:00
yoyosource	c6f9019ce3	Update ListCommand	2022-06-15 20:06:21 +02:00
yoyosource	19616aef84	Update KickCommand	2022-06-15 20:04:43 +02:00
yoyosource	8a21d5c93d	Enable SWTSI again	2022-06-14 22:53:22 +02:00
yoyosource	4fc0e69a47	Update IgnoreCommand	2022-06-14 21:56:04 +02:00
yoyosource	99f5fbc3b8	Update GDPRQuery	2022-06-14 21:49:20 +02:00
yoyosource	d85b93364e	Update EventRescheduleCommand	2022-06-14 21:42:05 +02:00
yoyosource	d0ac81aa93	Update EventreloadCommand	2022-06-14 21:31:48 +02:00
yoyosource	568f1bf598	Update DevCommand	2022-06-14 21:30:55 +02:00
yoyosource	d94080a0cb	Update CheckCommand	2022-06-14 21:20:45 +02:00
yoyosource	546e507939	Update BugCommand	2022-06-14 20:46:13 +02:00
yoyosource	5c55bdacde	Add tab completion to ArenaCommand	2022-06-14 20:16:36 +02:00
yoyosource	ae2a1d5779	Update ArenaCommand	2022-06-14 20:10:07 +02:00
yoyosource	08fdc1603e	Update AlertCommand	2022-06-14 20:03:40 +02:00
Lixfel	d83b6564d4	CI Rebuild ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-14 19:41:50 +02:00
yoyosource	8a417e32c1	Fix some stuff for later use	2022-06-14 18:19:25 +02:00
yoyosource	22ef3cd13d	Fix some stuff for later use	2022-06-14 18:16:44 +02:00
yoyosource	a0ae828fbd	Add SWCommand and corresponding api	2022-06-14 16:18:45 +02:00
yoyosource	bf4f7c6adf	Add ServerMetaInfo	2022-06-14 15:47:11 +02:00
Lixfel	7aadaa2df3	Fix communication ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-14 09:32:43 +02:00
Lixfel	b285585608	Fix packet direction ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-14 09:09:59 +02:00
Lixfel	07cb11e12b	Fix SWInventory ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-14 09:08:05 +02:00
Lixfel	571fa8c7d1	Fix concurrency, fix cast ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-14 08:56:09 +02:00
Lixfel	533f0a4269	Fix copyright ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-14 08:37:32 +02:00
Lixfel	41d27c567d	Merge branch 'master' into network ... # Conflicts: # src/de/steamwar/bungeecore/listeners/TablistManager.java	2022-06-14 08:28:10 +02:00
Lixfel	d05af2258b	Fix translation ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-13 22:38:09 +02:00
Lixfel	0446af29aa	Cannot spoof chat my ass ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-13 22:10:10 +02:00
yoyosource	3a97baa267	Add debug messages for fabric checks	2022-06-12 18:22:33 +02:00
yoyosource	8267966409	Merge remote-tracking branch 'origin/master'	2022-06-12 18:17:51 +02:00
yoyosource	3d57f9ca80	Add debug messages for fabric checks	2022-06-12 18:17:44 +02:00
Chaoscaot	e49546d3d8	Fix Remote Plugin Messages	2022-06-11 09:44:39 +02:00
Chaoscaot	a97a6a78e2	Fix Remote Plugin Messages	2022-06-11 08:55:51 +02:00
Lixfel	01ea928652	1.19 Build server ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-10 19:30:15 +02:00
Lixfel	c5ae7fd229	Merge branch 'master' into ConvertFromWaterfall	2022-06-08 16:53:01 +02:00
Lixfel	2f06ea374e	Simplify connection detection ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-08 16:18:04 +02:00
yoyosource	6769fd88e7	Fix TablistManager	2022-06-08 16:06:31 +02:00
yoyosource	bad4efd520	Convert everything from waterfall to plain bungee	2022-06-08 13:28:56 +02:00
yoyosource	9439887785	Fix TablistManager for newer BTLP plugin	2022-06-08 13:18:24 +02:00
yoyosource	27750d4e71	Merge remote-tracking branch 'origin/master'	2022-06-07 22:38:29 +02:00
yoyosource	1a91e561fa	Disable SWTSI for now	2022-06-07 22:38:08 +02:00
Chaoscaot	446b4ad519	Bungee Network	2022-06-07 20:53:09 +02:00
Lixfel	59672e8d02	Merge pull request 'Using sql connections in round robbin mode instead of the same (possibly)' (#361) from sql into master ... Reviewed-on: #361 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-07 14:14:21 +02:00
Lixfel	c74b2b2c84	Fix settings changed npe ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-07 14:13:51 +02:00
Lixfel	9f7f5eef36	Test fix ban timeout ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-04 22:49:07 +02:00
Lixfel	6d0a1f6bfd	Fix geyser floodgate null ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-04 16:23:13 +02:00
YoyoNow	dea8e0b731	Merge branch 'master' into sql	2022-06-03 22:25:37 +02:00
yoyosource	d4e2e80dd5	Hotfix WhoisCommand	2022-06-03 13:26:03 +02:00
yoyosource	edfbfb614d	Hotfix WhoisCommand	2022-06-03 13:24:47 +02:00
yoyosource	bb68a4a690	Using sql connections in round robbin mode instead of the same (possibly)	2022-06-02 17:08:29 +02:00
yoyosource	163e40f2dd	Fix ErrorLogger	2022-05-30 15:35:51 +02:00
yoyosource	2fb2fbc781	Add arg to replay command for direct selection of map	2022-05-30 11:31:15 +02:00
yoyosource	cb5f78a7de	Fix ChatListener MSG_FORMAT missing	2022-05-29 14:54:58 +02:00
yoyosource	86530eacf5	Fix TeamCommand better message	2022-05-28 13:32:12 +02:00
yoyosource	300a2ef502	Fix TeamCommand tp no message	2022-05-28 13:29:18 +02:00
yoyosource	f45ed11a59	Fix TeamCommand tp no message	2022-05-28 13:17:53 +02:00
yoyosource	1b61ba93e9	Fix TeamCommand tp no message	2022-05-28 13:12:31 +02:00
yoyosource	c7f16247ca	Fix TeamCommand tp no message	2022-05-28 13:08:50 +02:00
yoyosource	caa36b9461	Fix SettingsChangedListener error message	2022-05-28 12:57:51 +02:00
yoyosource	61b264ffcd	Merge remote-tracking branch 'origin/master'	2022-05-24 21:41:08 +02:00
yoyosource	d06a0a9c12	Fix TablistManager ... Fix ListCommand	2022-05-24 21:40:58 +02:00
yoyosource	63b6450ae8	Fix localhost connections	2022-05-24 20:04:35 +02:00
yoyosource	b3d16a1279	Fix localhost connections	2022-05-24 19:45:20 +02:00
yoyosource	29b2aee2f1	Fix TablistManager footer	2022-05-24 10:28:04 +02:00
yoyosource	5ba2a235c0	Fix TablistManager footer	2022-05-24 10:27:10 +02:00
Lixfel	f9a5a75442	Merge branch 'master' into english	2022-05-24 10:11:46 +02:00
Lixfel	e64e3c09ff	Various language fixes ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-05-24 10:11:10 +02:00
Lixfel	cfd72d099d	Fix NPE ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-05-24 09:03:31 +02:00
yoyosource	d5c6c7892e	Improve TpCommand for current checking players	2022-05-23 17:56:15 +02:00
yoyosource	4f6bb722ad	Fix stuff	2022-05-21 16:30:41 +02:00
yoyosource	5a129c6037	Fix SteamwarUser	2022-05-21 13:25:07 +02:00
yoyosource	8aed828f82	Add SettingsChangedListener	2022-05-21 13:04:30 +02:00
yoyosource	1204a5ccda	Update translations	2022-05-21 12:54:59 +02:00
yoyosource	df310716d8	Update language stuff	2022-05-21 12:48:03 +02:00
yoyosource	9445ed5f05	Fix initial english	2022-05-21 12:31:26 +02:00
yoyosource	2098cc9515	Add initial english	2022-05-21 12:31:26 +02:00
yoyosource	b95ae4cecc	Add initial english	2022-05-21 12:31:26 +02:00
yoyosource	081a0a2e3a	Add initial english	2022-05-21 12:31:26 +02:00
yoyosource	fdbab764d3	Add initial english	2022-05-21 12:31:26 +02:00
yoyosource	1847ba8f89	Fix command	2022-05-21 11:09:01 +02:00
yoyosource	df24f2685a	Add locale locking	2022-05-21 11:06:24 +02:00
yoyosource	092efd7063	Add locale locking	2022-05-21 11:00:08 +02:00
Lixfel	348aabc99a	Fix ban message showing ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-05-18 16:47:38 +02:00
yoyosource	1dedebb3aa	Fix BungeeCore.properties	2022-05-02 13:58:45 +02:00
Lixfel	0a5c89b8b7	Merge pull request 'Arena Merging 2.0' (#329) from arena_merging_2.0 into master ... Reviewed-on: #329 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-05-01 22:45:03 +02:00
Lixfel	cd15787ae1	Merge pull request 'Add some new punishments after talking with mods' (#352) from Punishment++ into master ... Reviewed-on: #352 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-05-01 22:20:01 +02:00
yoyosource	d1e90d8a6c	Speed BrandListener up	2022-04-27 10:08:54 +02:00
yoyosource	d4a50d3974	Speed BrandListener up	2022-04-27 10:06:44 +02:00
yoyosource	07da2c56a3	Merge remote-tracking branch 'origin/master' ... # Conflicts: # src/de/steamwar/bungeecore/listeners/BrandListener.java	2022-04-27 09:59:21 +02:00
yoyosource	6e158b38b8	Speed BrandListener up	2022-04-27 09:58:15 +02:00
Lixfel	d6c82e923f	Speed BrandListener up ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-26 19:58:41 +02:00
yoyosource	93dcb0d202	Revert "Update stuff" ... This reverts commit f61fcde5c9.	2022-04-26 19:25:32 +02:00
yoyosource	aaf389ea4c	Merge remote-tracking branch 'origin/Punishment++' into Punishment++	2022-04-26 18:18:34 +02:00
yoyosource	f61fcde5c9	Update stuff	2022-04-26 18:18:27 +02:00
YoyoNow	d0bbdd903b	Merge branch 'master' into Punishment++	2022-04-26 15:26:00 +02:00
yoyosource	9a28173496	Update stuff	2022-04-26 15:21:44 +02:00
yoyosource	cc86aa16a0	Update stuff	2022-04-26 15:21:09 +02:00
yoyosource	2ef6901f8e	Update WhoisCommand ... Add mutlie note punishments	2022-04-25 11:09:08 +02:00
Lixfel	50ac0ddc55	Speed Brandlistener up ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-24 17:54:06 +02:00
yoyosource	f52444f6e5	Add some new punishments after talking with mods	2022-04-24 15:02:03 +02:00
Lixfel	f30b779347	Fix BrandListener performance ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-24 08:29:21 +02:00
Chaoscaot	7191531045	Merge remote-tracking branch 'origin/master' into arena_merging_2.0 ... # Conflicts: # src/de/steamwar/bungeecore/commands/FightCommand.java	2022-04-23 12:19:41 +02:00
yoyosource	cd5bc889a6	Fix pr stuff	2022-04-23 11:01:13 +02:00
yoyosource	39471cf468	Merge remote-tracking branch 'origin/Teamserver' into Teamserver	2022-04-23 10:54:45 +02:00
yoyosource	383cd6097c	Fix pr stuff	2022-04-23 10:54:38 +02:00
YoyoNow	c976e6f7ce	Merge branch 'master' into Teamserver	2022-04-22 21:37:02 +02:00
yoyosource	b744f5286f	Update some stuff	2022-04-22 21:36:55 +02:00
Lixfel	9ac5a8ef8a	Fix sends ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 18:47:21 +02:00
Lixfel	015a3cfa52	Fix broeadcasts ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 17:26:28 +02:00
Lixfel	329d80f037	Fix Arenaserver ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 17:10:32 +02:00
Lixfel	4d53e8ced9	Fix chatcolor, arenacommand ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 16:14:35 +02:00
yoyosource	b8a3512643	Add SubserverProtocolFixer	2022-04-22 15:55:34 +02:00
Lixfel	f1f334a750	Fix msg, tp etc. ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 15:44:42 +02:00
yoyosource	75a6114447	Merge branch 'master' into Teamserver ... # Conflicts: # src/de/steamwar/bungeecore/listeners/ChatListener.java	2022-04-22 15:23:39 +02:00
Lixfel	f8232fcb48	Fix chat no receiver ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 15:16:33 +02:00
Lixfel	02fd7eb965	Fix discord targets ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 10:36:28 +02:00
Lixfel	4665d42fc7	Fix small issues ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-21 13:04:44 +02:00
Lixfel	c1048cfdbd	Current state ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-19 20:32:02 +02:00
Chaoscaot	0d6d342740	🐛 Fixes	2022-04-16 16:24:38 +02:00
Chaoscaot	c0f8f9274a	Merge branch 'master' into arena_merging_2.0	2022-04-16 16:13:18 +02:00
Chaoscaot	d854621752	🐛 Fixes	2022-04-16 16:13:10 +02:00
yoyosource	4a9ba9554a	Fix Teamserver integration	2022-04-16 09:54:40 +02:00
Lixfel	54932f6ebc	Current state ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-14 22:24:36 +02:00
Lixfel	0bf5a65850	Current state ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-14 20:44:09 +02:00
yoyosource	3e315ece3b	Merge remote-tracking branch 'origin/Teamserver' into Teamserver	2022-04-13 22:31:13 +02:00
yoyosource	2d3466aecb	Fix TeamCommand tablist	2022-04-13 22:30:53 +02:00
yoyosource	ea194d0f31	Fix TeamCommand	2022-04-13 22:21:08 +02:00
YoyoNow	6abf85718c	Merge branch 'master' into Teamserver	2022-04-13 22:02:48 +02:00
yoyosource	8191c134c7	Update local chat	2022-04-13 22:00:31 +02:00
yoyosource	acb7aa1efb	Update TeamCommand	2022-04-13 21:51:40 +02:00
yoyosource	10b6d2b38e	Update Team SQL api	2022-04-13 21:22:56 +02:00
Lixfel	336d4f6a3c	Fix NPE ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-13 20:55:51 +02:00
Lixfel	9dcb35a91e	Fix pipeline null errors ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-13 20:35:47 +02:00
YoyoNow	35bac7bbf7	Merge branch 'master' into BCCommands	2022-04-11 10:28:07 +02:00
yoyosource	b5bf48ce2a	Update /bc to allow commands	2022-04-11 10:27:49 +02:00
Lixfel	e3b9329de0	Merge pull request 'Ranked' (#333) from Ranked into master ... Reviewed-on: #333 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-04-11 08:23:12 +02:00
Lixfel	4a0c50a08d	Merge pull request 'Add Replay WIPISCH' (#334) from Replay into master ... Reviewed-on: #334 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-04-11 08:08:03 +02:00
yoyosource	e723224282	Fix Fabric stuff	2022-04-10 20:14:33 +02:00
Chaoscaot	190828692c	🐛 Fixing Punishment Errors	2022-04-10 19:20:16 +02:00
yoyosource	fa5d4ad983	Update some stuff	2022-04-09 22:08:17 +02:00
yoyosource	7a48584cbb	Update some stuff	2022-04-09 21:36:18 +02:00
yoyosource	4bdead92b5	Update some stuff	2022-04-09 21:30:52 +02:00
Lixfel	d67c9bac66	Merge pull request 'Show eventfights as finished immediatly' (#340) from instantEventend into master ... Reviewed-on: #340 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2022-04-09 21:06:56 +02:00
Lixfel	89f525adb4	Merge pull request 'Update some stuff' (#339) from FabricModStuff into master ... Reviewed-on: #339 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-04-09 20:58:27 +02:00
Lixfel	dbe2349f4f	Merge pull request 'Button Spliting' (#336) from buttons into master ... Reviewed-on: #336 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-04-09 20:57:46 +02:00
Lixfel	eb8a8a2e07	Show eventfights as finished immediatly ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-09 16:58:51 +02:00
Lixfel	1bc5011d4f	Prevent ProcessingSpam ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-08 13:21:45 +02:00
Lixfel	4f6bf71f82	Fix tp ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-08 13:12:00 +02:00
yoyosource	c367f11120	Update some stuff	2022-04-06 20:19:38 +02:00
Chaoscaot	f5eaadba4f	🎨 Now?	2022-04-06 18:33:44 +02:00
Chaoscaot	081a1d42ff	Merge branch 'master' into arena_merging_2.0	2022-04-06 18:32:05 +02:00
yoyosource	d585a6fa09	Merge remote-tracking branch 'origin/Ranked' into Ranked	2022-04-06 17:01:37 +02:00
yoyosource	169d26852c	Update some stuff	2022-04-06 17:01:33 +02:00
YoyoNow	519e732310	Merge branch 'master' into Ranked	2022-04-06 16:59:21 +02:00
yoyosource	9a0b3a41b9	Update some stuff	2022-04-06 16:59:11 +02:00
YoyoNow	d0e4690b8d	Merge branch 'master' into FabricModStuff	2022-04-05 19:57:10 +02:00
yoyosource	4c9ac4a984	Revert some stuff	2022-04-05 19:50:41 +02:00
yoyosource	6b8d46d75a	Revert some stuff	2022-04-05 19:47:48 +02:00
yoyosource	7b5ce77e93	Revert some stuff	2022-04-05 19:47:08 +02:00
yoyosource	3af6f43ccd	Revert some stuff	2022-04-05 19:40:50 +02:00