Merge branch 'WarShip9+10andWarGear10' of SteamWar/SpigotCore into master
Dieser Commit ist enthalten in:
Commit
5fe26b7d95
@ -5,6 +5,7 @@ import java.util.Map;
|
|||||||
|
|
||||||
public enum SchematicType {
|
public enum SchematicType {
|
||||||
Normal("", Type.NORMAL),
|
Normal("", Type.NORMAL),
|
||||||
|
|
||||||
CAirShip("CAS", Type.CHECK_TYPE),
|
CAirShip("CAS", Type.CHECK_TYPE),
|
||||||
CWarGear("CWG", Type.CHECK_TYPE),
|
CWarGear("CWG", Type.CHECK_TYPE),
|
||||||
CWarShip("CWS", Type.CHECK_TYPE),
|
CWarShip("CWS", Type.CHECK_TYPE),
|
||||||
@ -13,14 +14,22 @@ public enum SchematicType {
|
|||||||
WarGear("WG", Type.FIGHT_TYPE, CWarGear),
|
WarGear("WG", Type.FIGHT_TYPE, CWarGear),
|
||||||
WarShip("WS", Type.FIGHT_TYPE, CWarShip),
|
WarShip("WS", Type.FIGHT_TYPE, CWarShip),
|
||||||
MiniWarGear("MWG", Type.FIGHT_TYPE, CMiniWarGear),
|
MiniWarGear("MWG", Type.FIGHT_TYPE, CMiniWarGear),
|
||||||
|
|
||||||
|
CMPPWarGear1_12("CMPPWG", Type.CHECK_TYPE),
|
||||||
|
CSGWarShip("CSGWS", Type.CHECK_TYPE),
|
||||||
|
CWarGear1_10("CWG1.10", Type.CHECK_TYPE),
|
||||||
|
CWarShip1_10("CWS1.10", Type.CHECK_TYPE),
|
||||||
|
CWarShip1_9("CWS1.9", Type.CHECK_TYPE),
|
||||||
CWarShip1_8("CWS1.8", Type.CHECK_TYPE),
|
CWarShip1_8("CWS1.8", Type.CHECK_TYPE),
|
||||||
CWarGear1_7("CWG1.7", Type.CHECK_TYPE),
|
CWarGear1_7("CWG1.7", Type.CHECK_TYPE),
|
||||||
|
MPPWarGear1_12("MPPWG", Type.FIGHT_TYPE, CMPPWarGear1_12),
|
||||||
|
SGWarShip("SGWS", Type.FIGHT_TYPE, CSGWarShip),
|
||||||
|
WarGear1_10("WG1.10", Type.FIGHT_TYPE, CWarGear1_10),
|
||||||
|
WarShip1_10("WS1.10", Type.FIGHT_TYPE, CWarShip1_10),
|
||||||
|
WarShip1_9("WS1.9", Type.FIGHT_TYPE, CWarShip1_9),
|
||||||
WarShip1_8("WS1.8", Type.FIGHT_TYPE, CWarShip1_8),
|
WarShip1_8("WS1.8", Type.FIGHT_TYPE, CWarShip1_8),
|
||||||
WarGear1_7("WG1.7", Type.FIGHT_TYPE, CWarGear1_7),
|
WarGear1_7("WG1.7", Type.FIGHT_TYPE, CWarGear1_7),
|
||||||
CMPPWarGear1_12("CMPPWG", Type.CHECK_TYPE),
|
|
||||||
MPPWarGear1_12("MPPWG", Type.FIGHT_TYPE, CMPPWarGear1_12),
|
|
||||||
CSGWarShip("CSGWS", Type.CHECK_TYPE),
|
|
||||||
SGWarShip("SGWS", Type.FIGHT_TYPE, CSGWarShip),
|
|
||||||
COldschoolWG("COWG", Type.CHECK_TYPE),
|
COldschoolWG("COWG", Type.CHECK_TYPE),
|
||||||
OldschoolWG("OWG", Type.FIGHT_TYPE, COldschoolWG);
|
OldschoolWG("OWG", Type.FIGHT_TYPE, COldschoolWG);
|
||||||
|
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren