1293 Commits

Dieser Branch

Dieser Branch

Alle Branches

Autor	SHA1	Nachricht	Datum
Lixfel	fd9a87c357	Merge branch 'commonDB'	2022-11-22 16:01:17 +01:00
Lixfel	bcd856dc82	Update CommonCore (Fix SchemElo NPE)	2022-11-22 15:58:16 +01:00
Lixfel	9f2a3b0359	Update CommonCore (Fix SchemElo NPE)	2022-11-22 14:52:25 +01:00
Lixfel	64ab415f90	Merge pull request 'commonDB' (#211) from commonDB into master ... Reviewed-on: #211	2022-11-22 11:36:13 +01:00
Lixfel	e8d4dd6319	Update to CommonCore master	2022-11-22 11:34:57 +01:00
Lixfel	c8992567e3	Merge branch 'master' into commonDB ... # Conflicts: # SpigotCore_Main/src/de/steamwar/sql/Replay.java	2022-11-22 11:30:48 +01:00
Lixfel	37c01fece7	Current state	2022-11-15 18:40:48 +01:00
Lixfel	18525814d8	Current state	2022-11-02 22:38:21 +01:00
Lixfel	b147614f49	Fix replay	2022-10-29 13:20:57 +02:00
Lixfel	5c05a4a7db	Fixes	2022-10-29 13:19:36 +02:00
Lixfel	74823ba86f	Fix merge issues	2022-10-29 12:42:41 +02:00
Lixfel	4548f80843	Merge branch 'master' into commonDB ... # Conflicts: # SpigotCore_Main/src/de/steamwar/core/Core.java # SpigotCore_Main/src/de/steamwar/sql/SWException.java # SpigotCore_Main/src/de/steamwar/sql/SchematicData.java # SpigotCore_Main/src/de/steamwar/sql/SchematicNode.java	2022-10-29 12:37:36 +02:00
Lixfel	d50398ca25	Merge pull request 'Add interfaces added by commondb for seamless transition' (#217) from commonDBBridge into master ... Reviewed-on: #217 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2022-10-29 12:21:50 +02:00
Lixfel	10dfc034e3	Merge pull request 'Add Custom Callbacks for SWListInv' (#218) from hotfix_custom_callbacks into master ... Reviewed-on: #218 Reviewed-by: YoyoNow <jwsteam@nidido.de> Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-10-29 12:21:42 +02:00
Chaoscaot	b7e057e775	Fix	2022-10-28 21:24:38 +02:00
Chaoscaot	7726948a06	Add Custom Callbacks for SWListInv	2022-10-28 21:16:21 +02:00
Lixfel	45d7f27153	Add interfaces added by commondb for seamless transition	2022-10-28 11:29:24 +02:00
Lixfel	02d47a3157	Merge pull request 'Add SchematicSelector AnvilInv returns' (#215) from schem_selector_reusable into master ... Reviewed-on: #215 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-10-28 10:08:38 +02:00
Lixfel	82291844c3	Merge pull request 'Remove Unused and obsolet SWActionListInv.java' (#216) from remove_legacy_code into master ... Reviewed-on: #216 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-10-28 10:07:11 +02:00
Chaoscaot	2f668dbf55	Remove Unused and obsolet SWActionListInv.java	2022-10-27 13:05:04 +02:00
Chaoscaot	7ce6668de4	Add AnvilInv LeftClick and SchematicSelector AnvilInv returns	2022-10-27 12:58:16 +02:00
Lixfel	3e5347dfef	Merge pull request 'Fix Rank 2 in Rank 1 Fight' (#214) from fix_rank_dismatch into master ... Reviewed-on: #214 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-10-20 21:39:14 +02:00
Chaoscaot	26973bb840	Fix Rank 2 in Rank 1 Fight	2022-10-20 20:11:12 +02:00
Lixfel	c554d79fec	Fix crash logging	2022-10-09 14:44:35 +02:00
Lixfel	297791ec60	Fix crash logging	2022-10-08 13:07:53 +02:00
Lixfel	368195bed2	Fix crashdetector on unclean shutdown	2022-10-07 20:21:41 +02:00
Lixfel	97ce222ccf	Merge branch 'master' into commonDB ... # Conflicts: # CommonCore	2022-09-26 10:05:28 +02:00
yoyosource	33268c18f6	Update CommonCore	2022-09-25 16:54:51 +02:00
yoyosource	faece5410c	Update CommonCore	2022-09-25 13:28:54 +02:00
yoyosource	671a29ebf4	Update CommonCore	2022-09-25 12:04:34 +02:00
yoyosource	fdd2a72a31	Update CommonCore	2022-09-25 11:56:25 +02:00
Lixfel	64dc2089c3	Fix Build and missing SchematicData function	2022-09-24 20:20:57 +02:00
Lixfel	e06b7e27f5	Fix Message	2022-09-24 20:03:40 +02:00
Lixfel	f4fcec5d11	Update CommonCore	2022-09-24 20:00:30 +02:00
yoyosource	ea0f109516	Update CommonCore	2022-09-24 19:49:15 +02:00
yoyosource	77ebd3dd2d	Update CommonCore	2022-09-23 12:51:49 +02:00
yoyosource	0d12e09470	Rebuild	2022-09-23 12:49:58 +02:00
Lixfel	6b59e06fea	Full CommonDB untested	2022-09-20 16:42:03 +02:00
Lixfel	a267810cf6	Merge branch 'master' into commonDB ... # Conflicts: # CommonCore	2022-09-20 16:41:37 +02:00
Lixfel	5b41b2112d	Full CommonDB untested	2022-09-20 16:41:07 +02:00
yoyosource	4462c95607	Add CaseInsensitiveCommandsListener	2022-09-18 19:59:20 +02:00
Lixfel	5b3cfefaaf	Merge pull request 'Finaler Rettungsstuss (+10 ATK gegen untote Server)' (#210) from suicide into master ... Reviewed-on: #210 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2022-09-14 12:22:58 +02:00
Lixfel	f2a08e0e56	Finaler Rettungsstuss (gegen untote Server)	2022-09-14 12:20:24 +02:00
Lixfel	282b258e55	Fix headmeta for bedrock player	2022-09-10 21:44:51 +02:00
Lixfel	9a4e85d749	WIP current state	2022-09-08 10:42:57 +02:00
Lixfel	7d74179c26	Fix chunkhider, push commoncore version	2022-08-29 19:49:15 +02:00
Lixfel	e5147943d9	Improve crash handling	2022-08-29 09:50:44 +02:00
Lixfel	8457e4cb8f	Uncomment secure chat popup	2022-08-27 11:17:17 +02:00
Lixfel	751a986b3b	Merge branch 'ServerDataHandler' ... # Conflicts: # SpigotCore_19/src/de/steamwar/core/ChatWrapper19.java # SpigotCore_8/src/de/steamwar/core/ChatWrapper8.java # SpigotCore_Main/src/de/steamwar/core/ChatWrapper.java	2022-08-27 11:12:29 +02:00
Lixfel	b241ac378a	Fix file name	2022-08-24 14:42:08 +02:00