version bump (1.11)

This commit is contained in:
lenis0012 2016-11-17 23:59:17 +01:00
parent ae38ae353e
commit bbe53fe01f
4 changed files with 16 additions and 16 deletions

View file

@ -1,6 +1,6 @@
{ {
"name": "Marriage v2.0.13", "name": "Marriage v2.0.14",
"type": "release", "type": "release",
"gameVersion": "1.10.2", "gameVersion": "1.11",
"downloadURL": "http://ci.lenis0012.com/job/Marriage/94/artifact/target/Marriage-Spigot-2.0.13.jar" "downloadURL": "http://ci.lenis0012.com/job/Marriage/97/artifact/target/Marriage-Spigot-2.0.14.jar"
} }

10
pom.xml
View file

@ -4,7 +4,7 @@
<groupId>com.lenis0012.bukkit</groupId> <groupId>com.lenis0012.bukkit</groupId>
<artifactId>marriage2</artifactId> <artifactId>marriage2</artifactId>
<version>2.0.14-SNAPSHOT</version> <version>2.0.14</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Marriage</name> <name>Marriage</name>
<url>http://dev.bukkit.org/server-mods/marriage-reloaded/</url> <url>http://dev.bukkit.org/server-mods/marriage-reloaded/</url>
@ -33,13 +33,7 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId> <artifactId>spigot-api</artifactId>
<version>1.10.2-R0.1-SNAPSHOT</version> <version>1.11-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.9-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

View file

@ -44,9 +44,17 @@ public interface MPlayer {
* Get current marriage of the player. * Get current marriage of the player.
* *
* @return Player's marriage, NULL if not married. * @return Player's marriage, NULL if not married.
* @deprecated Use {@link #getFirstMarriage()} or {@link #getMarriage(UUID)} or {@link #getMarriages()}
*/ */
@Deprecated
MData getMarriage(); MData getMarriage();
MData getFirstMarriage();
MData getMarriage(UUID withPlayer);
MData getMarriages();
/** /**
* Get the last name the player logged on with. * Get the last name the player logged on with.
* *

View file

@ -5,13 +5,11 @@
[ [
"---[ Changelog ]---", "---[ Changelog ]---",
"", "",
"- Added permission for colored PMs", "- Compile for 1.11",
"", "",
"- Added pvp toggle command", "- Fix status formatting",
"", "",
"- Added gender to chat (optional)", "- Allow colors in message formats",
"",
"- Added EXP bonus option"
], ],
[ [
"====[ DONATE ]====", "====[ DONATE ]====",