|
c8992567e3
|
Merge branch 'master' into commonDB
# Conflicts:
# SpigotCore_Main/src/de/steamwar/sql/Replay.java
|
2022-11-22 11:30:48 +01:00 |
|
|
37c01fece7
|
Current state
SteamWarCI Build successful
|
2022-11-15 18:40:48 +01:00 |
|
|
18525814d8
|
Current state
|
2022-11-02 22:38:21 +01:00 |
|
|
b147614f49
|
Fix replay
SteamWarCI Build successful
|
2022-10-29 13:20:57 +02:00 |
|
|
5c05a4a7db
|
Fixes
SteamWarCI Build successful
|
2022-10-29 13:19:36 +02:00 |
|
|
74823ba86f
|
Fix merge issues
|
2022-10-29 12:42:41 +02:00 |
|
|
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 |
|
|
d50398ca25
|
Merge pull request 'Add interfaces added by commondb for seamless transition' (#217) from commonDBBridge into master
SteamWarCI Build successful
Reviewed-on: #217
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2022-10-29 12:21:50 +02:00 |
|
|
10dfc034e3
|
Merge pull request 'Add Custom Callbacks for SWListInv' (#218) from hotfix_custom_callbacks into master
SteamWarCI Build successful
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
SteamWarCI Build successful
|
2022-10-28 21:24:38 +02:00 |
|
Chaoscaot
|
7726948a06
|
Add Custom Callbacks for SWListInv
SteamWarCI Build successful
|
2022-10-28 21:16:21 +02:00 |
|
|
45d7f27153
|
Add interfaces added by commondb for seamless transition
SteamWarCI Build successful
|
2022-10-28 11:29:24 +02:00 |
|
|
02d47a3157
|
Merge pull request 'Add SchematicSelector AnvilInv returns' (#215) from schem_selector_reusable into master
SteamWarCI Build successful
Reviewed-on: #215
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2022-10-28 10:08:38 +02:00 |
|
|
82291844c3
|
Merge pull request 'Remove Unused and obsolet SWActionListInv.java' (#216) from remove_legacy_code into master
SteamWarCI Build successful
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
SteamWarCI Build successful
|
2022-10-27 13:05:04 +02:00 |
|
Chaoscaot
|
7ce6668de4
|
Add AnvilInv LeftClick and SchematicSelector AnvilInv returns
SteamWarCI Build successful
|
2022-10-27 12:58:16 +02:00 |
|
|
3e5347dfef
|
Merge pull request 'Fix Rank 2 in Rank 1 Fight' (#214) from fix_rank_dismatch into master
SteamWarCI Build successful
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
SteamWarCI Build successful
|
2022-10-20 20:11:12 +02:00 |
|
|
c554d79fec
|
Fix crash logging
SteamWarCI Build successful
|
2022-10-09 14:44:35 +02:00 |
|
|
297791ec60
|
Fix crash logging
SteamWarCI Build successful
|
2022-10-08 13:07:53 +02:00 |
|
|
368195bed2
|
Fix crashdetector on unclean shutdown
SteamWarCI Build successful
|
2022-10-07 20:21:41 +02:00 |
|
|
97ce222ccf
|
Merge branch 'master' into commonDB
SteamWarCI Build successful
# Conflicts:
# CommonCore
|
2022-09-26 10:05:28 +02:00 |
|
yoyosource
|
33268c18f6
|
Update CommonCore
SteamWarCI Build successful
|
2022-09-25 16:54:51 +02:00 |
|
yoyosource
|
faece5410c
|
Update CommonCore
SteamWarCI Build successful
|
2022-09-25 13:28:54 +02:00 |
|
yoyosource
|
671a29ebf4
|
Update CommonCore
SteamWarCI Build successful
|
2022-09-25 12:04:34 +02:00 |
|
yoyosource
|
fdd2a72a31
|
Update CommonCore
SteamWarCI Build successful
|
2022-09-25 11:56:25 +02:00 |
|
|
64dc2089c3
|
Fix Build and missing SchematicData function
|
2022-09-24 20:20:57 +02:00 |
|
|
e06b7e27f5
|
Fix Message
|
2022-09-24 20:03:40 +02:00 |
|
|
f4fcec5d11
|
Update CommonCore
|
2022-09-24 20:00:30 +02:00 |
|
yoyosource
|
ea0f109516
|
Update CommonCore
SteamWarCI Build successful
|
2022-09-24 19:49:15 +02:00 |
|
yoyosource
|
77ebd3dd2d
|
Update CommonCore
SteamWarCI Build successful
|
2022-09-23 12:51:49 +02:00 |
|
yoyosource
|
0d12e09470
|
Rebuild
SteamWarCI Build successful
|
2022-09-23 12:49:58 +02:00 |
|
|
6b59e06fea
|
Full CommonDB untested
|
2022-09-20 16:42:03 +02:00 |
|
|
a267810cf6
|
Merge branch 'master' into commonDB
# Conflicts:
# CommonCore
|
2022-09-20 16:41:37 +02:00 |
|
|
5b41b2112d
|
Full CommonDB untested
|
2022-09-20 16:41:07 +02:00 |
|
yoyosource
|
4462c95607
|
Add CaseInsensitiveCommandsListener
SteamWarCI Build successful
|
2022-09-18 19:59:20 +02:00 |
|
|
5b3cfefaaf
|
Merge pull request 'Finaler Rettungsstuss (+10 ATK gegen untote Server)' (#210) from suicide into master
SteamWarCI Build successful
Reviewed-on: #210
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2022-09-14 12:22:58 +02:00 |
|
|
f2a08e0e56
|
Finaler Rettungsstuss (gegen untote Server)
SteamWarCI Build successful
|
2022-09-14 12:20:24 +02:00 |
|
|
282b258e55
|
Fix headmeta for bedrock player
SteamWarCI Build successful
|
2022-09-10 21:44:51 +02:00 |
|
|
9a4e85d749
|
WIP current state
|
2022-09-08 10:42:57 +02:00 |
|
|
7d74179c26
|
Fix chunkhider, push commoncore version
SteamWarCI Build successful
|
2022-08-29 19:49:15 +02:00 |
|
|
e5147943d9
|
Improve crash handling
SteamWarCI Build successful
|
2022-08-29 09:50:44 +02:00 |
|
|
8457e4cb8f
|
Uncomment secure chat popup
SteamWarCI Build successful
|
2022-08-27 11:17:17 +02:00 |
|
|
751a986b3b
|
Merge branch 'ServerDataHandler'
SteamWarCI Build successful
# 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 |
|
|
b241ac378a
|
Fix file name
SteamWarCI Build successful
|
2022-08-24 14:42:08 +02:00 |
|
|
982779607f
|
Merge pull request 'Improved error and crash reporting' (#208) from improvedErrorReporting into master
SteamWarCI Build successful
Reviewed-on: #208
Reviewed-by: Chaoscaot <chaoscaot@zohomail.eu>
|
2022-08-23 22:15:03 +02:00 |
|
|
2c5ee201f6
|
Improved error and crash reporting
SteamWarCI Build successful
|
2022-08-23 20:10:49 +02:00 |
|
|
3693db65c7
|
Merge pull request 'Fix TinyProtocol null player issues' (#207) from minifyTinyProtocol into master
SteamWarCI Build successful
Reviewed-on: #207
Reviewed-by: YoyoNow <jwsteam@nidido.de>
Reviewed-by: Chaoscaot <chaoscaot@zohomail.eu>
|
2022-08-23 14:10:14 +02:00 |
|
|
e66744ab5e
|
Kick player on injection failure
SteamWarCI Build successful
|
2022-08-23 13:08:38 +02:00 |
|
|
e84958309b
|
Fix generic type search
SteamWarCI Build successful
|
2022-08-23 13:00:46 +02:00 |
|