SteamWar/SpigotCore
Archiviert
13
0
Commit graph

285 Commits

Autor SHA1 Nachricht Datum
29dc01684a Merge pull request 'Add SWActionListInv' (#57) from TNTTracerInventory into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-09-05 14:44:45 +02:00
jojo
d856d4d476 Add SWActionListInv
Add SWActionBar
2020-09-05 14:30:31 +02:00
d7a2830bd8 Allow null schems 2020-09-04 18:01:25 +02:00
4e7820544e Merge branch 'prepare_open_source' 2020-09-03 20:03:09 +02:00
586a4f0c9f Merge pull request 'Fixing non loading items' (#56) from itemFix into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-08-29 18:44:21 +02:00
a01d1a93c4 Fixing non loading items 2020-08-29 12:52:08 +02:00
44b24dd223 Fix missing piece 2020-08-26 19:02:53 +02:00
8ecc58cb72 Prepare open source release 2020-08-26 19:00:35 +02:00
3bc9834782 Hotfix POI data mismatch mismatch 2020-08-18 17:58:34 +02:00
16a53462f1 Hotfix POI data mismatch mismatch 2020-08-15 18:11:28 +02:00
dc2d6c9a89 Hotfix leaving BE players 2020-07-26 15:26:26 +02:00
d74f08b179 Fix AirShip-Testarena startup 2020-07-26 08:11:48 +02:00
743e40c9ce Fix BedrockEdition inability for Non-Full-Chunk packets 2020-07-25 12:58:11 +02:00
021a189823 Speed server start up 2020-07-21 17:07:13 +02:00
1b17b513d2 Merge pull request 'Implementing first multilingual framework' (#52) from multiLingualFramework into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-07-16 18:09:33 +02:00
c943520418 Implementing Elo database connection 2020-07-07 18:48:24 +02:00
90368b6600 Adding fightplayer fix 2020-07-04 10:59:24 +02:00
7f2be86849 Implementing first multilingual framework 2020-07-04 10:21:21 +02:00
35cad5e64c POI data mismatch ignoring 2020-06-22 13:06:57 +02:00
c0e6a0d1b6 Hotfix 2020-05-21 21:37:35 +02:00
59ac233885 Merge pull request 'Implementing rank system' (#50) from implementRanks into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-05-21 21:26:32 +02:00
08f0ff3bb1 Flipping values 2020-05-12 17:24:42 +02:00
31629db692 Implementing rank system 2020-05-12 09:10:24 +02:00
abd9815de9 Adding schematic by id method 2020-04-30 15:43:58 +02:00
5534cfb6d9 Hotfix recipe spam 2020-04-11 13:04:46 +02:00
6e616c6366 Ignore bad schematic tileentity coordinates 2020-04-04 13:20:15 +02:00
aaed31f072 Revert "Hotfix wrong fix"
This reverts commit aa835be3
2020-04-03 19:20:52 +02:00
aa835be357 Hotfix wrong fix 2020-04-03 19:04:44 +02:00
376f285b5e Fix dependencies 2020-04-02 08:31:36 +02:00
09ed5acec8 Fixing 1.15 .schem loading 2020-04-01 19:08:38 +02:00
49a023050c Fixing 1.15 .schematic loading 2020-04-01 18:22:14 +02:00
111d99cf8b Reducing exception spam 2020-03-28 10:26:26 +01:00
b0e2b9ee02 Reducing exception spam 2020-03-22 07:52:36 +01:00
6f3e1ebc3c Merge branch 'schemType' of SteamWar/SpigotCore into master 2020-02-23 21:44:05 +01:00
78b57a78db Load 1.15 Schems in 1.12 2020-02-22 15:20:01 +01:00
8ac38aff31 Full (untested) implementation 2020-02-22 15:09:42 +01:00
4a9a678a63 Merge branch 'master' into schemType
# Conflicts:
#	SpigotCore_Main/src/de/steamwar/sql/Schematic.java
2020-02-22 11:21:07 +01:00
c761d67f10 Merge branch 'fixingNPE' of SteamWar/SpigotCore into master 2020-02-11 17:41:14 +01:00
b5c1eb0823 Fixing NPE on disconnect 2020-02-10 14:58:13 +01:00
7e3925fbc5 Merge branch 'makingSqlSaver' of SteamWar/SpigotCore into master 2020-02-10 13:49:05 +01:00
151ec960bb Rework SQL statements to actually use PreparedStatements for security reasons 2020-02-07 16:45:02 +01:00
a6d5e70f46 Merge remote-tracking branch 'origin/master' 2020-02-01 14:47:33 +01:00
0ecf0b1a42 Hotfix of missing SchemData NPE 2020-02-01 14:47:23 +01:00
87f512bf2f Merge branch 'dynamic_instanciation' of SteamWar/SpigotCore into master 2020-01-28 06:29:07 +01:00
9df9439120 Hotfixing disabled 2020-01-26 13:43:20 +01:00
1e0856d9bb Merge branch 'removing_pair' of SteamWar/SpigotCore into master 2020-01-26 08:40:38 +01:00
ef01e8f685 Fixing checktype classification 2020-01-25 14:04:07 +01:00
f883220618 Fixing dynamic implementation 2020-01-25 13:47:16 +01:00
f34cfdd254 Revert "Hotrevert to static instanciation"
This reverts commit 9eb46e7a
2020-01-25 12:51:45 +01:00
59cac59fe9 Revert "Hotfix static instanciation"
This reverts commit 86254479
2020-01-25 12:51:29 +01:00