2006-Scape/Parabot
1
0
Fork 0
mirror of https://github.com/2006-Scape/Parabot.git synced 2026-07-06 08:39:33 +00:00
Code Issues 2 Packages Projects Releases 3 Wiki Activity

Merge pull request #43 from Parabot/master

Browse Source 
[MERGE] Master into Development
This commit is contained in:
Jeroen Ketelaar
2016-01-11 11:40:21 +01:00
parent f90e7f3beb 3835bc2355
commit 91f9f4c6b9
6 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -1,6 +1,6 @@
# Parabot # Parabot
Parabot V2.4 Parabot V2.4.
#### Website #### Website
deploy/deploy.bat
+1
View File
@@ -1,3 +1,4 @@
mvn install:install-file -DgroupId=${project.groupId} -DartifactId=${project.artifactId} -Dversion=${project.version} -Dpackaging=jar -Dfile=../target/${project.build.finalName}-fat.jar -DlocalRepositoryPath=../../Maven-Repository mvn install:install-file -DgroupId=${project.groupId} -DartifactId=${project.artifactId} -Dversion=${project.version} -Dpackaging=jar -Dfile=../target/${project.build.finalName}-fat.jar -DlocalRepositoryPath=../../Maven-Repository
:: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.4.1.1 -Dpackaging=jar -Dfile=../target/Parabot-V2.4.1.1-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository :: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.4.1.1 -Dpackaging=jar -Dfile=../target/Parabot-V2.4.1.1-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository
:: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.4.3 -Dpackaging=jar -Dfile=../target/Parabot-V2.4.3-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository
pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<groupId>org.parabot</groupId> <groupId>org.parabot</groupId>
<artifactId>client</artifactId> <artifactId>client</artifactId>
<version>2.4.1.1</version> <version>2.4.3.2</version>
<packaging>jar</packaging> <packaging>jar</packaging>
src/main/java/org/parabot/environment/Environment.java
+9 -7
View File
@@ -33,14 +33,16 @@ public class Environment {
libs.add(new Naga()); libs.add(new Naga());
for(Library lib : libs) { for(Library lib : libs) {
if(!lib.hasJar() && lib.requiresJar()) { if (lib.requiresJar()) {
Core.verbose("Downloading " + lib.getLibraryName() + "..."); if (!lib.hasJar()) {
VerboseLoader.setState("Downloading " + lib.getLibraryName() + "..."); Core.verbose("Downloading " + lib.getLibraryName() + "...");
WebUtil.downloadFile(lib.getDownloadLink(), lib.getJarFile(), VerboseLoader.get()); VerboseLoader.setState("Downloading " + lib.getLibraryName() + "...");
Core.verbose("Downloaded " + lib.getLibraryName() + "."); WebUtil.downloadFile(lib.getDownloadLink(), lib.getJarFile(), VerboseLoader.get());
Core.verbose("Downloaded " + lib.getLibraryName() + ".");
}
Core.verbose("Initializing " + lib.getLibraryName());
lib.init();
} }
Core.verbose("Initializing " + lib.getLibraryName());
lib.init();
} }
Core.verbose("Loading server: " + desc.toString() + "..."); Core.verbose("Loading server: " + desc.toString() + "...");
src/main/java/org/parabot/environment/scripts/Category.java
+1 -1
View File
@@ -16,7 +16,7 @@ import java.util.HashMap;
public enum Category public enum Category
{ {
AGILITY, COMBAT, COOKING, CRAFTING, CONSTRUCTION, DUNGEONEERING, FARMING, FIREMAKING, FISHING, FLETCHING, HERBLORE, HUNTER, MAGIC, MINIGAMES, MINING, OTHER, PRAYER, RUNECRAFTING, SLAYER, SMITHING, THIEVING, UTILITY, WOODCUTTING; AGILITY, COMBAT, COOKING, CRAFTING, CONSTRUCTION, DUNGEONEERING, FARMING, FIREMAKING, FISHING, FLETCHING, HERBLORE, HUNTER, MAGIC, MINIGAMES, MINING, MONEYMAKING, OTHER, PRAYER, RUNECRAFTING, SLAYER, SMITHING, THIEVING, UTILITY, WOODCUTTING;
/** /**
* Gets image belonging to this category * Gets image belonging to this category
src/main/resources/storage/images/category/moneymaking.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 893 B