SteamWar/SpigotCore
Archiviert
13
0
Commit graph

784 Commits

Autor SHA1 Nachricht Datum
afef1a6a22 Revert "Untyped field"
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
This reverts commit 8ea301b596.
2022-02-02 18:57:44 +01:00
8ea301b596 Untyped field
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2022-02-02 18:48:34 +01:00
5f1fb5595e Merge pull request 'Fix login disconnect errors' (#164) from instantLogout into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #164
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2022-02-01 11:26:50 +01:00
9f78734f86 Merge pull request 'Update SWCommandUtils and shorten the methods' (#163) from SWCommandUtilsShortening into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #163
Reviewed-by: Lixfel <lixfel@steamwar.de>
2022-02-01 11:25:32 +01:00
49dd120b18 Merge pull request 'Remove deprecated APIs' (#125) from removeDeprecated into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #125
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2022-02-01 11:24:52 +01:00
1993dd5a65 Fix login disconnect errors
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2022-02-01 11:19:03 +01:00
yoyosource
c33bc728ec Update SWCommandUtils and shorten the methods
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2022-02-01 11:16:33 +01:00
8d05308cbf Merge branch 'master' into removeDeprecated
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2022-01-29 15:30:44 +01:00
15a35ca5a7 Merge pull request 'Fix' (#161) from fix_isPunished into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #161
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2022-01-29 15:02:52 +01:00
Chaos
aab7cbb363 Fix
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2022-01-29 15:01:31 +01:00
8caaa01204 Merge pull request 'Move BauServerInfo to SpigotCore' (#160) from provider into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #160
Reviewed-by: Lixfel <lixfel@steamwar.de>
2022-01-28 15:59:29 +01:00
Chaos
79d9a8b902 Ignored
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2022-01-28 15:57:45 +01:00
Chaos
c593e23b80 Simplify
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2022-01-28 15:55:18 +01:00
Chaos
4e801ea4eb Change Providers
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2022-01-28 15:37:54 +01:00
Chaos
9ff498133d Move Provider to SpigotCore
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2022-01-27 21:36:42 +01:00
ccf8af3f3f Merge pull request '1.12 Schem Selector Fix' (#159) from schem_sel_fix into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #159
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2022-01-12 20:10:16 +01:00
Chaoscaot
5bcdac1ea1 Merge branch 'master' into schem_sel_fix
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2022-01-11 16:59:05 +01:00
af1b06b9ed Remove further deprecated apis
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2022-01-08 08:58:42 +01:00
8a1076b30d Merge branch 'master' into removeDeprecated
# Conflicts:
#	SpigotCore_Main/src/de/steamwar/sql/Fight.java
2022-01-08 08:49:46 +01:00
225bca0516 Ignore removal NoSuchElement
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2022-01-08 08:36:55 +01:00
Chaos
629d341de0 1.12 Schem Selector Fix
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2022-01-07 22:56:37 +01:00
548de003d8 Ignore outdated minecraft
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2022-01-07 22:43:03 +01:00
ee4fbe7853 Merge pull request 'Fixes for SchematicSelector' (#156) from fixes into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #156
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2022-01-04 14:08:07 +01:00
Chaoscaot
40ee3209a2 Fixes for SchematicSelector
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2022-01-04 14:07:17 +01:00
yoyosource
36f782f1de Improve CommandFramework Exception readability
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2022-01-03 00:51:28 +01:00
yoyosource
3c55c1680e Improve CommandFramework Exception readability
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2022-01-03 00:46:14 +01:00
yoyosource
c0d3edd4b0 Improve CommandFramework Exception readability
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2022-01-03 00:42:00 +01:00
yoyosource
a9a8a83c46 Merge remote-tracking branch 'origin/master'
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2022-01-03 00:28:48 +01:00
yoyosource
1d41641b3b Improve CommandFramework Exception readability 2022-01-03 00:28:41 +01:00
bbbddbc77c Merge pull request 'Implement execute command packet for lobby' (#155) from executeCommandPacket into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #155
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2022-01-02 11:54:06 +01:00
2ae3047787 Implement execute command packet for lobby
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2022-01-02 11:36:49 +01:00
aa412e655b HOTFIX Folder deletion
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-30 21:31:20 +01:00
0e3544f730 Merge pull request 'Fix Invalid Schem Names' (#153) from is_punished into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #153
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-12-30 21:13:10 +01:00
Chaoscaot
be493f0864 Merge branch 'master' into is_punished
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2021-12-30 21:12:41 +01:00
Chaoscaot
6fd08c3b9d Fix Invalid Schem Names
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-12-30 21:12:00 +01:00
9c3427a1ac Merge pull request 'Is Punished' (#152) from is_punished into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #152
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-12-30 20:15:03 +01:00
Chaoscaot
5fe45ff161 Is Punished
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-12-30 20:13:18 +01:00
Chaoscaot
cff70e70c2 Is Punished
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-12-30 20:11:17 +01:00
yoyosource
d9fc0a5a2f Hotfix SWCommand command sorting
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-28 19:41:37 +01:00
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