1305 Commits

Dieser Branch

Dieser Branch

Alle Branches

Autor	SHA1	Nachricht	Datum
yoyosource	bf0d41d43d	Update SWCommand	2022-03-22 19:15:26 +01:00
yoyosource	3cc924e5b0	Merge remote-tracking branch 'origin/master'	2022-03-22 18:59:07 +01:00
yoyosource	7584d2b60f	Update SWCommand	2022-03-22 18:59:01 +01:00
Lixfel	a6e2dbe1b8	Fix statement	2022-03-15 11:21:03 +01:00
Lixfel	6c9137bd18	Remove unused ReplayLock	2022-03-15 08:34:46 +01:00
Lixfel	9da8320a41	Merge pull request 'Add more schematic options' (#183) from replayColor into master ... Reviewed-on: #183 Reviewed-by: YoyoNow <jwsteam@nidido.de> Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>	2022-03-15 08:23:39 +01:00
Lixfel	3fc4c104e2	Add more schematic options	2022-03-14 10:36:41 +01:00
Lixfel	1eb5a87331	Register StartingServer-ID	2022-03-11 22:14:23 +01:00
Lixfel	317912763a	Merge pull request 'Fix FightEndsPacket' (#182) from FixRanked into master ... Reviewed-on: #182 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-03-11 09:03:53 +01:00
yoyosource	ead92be3d8	Fix FightEndsPacket	2022-03-10 22:03:18 +01:00
Lixfel	d3385f5197	Merge pull request 'Add ranked rework' (#181) from Ranked into master ... Reviewed-on: #181 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-03-10 12:07:07 +01:00
yoyosource	d8b86b1263	Remove SQLProvider.getCurrentSeason	2022-03-10 12:01:10 +01:00
yoyosource	55e4419d1b	Add FightEndsPacket	2022-03-09 20:41:21 +01:00
yoyosource	42c95f0ee8	Update stuff	2022-03-09 20:24:28 +01:00
yoyosource	74b219994b	Update stuff	2022-03-09 20:10:26 +01:00
yoyosource	4dedf82458	Update stuff	2022-03-09 20:09:41 +01:00
yoyosource	d470e951f8	Add Season ... Update Elo for later rework in FightSystem and BungeeCore	2022-03-09 14:44:56 +01:00
Lixfel	62660d136b	Merge pull request 'Add error message for user when executing command' (#179) from CommandFrameworkErrors into master ... Reviewed-on: #179 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-03-07 20:06:22 +01:00
yoyosource	4ca5adecc7	Fix tests	2022-03-07 20:04:34 +01:00
yoyosource	5d2df615aa	Merge remote-tracking branch 'origin/CommandFrameworkErrors' into CommandFrameworkErrors	2022-03-07 20:02:29 +01:00
yoyosource	ea72aedb1f	Fix SpigotCore.properties	2022-03-07 20:01:55 +01:00
yoyosource	4608e360ee	Add error message for user when executing command	2022-03-07 20:01:55 +01:00
YoyoNow	3dac7104b3	Merge branch 'master' into CommandFrameworkErrors	2022-03-07 20:01:30 +01:00
yoyosource	86faec3041	Fix SpigotCore.properties	2022-03-07 13:44:45 +01:00
Lixfel	1aefd4faef	Fix reset	2022-03-06 16:51:01 +01:00
yoyosource	950c4e4272	Add error message for user when executing command	2022-03-06 14:27:26 +01:00
Lixfel	a51a2a482e	Merge pull request 'Some Fixes for Schematics' (#178) from schematic_fixes into master ... Reviewed-on: #178 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-03-06 10:51:45 +01:00
Chaos	0ad3867630	fix(schematics): Some Fixes ... Signed-off-by: Chaos <chaoscaot444@gmail.com>	2022-03-05 22:50:17 +01:00
Lixfel	3b6be14958	Merge pull request 'Force tinyprotocol injection' (#177) from forceInjection into master ... Reviewed-on: #177 Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>	2022-03-05 22:12:19 +01:00
Lixfel	705aafca3a	Force tinyprotocol injection	2022-03-05 20:38:48 +01:00
Lixfel	bedf79a4ad	Fix EventFight insertion	2022-03-04 22:19:05 +01:00
Lixfel	189a209755	Merge pull request 'Standalone TeamTeilnahme' (#175) from standaloneTeamTeilnahme into master ... Reviewed-on: #175 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2022-03-03 14:37:01 +01:00
Lixfel	d9581179bb	Merge pull request 'Fix Tabcomplete Cache' (#176) from cache_fix into master ... Reviewed-on: #176 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-02-24 22:48:52 +01:00
Chaos	839d738949	fix(schemnode_cache): Fix Tabcomplete Cache ... Signed-off-by: Chaos <chaoscaot444@gmail.com>	2022-02-24 22:26:49 +01:00
Lixfel	aff6adc7e8	Standalone TeamTeilnahme	2022-02-24 22:22:20 +01:00
Lixfel	191fd779fc	Merge pull request 'tab_cache' (#173) from tab_cache into master ... Reviewed-on: #173 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2022-02-24 21:16:39 +01:00
yoyosource	952d472eca	Fix TeamTeilnahme	2022-02-23 19:30:06 +01:00
Chaos	e807bfc793	fix(schemnode_cache): Normalize Cache Keys ... Signed-off-by: Chaos <chaoscaot444@gmail.com>	2022-02-20 15:11:33 +01:00
Chaos	04ad17a285	Merge remote-tracking branch 'origin/master' into tab_cache	2022-02-20 15:01:49 +01:00
Lixfel	da3ae03ecd	Merge pull request 'standalone' (#174) from standalone into master ... Reviewed-on: #174	2022-02-20 15:00:33 +01:00
Chaos	ec402f1c97	fix(standalone): Problems with SchematicNodes ... Signed-off-by: Chaos <chaoscaot444@gmail.com>	2022-02-19 20:11:58 +01:00
Lixfel	7315658df8	Merge pull request 'Standalone SpigotCore' (#165) from standalone into master ... Reviewed-on: #165 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2022-02-19 19:46:30 +01:00
Lixfel	8a0bb17ac4	Merge branch 'master' into standalone	2022-02-19 19:44:14 +01:00
Lixfel	3a3da8342c	Merge pull request '1.18 schematic loading support' (#170) from 1.18-schematics into master ... Reviewed-on: #170 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2022-02-11 22:52:01 +01:00
Lixfel	3c3ab79333	Schei¿ Encoding	2022-02-11 22:16:26 +01:00
Lixfel	2202f5aa7b	Merge branch 'master' into standalone	2022-02-11 22:05:35 +01:00
Chaos	2659bdd539	fix(standalone): Imports ... Signed-off-by: Chaos <chaoscaot444@gmail.com>	2022-02-11 22:04:45 +01:00
Chaos	a11a2015b7	Merge remote-tracking branch 'origin/standalone' into standalone ... # Conflicts: # SpigotCore_Main/src/de/steamwar/sql/StandaloneProvider.java	2022-02-11 22:03:37 +01:00
Chaoscaot	73438a1b8a	fix(standalone): Imports ... Signed-off-by: Chaos <chaoscaot444@gmail.com>	2022-02-11 22:03:11 +01:00
Lixfel	50a64e0eca	Merge pull request 'Standalone Schematic Node Impl' (#171) from standalone_schematicsystem into standalone ... Reviewed-on: #171	2022-02-11 22:02:03 +01:00