Merge pull request #85 from Parabot/development

[MERGE] Development into Master
This commit is contained in:
Jeroen Ketelaar
2017-08-28 22:53:13 +02:00
committed by GitHub
5 changed files with 28 additions and 7 deletions
+10 -1
View File
@@ -27,7 +27,7 @@ notifications:
env:
global:
- PROVIDER_VERSION=1.21.1
- PROVIDER_VERSION=1.21.2
cache:
directories:
@@ -52,3 +52,12 @@ deploy:
- master
- development
jdk: 'oraclejdk7'
- provider: script
script: "cp .travis.settings.xml $HOME/.m2/settings.xml && mvn package javadoc:javadoc deploy site:deploy"
skip_cleanup: true
on:
repo: Parabot/Parabot-317-API-Minified
branch:
- master
jdk: 'oraclejdk7'
+12
View File
@@ -0,0 +1,12 @@
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
http://maven.apache.org/xsd/settings-1.0.0.xsd">
<servers>
<server>
<id>parabot-maven</id>
<username>${env.FTP_USERNAME}</username>
<password>${env.FTP_PASSWORD}</password>
</server>
</servers>
</settings>
+1 -1
View File
@@ -6,7 +6,7 @@
<groupId>org.parabot</groupId>
<artifactId>317-api-minified</artifactId>
<version>1.21.1</version>
<version>1.21.2</version>
<name>Parabot 317-API-Minified</name>
<licenses>
@@ -20,7 +20,7 @@ public interface Client {
void setInterface(int id);
void setAmountOrNameInput(int amount);
void setAmountOrNameInput(String text);
int[] getCurrentExp();
@@ -41,12 +41,12 @@ public class Interfaces {
}
/**
* Sets the int by the given Amount
* Sets the String by the given Amount
*
* @param amount Amount to set
* @param text Amount to set
*/
public static void setAmountOrNameInput(int amount) {
Loader.getClient().setAmountOrNameInput(amount);
public static void setAmountOrNameInput(String text) {
Loader.getClient().setAmountOrNameInput(text);
}
/**