Merge remote-tracking branch 'origin/1.6.x' into 1.6.x

# Conflicts:
#	src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java
#	src/main/java/com/massivecraft/factions/missions/MissionHandler.java

src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java

@@ -328,14 +328,14 @@ public class FactionsBlockListener implements Listener {
     }
 
     @EventHandler
-     public void onBannerBreak(BlockBreakEvent e) {
+    public void onBannerBreak(BlockBreakEvent e){
         FPlayer fme = FPlayers.getInstance().getByPlayer(e.getPlayer());
         if (FactionsPlugin.getInstance().mc17) {
             return;
         }
 
-          if (bannerLocations.containsValue(e.getBlock().getLocation())) {
-               if (e.getBlock().getType().name().contains("BANNER")) {
+        if(bannerLocations.containsValue(e.getBlock().getLocation())){
+            if(e.getBlock().getType().name().contains("BANNER")) {
                 e.setCancelled(true);
                 fme.msg(TL.BANNER_CANNOT_BREAK);
             }

src/main/java/com/massivecraft/factions/missions/MissionHandler.java

@@ -4,12 +4,14 @@ import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.FPlayers;
 import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.zcore.util.TL;
+import org.bukkit.Bukkit;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.entity.EntityBreedEvent;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.player.PlayerFishEvent;
 

src/main/resources/config.yml

@@ -741,7 +741,7 @@ Missions-GUI-Title: '&bFaction Missions'
 MaximumMissionsAllowedAtOnce: 1
 Mission-Progress-Format: '&b&lProgression: &f{progress}&7/&e{total}'
 
-#Mission Types: KILL, MINE, FISH
+#Mission Types: KILL, MINE, PLACE, FISH, TAME
 Missions:
   sugarcane:
     Slot: 11
@@ -778,6 +778,18 @@ Missions:
       Amount: 100
     Reward:
       Commands: ["f points add %faction% 100"]
+  animaltaming:
+    Slot: 21
+    Material: "BONE"
+    Name: "&f100 &cTamed Animals"
+    Lore:
+      - "&b&lTame an animal &n100&r &d&ltimes"
+    Mission:
+      Type: "TAME"
+      EntityType: "ALL"
+      Amount: 100
+    Reward:
+      Commands: ["f points add %faction% 100"]
 
 ############################################################
 # +------------------------------------------------------+ #

src/main/resources/plugin.yml

@@ -22,6 +22,7 @@ permissions:
       factions.modifypower: true
       factions.ahome: true
       factions.setmaxvaults: true
+      factions.convertconfig: true
   factions.*:
     description: This is just an alias for factions.kit.admin
     children: