SteamWar/SpigotCore
Archiviert
13
0
Commit graph

845 Commits

Autor SHA1 Nachricht Datum
yoyosource
56e70a4cb2 Merge remote-tracking branch 'origin/master'
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-28 14:41:04 +01:00
yoyosource
c2f03d5279 Hotfix SWCommand command sorting 2021-12-28 14:40:59 +01:00
22e869f45a Merge pull request 'Fix Clock' (#151) from fix_legacy_items into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #151
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-12-27 18:15:42 +01:00
Chaoscaot
a4202c702a Fix Clock
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-12-27 18:05:16 +01:00
17f5c42530 Merge pull request 'Add Schematic Type Material' (#150) from schematic_type_material into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #150
Reviewed-by: YoyoNow <jwsteam@nidido.de>
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-12-27 17:09:00 +01:00
Chaoscaot
2e76b7f740 Add Schematic Type Material
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-12-27 17:06:57 +01:00
d1168993ea Merge pull request 'Fix Visual Skull' (#149) from fix_skull into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #149
Reviewed-by: YoyoNow <jwsteam@nidido.de>
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-12-27 16:53:34 +01:00
Chaoscaot
6cd9d729ff Fix Visual Skull
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-12-27 16:51:54 +01:00
9b1d88b4f5 Merge pull request 'Some Fixes for SchematicSelector' (#140) from fix_rank into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #140
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-12-27 16:29:43 +01:00
50924742be Merge pull request 'Adding Replay lock' (#148) from replayLock into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #148
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-12-27 12:57:29 +01:00
84843a53f1 Adding Replay lock
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-27 12:38:41 +01:00
yoyosource
8c1e4281ca Fix building again
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Add SWCommand.StaticValue.allowISE
2021-12-25 22:57:16 +01:00
yoyosource
0a130fd7fc Fix building, but you cannot test anything from spigot core locally
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-24 13:23:19 +01:00
yoyosource
256cf4140d Hotfix CommandPart tabComplete #145
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2021-12-24 13:16:46 +01:00
99cc770c3b Merge pull request 'Add optional Material to SchematicType' (#144) from SchemTypeMaterial into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #144
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-12-22 07:57:06 +01:00
yoyosource
af956db60b Fix SchematicType
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-19 17:54:44 +01:00
yoyosource
de126919b1 Merge remote-tracking branch 'origin/SchemTypeMaterial' into SchemTypeMaterial
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-19 11:05:44 +01:00
yoyosource
a63dbafd2b Fix SchematicType 2021-12-19 11:05:35 +01:00
c8d554d164 Merge branch 'master' into SchemTypeMaterial
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-18 13:55:29 +01:00
yoyosource
118a8e8277 Add optional Material to SchematicType
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-17 20:15:19 +01:00
55c1b7c9ef Merge pull request 'Implement Punishments' (#143) from implement_punishments into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #143
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-12-17 06:35:53 +01:00
zOnlyKroks
e18d8c4868 Removed Unused Statements
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-16 17:49:45 +01:00
zOnlyKroks
da8b27d5ff UTF-8 + Bugfixes
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-16 17:40:01 +01:00
zOnlyKroks
9d5a0a0a1b Merge remote-tracking branch 'origin/implement_punishments' into implement_punishments
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-16 17:27:19 +01:00
zOnlyKroks
c1a4a91bb9 Bugfixes 2021-12-16 17:27:08 +01:00
b5983de98f Merge branch 'master' into implement_punishments
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-16 16:42:11 +01:00
zOnlyKroks
4da002788d Implement Punishments
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-16 16:37:05 +01:00
006d0efaae Merge pull request 'Spigot 1.18 Support' (#142) from mc1.18 into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #142
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2021-12-16 15:49:47 +01:00
417523126c Merge branch 'master' into mc1.18
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
# Conflicts:
#	SpigotCore_Main/src/de/steamwar/core/Core.java
2021-12-16 15:47:55 +01:00
yoyosource
235bdce294 Fix CommandPart for optional parameter at end of command
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-15 15:05:03 +01:00
yoyosource
74866de040 Fix SWCommandUtils.numberMapper
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-13 11:59:20 +01:00
yoyosource
611bc58576 Fix SubCommand
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-13 01:18:13 +01:00
yoyosource
1fbf43d3d3 Fix SubCommand
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-13 01:11:11 +01:00
yoyosource
0280c57fe8 Force build
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-13 00:53:37 +01:00
yoyosource
78c1697952 Merge remote-tracking branch 'origin/master'
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2021-12-13 00:50:05 +01:00
yoyosource
b01c99f02d Fix SWCommandUtils.numberMapper with nan
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-13 00:48:53 +01:00
9092bef1e3 Merge pull request 'CMD' (#141) from CMD into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #141
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-12-12 15:58:19 +01:00
1ba50faad3 Bugfixes
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-12 09:56:15 +01:00
65e4ebeb6d Spigot 1.18 Support
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-11 16:55:36 +01:00
yoyosource
1fe04962a5 Fix SWCommandUtils SteamwarUser
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-11 13:59:53 +01:00
yoyosource
c45dc395a8 Merge remote-tracking branch 'origin/CMD' into CMD
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-11 13:43:37 +01:00
yoyosource
c1b3ab6dbb Fix SWCommandUtils SteamwarUser 2021-12-11 13:43:16 +01:00
Chaoscaot
4ab9e8298a Merge branch 'master' into fix_rank
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
# Conflicts:
#	SpigotCore_Main/src/de/steamwar/inventory/SchematicSelector.java
2021-12-11 13:08:02 +01:00
Chaoscaot
04de43ed4d Improve Performance
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-12-11 13:04:05 +01:00
Chaoscaot
72708d7183 More Fixes
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-12-11 12:58:09 +01:00
76d31ac0e2 Merge branch 'master' into CMD
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-11 12:56:58 +01:00
d29a000fe5 Merge pull request 'Add Sorting to SchematicSelector' (#139) from selector_sorting into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #139
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-12-11 12:43:03 +01:00
yoyosource
afa80082b3 Fix SWCommandUtils.createEnumMapper
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-10 18:14:06 +01:00
yoyosource
7e96e4c2d5 Fix CommandPart.generateArgumentArray for vararg
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-10 11:11:30 +01:00
yoyosource
46beaddbd7 Fix SWCommandUtils.generateCommandPart
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-09 23:24:06 +01:00