diff --git a/README.txt b/README.txt
index ab3a5e1e37..dc89037a01 100644
--- a/README.txt
+++ b/README.txt
@@ -39,12 +39,12 @@ Java is included in most Linux distributions. Both Sun Java and OpenJDK are supp
Please download Stendhal from http://arianne.sourceforge.net
Then unzip the client zip into a new folder.
-You can double click on stendhal-0.93.5.jar and the client will run.
+You can double click on stendhal-0.94.jar and the client will run.
If you prefer to run from command line, then just execute this command
in the stendhal folder:
- java -jar stendhal-0.93.5.jar
+ java -jar stendhal-0.94.jar
Alternatively you can run it using Java Webstart technology at:
diff --git a/build.ant.properties b/build.ant.properties
index c7f8a045c6..0a34333db9 100644
--- a/build.ant.properties
+++ b/build.ant.properties
@@ -73,7 +73,7 @@ version_server = http://arianne.sourceforge.net/stendhal.version
# current version of stendhal
version.old = 0.93
-version = 0.93.5
+version = 0.94
# javac options
javac.deprecation = true
diff --git a/doc/CHANGES.txt b/doc/CHANGES.txt
index fe79614391..3d9f88e3f9 100644
--- a/doc/CHANGES.txt
+++ b/doc/CHANGES.txt
@@ -11,17 +11,17 @@ Changelog
*bugfixes*
- fixed right clicking on sources, fishing spots, etc.
- On Mac cmd+dragging opens the item split window
-- client error log is now works in webstart client, too
-- a number of small map bugs
+- client error log now works in the webstart client, too
+- a number of small map fixes
*admin*
-- added new zone int_abstract_admin_investigation for investigation account issues
+- added new zone int_abstract_admin_investigation for investigation of account issues
- added new zone int_abstract_server_down for operating Stendhal on a read only database copy
*website*
- achievements on character pages now have a mouse over box
- nicer layout for chat logs and log selection
-- improved performance of recent event page
+- improved performance of Recent Events page
- improved performance of pages with many images
diff --git a/runserver.bat b/runserver.bat
index 6b1be5eb01..31d1332cd5 100644
--- a/runserver.bat
+++ b/runserver.bat
@@ -1,3 +1,3 @@
-set STENDHAL_VERSION=0.93.5
+set STENDHAL_VERSION=0.94
set LOCALCLASSPATH=.;data\script;data\conf;stendhal-server-%STENDHAL_VERSION%.jar;marauroa.jar;mysql-connector.jar;log4j.jar;commons-lang.jar;h2.jar
java -Xmx400m -cp "%LOCALCLASSPATH%" games.stendhal.server.StendhalServer -c server.ini -l
diff --git a/runserver.sh b/runserver.sh
index 91c9d8d22c..c94297f122 100644
--- a/runserver.sh
+++ b/runserver.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-STENDHAL_VERSION="0.93.5"
+STENDHAL_VERSION="0.94"
LOCALCLASSPATH=.:data/script/:data/conf/:stendhal-server-$STENDHAL_VERSION.jar:marauroa.jar:mysql-connector.jar:log4j.jar:commons-lang.jar:h2.jar
diff --git a/src/games/stendhal/client/update/Version.java b/src/games/stendhal/client/update/Version.java
index 7838aa44d8..4f4781c116 100644
--- a/src/games/stendhal/client/update/Version.java
+++ b/src/games/stendhal/client/update/Version.java
@@ -10,7 +10,7 @@ package games.stendhal.client.update;
public class Version {
/** Version Number. */
- private static final String VERSION = "0.93.5";
+ private static final String VERSION = "0.94";
/**
* Extract the specified number of parts from a version-string.
diff --git a/src/games/stendhal/common/Debug.java b/src/games/stendhal/common/Debug.java
index 81ea6c2e29..bcd6ad5bc4 100644
--- a/src/games/stendhal/common/Debug.java
+++ b/src/games/stendhal/common/Debug.java
@@ -26,7 +26,7 @@ public class Debug {
/** version. */
// Note: This line is updated by build.xml using a regexp so be sure to adjust it in case you modify this line.
- public static final String VERSION = "0.93.5";
+ public static final String VERSION = "0.94";
public static final String PRE_RELEASE_VERSION = null;
diff --git a/src/games/stendhal/server/core/engine/GenerateINI.java b/src/games/stendhal/server/core/engine/GenerateINI.java
index 881a41d075..4c5c3e3417 100644
--- a/src/games/stendhal/server/core/engine/GenerateINI.java
+++ b/src/games/stendhal/server/core/engine/GenerateINI.java
@@ -271,7 +271,7 @@ public class GenerateINI {
out.println();
out.println("server_typeGame=" + gameName);
out.println("server_name=" + gameName + " Marauroa server");
- out.println("server_version=0.93.5");
+ out.println("server_version=0.94");
out.println("server_contact=https://sourceforge.net/tracker/?atid=514826&group_id=66537&func=browse");
out.println();
out.println("# Extensions configured on the server. Enable at will.");
diff --git a/src/games/stendhal/server/core/rp/achievement/factory/ItemAchievementFactory.java b/src/games/stendhal/server/core/rp/achievement/factory/ItemAchievementFactory.java
index 863f72549d..270cb44a5d 100644
--- a/src/games/stendhal/server/core/rp/achievement/factory/ItemAchievementFactory.java
+++ b/src/games/stendhal/server/core/rp/achievement/factory/ItemAchievementFactory.java
@@ -41,7 +41,7 @@ public class ItemAchievementFactory extends AbstractAchievementFactory {
Achievement.HARD_BASE_SCORE, true,
new PlayerLootedNumberOfItemsCondition(1000000, "money")));
itemAchievements.add(createAchievement("item.set.red", "Amazon's Menace", "Loot a complete red equipment set",
- Achievement.MEDIUM_BASE_SCORE, false,
+ Achievement.MEDIUM_BASE_SCORE, true,
new PlayerLootedNumberOfItemsCondition(1, "red armor", "red helmet", "red cloak", "red legs", "red boots", "red shield")));
itemAchievements.add(createAchievement("item.set.shadow", "Shadow Dweller", "Loot a complete shadow equipment set",
Achievement.MEDIUM_BASE_SCORE, true,
diff --git a/src/games/stendhal/server/core/rp/achievement/factory/QuestAchievementFactory.java b/src/games/stendhal/server/core/rp/achievement/factory/QuestAchievementFactory.java
index 1cbe6a15c5..95151d313c 100644
--- a/src/games/stendhal/server/core/rp/achievement/factory/QuestAchievementFactory.java
+++ b/src/games/stendhal/server/core/rp/achievement/factory/QuestAchievementFactory.java
@@ -50,7 +50,7 @@ public class QuestAchievementFactory extends AbstractAchievementFactory {
questAchievements.add(createAchievement("quest.special.maze", "Pathfinder", "Finish the maze",
Achievement.EASY_BASE_SCORE, true, new QuestStateGreaterThanCondition("maze", 2, 0)));
questAchievements.add(createAchievement("quest.deathmatch", "Deathmatch Hero", "Earn 100,000 points in deathmatch",
- Achievement.MEDIUM_BASE_SCORE, false, new QuestStateGreaterThanCondition("deathmatch_score", 0, 100000)));
+ Achievement.MEDIUM_BASE_SCORE, true, new QuestStateGreaterThanCondition("deathmatch_score", 0, 100000)));
// Ados Deathmatch
// disabled. Currently the wrong index is being checked (it would be index 6)
diff --git a/stendhal.jnlp b/stendhal.jnlp
index aa8f43ff4f..296695e82a 100644
--- a/stendhal.jnlp
+++ b/stendhal.jnlp
@@ -22,7 +22,7 @@ Some of these people are NPC, they will give you tasks to accomplish and hints t
-
+