diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index 08739483..4c06c2f2 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
com.volmit
Mortar
Mortar
- 1.0.74
+ 1.0.75
That crap between the bricks
@@ -140,10 +140,10 @@
false
C:\Users\cyberpwn\Documents\development\workspace\Mortar/scripts/doublecopy.bat
- C:\Users\cyberpwn\Documents\development\workspace\Mortar\target\Mortar-1.0.74.jar
- C:\Users\cyberpwn\Documents\development\workspace\Mortar\release\1.0.74\Mortar-1.0.74.jar
+ C:\Users\cyberpwn\Documents\development\workspace\Mortar\target\Mortar-1.0.75.jar
+ C:\Users\cyberpwn\Documents\development\workspace\Mortar\release\1.0.75\Mortar-1.0.75.jar
C:\Users\cyberpwn\Documents\development\workspace\Mortar\release\Mortar.jar
- 1.0.74
+ 1.0.75
@@ -152,10 +152,10 @@
false
C:\Users\cyberpwn\Documents\development\workspace\Mortar/scripts/doublecopy.bat
- C:\Users\cyberpwn\Documents\development\workspace\Mortar\target\Mortar-1.0.74.jar
- C:\Users\cyberpwn\Documents\development\workspace\Mortar\release\1.0.74\Mortar-1.0.74.jar
+ C:\Users\cyberpwn\Documents\development\workspace\Mortar\target\Mortar-1.0.75.jar
+ C:\Users\cyberpwn\Documents\development\workspace\Mortar\release\1.0.75\Mortar-1.0.75.jar
C:\Users\cyberpwn\Documents\development\workspace\Mortar\release\Mortar.jar
- 1.0.74
+ 1.0.75
@@ -180,6 +180,10 @@
central
https://raw.githubusercontent.com/cyberpwnn/Central/master/
+
+ volmit
+ http://nexus.volmit.com:8080/repository/volmit/
+
dmulloy2-repo
http://repo.dmulloy2.net/nexus/repository/public/
@@ -196,28 +200,58 @@
- net.md-5
- bungeecord-api
- 1.12-SNAPSHOT
+ org.spigot
+ spigot
+ 1.12.2
+ provided
+
+
+ org.craftbukkit
+ craftbukkit15
+ 15
+ provided
+
+
+ org.craftbukkit
+ craftbukkit14
+ 14
+ provided
+
+
+ org.craftbukkit
+ craftbukkit13
+ 13
+ provided
+
+
+ org.craftbukkit
+ craftbukkit12
+ 12
+ provided
+
+
+ org.craftbukkit
+ craftbukkit11
+ 11
+ provided
+
+
+ org.craftbukkit
+ craftbukkit10
+ 10
+ provided
+
+
+ org.craftbukkit
+ craftbukkit19
+ 19
+ provided
+
+
+ org.craftbukkit
+ craftbukkit18
+ 18
provided
-
-
- bungeecord-chat
- net.md-5
-
-
- bungeecord-config
- net.md-5
-
-
- bungeecord-event
- net.md-5
-
-
- bungeecord-protocol
- net.md-5
-
-
com.comphenix.protocol
@@ -253,76 +287,6 @@
1.18.4
provided
-
- cb
- spigot
- 1
- system
- ${project.basedir}/lib/spigot-1.12.2.jar
-
-
- cb
- craftbukkit-1.14.2
- 1
- system
- ${project.basedir}/lib/craftbukkit-1.14.2.jar
-
-
- cb
- craftbukkit-1.13
- 1
- system
- ${project.basedir}/lib/craftbukkit-1.13.jar
-
-
- cb
- craftbukkit-1.13.2
- 1
- system
- ${project.basedir}/lib/craftbukkit-1.13.2.jar
-
-
- cb
- craftbukkit-1.12.2
- 1
- system
- ${project.basedir}/lib/craftbukkit-1.12.2.jar
-
-
- cb
- craftbukkit-1.11.2
- 1
- system
- ${project.basedir}/lib/craftbukkit-1.11.2.jar
-
-
- cb
- craftbukkit-1.10.2
- 1
- system
- ${project.basedir}/lib/craftbukkit-1.10.2.jar
-
-
- cb
- craftbukkit-1.9.4
- 1
- system
- ${project.basedir}/lib/craftbukkit-1.9.4.jar
-
-
- cb
- craftbukkit-1.9.2
- 1
- system
- ${project.basedir}/lib/craftbukkit-1.9.2.jar
-
-
- cb
- craftbukkit-1.8.8
- 1
- system
- ${project.basedir}/lib/craftbukkit-1.8.8.jar
-
cbx
lightapi
@@ -341,7 +305,7 @@
volmit
- http://nexus.volmit.com/content/repositories/volmit
+ http://nexus.volmit.com:8080/repository/volmit/
diff --git a/pom.xml b/pom.xml
index ed610ac7..e07e5dbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
com.volmit
Mortar
- 1.0.74
+ 1.0.75
Mortar
That crap between the bricks
@@ -350,7 +350,7 @@
volmit
- http://nexus.volmit.com/content/repositories/volmit
+ http://nexus.volmit.com:8080/repository/volmit/
\ No newline at end of file
diff --git a/release/1.0.74/Mortar-1.0.74.jar b/release/1.0.74/Mortar-1.0.74.jar
index 7a2077bb..98431f08 100644
Binary files a/release/1.0.74/Mortar-1.0.74.jar and b/release/1.0.74/Mortar-1.0.74.jar differ
diff --git a/release/1.0.75/Mortar-1.0.75.jar b/release/1.0.75/Mortar-1.0.75.jar
new file mode 100644
index 00000000..189befdb
Binary files /dev/null and b/release/1.0.75/Mortar-1.0.75.jar differ
diff --git a/release/Mortar.jar b/release/Mortar.jar
index 7a2077bb..189befdb 100644
Binary files a/release/Mortar.jar and b/release/Mortar.jar differ
diff --git a/src/main/java/mortar/api/nms/Catalyst.java b/src/main/java/mortar/api/nms/Catalyst.java
index 032b7701..3d8cb885 100644
--- a/src/main/java/mortar/api/nms/Catalyst.java
+++ b/src/main/java/mortar/api/nms/Catalyst.java
@@ -27,6 +27,9 @@ private static CatalystHost getHost()
case R1_14:
D.as("NMP").v("Selected Catalyst:14");
return new Catalyst14();
+ case R1_15:
+ D.as("NMP").v("Selected Catalyst:15");
+ return new Catalyst15();
case R1_8:
D.as("NMP").v("Selected Catalyst:8");
return new Catalyst8();
diff --git a/src/main/java/mortar/api/nms/Catalyst15.java b/src/main/java/mortar/api/nms/Catalyst15.java
index 9687b388..fab6a92c 100644
--- a/src/main/java/mortar/api/nms/Catalyst15.java
+++ b/src/main/java/mortar/api/nms/Catalyst15.java
@@ -215,13 +215,13 @@ private BlockPosition toBlockPos(Location location)
@Override
public String getServerVersion()
{
- return "1_14_R1";
+ return "1_15_R1";
}
@Override
public String getVersion()
{
- return "1.14.X";
+ return "1.15.X";
}
@Override
diff --git a/version.txt b/version.txt
index 31995df2..38136b15 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.0.74
+1.0.75