diff --git a/packaging/gson-license.txt b/packaging/your_minecraft_server/gson-license.txt similarity index 100% rename from packaging/gson-license.txt rename to packaging/your_minecraft_server/gson-license.txt diff --git a/packaging/gson.jar b/packaging/your_minecraft_server/gson.jar similarity index 100% rename from packaging/gson.jar rename to packaging/your_minecraft_server/gson.jar diff --git a/releases/latest.zip b/releases/latest.zip new file mode 100644 index 00000000..42257446 Binary files /dev/null and b/releases/latest.zip differ diff --git a/src/com/bukkit/mcteam/factions/Commands.java b/src/com/bukkit/mcteam/factions/Commands.java index 20199a6f..62148997 100644 --- a/src/com/bukkit/mcteam/factions/Commands.java +++ b/src/com/bukkit/mcteam/factions/Commands.java @@ -53,8 +53,8 @@ public class Commands { pageLines.add(Conf.colorSystem+"Set which relation your WHISH you had to another faction."); pageLines.add(Conf.colorSystem+"Per default your relation to another faction will be neutral."); pageLines.add(""); - pageLines.add(Conf.colorSystem+"If BOTH factions whishes \"ally\" you will be allies."); - pageLines.add(Conf.colorSystem+"If ONE faction whishes \"enemy\" you will be enemies."); + pageLines.add(Conf.colorSystem+"If BOTH factions wishes \"ally\" you will be allies."); + pageLines.add(Conf.colorSystem+"If ONE faction wishes \"enemy\" you will be enemies."); helpPages.add(pageLines); pageLines = new ArrayList(); diff --git a/src/com/bukkit/mcteam/factions/entities/Conf.java b/src/com/bukkit/mcteam/factions/entities/Conf.java index 72b245c0..9aed33cd 100644 --- a/src/com/bukkit/mcteam/factions/entities/Conf.java +++ b/src/com/bukkit/mcteam/factions/entities/Conf.java @@ -95,7 +95,7 @@ public class Conf { mapHeight = 8; mapWidth = 49; - territoryShieldFactor = 0.33; + territoryShieldFactor = 0.5; useRelationColoredChat = true; @@ -179,7 +179,7 @@ public class Conf { powerPerLand = 1; // 1 power grants one land Perhaps this should not even be a config value... powerPerPlayer = 10; // One player has 10 power - powerPerMinute = 0.2; // Default health rate... it takes 10 min to heal one death + powerPerMinute = 0.2; // Default health rate... it takes 5 min to heal one power powerPerDeath = 2; //A death makes you loose 2 power powerDefaultBonus = 0; //A faction normally has a power bonus