Merging branches 1 new mission type

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, FISH, BREED, TAME
 Missions:
   sugarcane:
     Slot: 11
@@ -778,6 +778,18 @@ Missions:
       Amount: 100
     Reward:
       Commands: ["f points add %faction% 100"]
+  animaltaming:
+    Slot: 20
+    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"]
 
 ############################################################
 # +------------------------------------------------------+ #
@@ -1040,17 +1052,22 @@ fupgrades:
         slots:
           - 22
 
+############################################################
+# +------------------------------------------------------+ #
+# |                  Faction Banners                     | #
+# +------------------------------------------------------+ #
+############################################################
 fbanners:
-  Enabled: false
+  Enabled: true
   Item:
-    Name: '&e&l*&f&l*&e&l* &c&lWar Banner &7(Place) &e&l*&f&l*&e&l*'
+    Name: '&c&l*&f&l*&c&l* &c&lWar Banner &7(Place) &c&l*&f&l*&c&l*'
     Lore:
       - '&7Place this banner in the &nWarzone.&7 This'
       - '&7will create a &nWarp Point&7 for your faction members.'
       - ''
-      - '&c&lEffects'
-      - '&c&l* &fStrength II'
-      - '&c&l* &fSpeed II'
+      - '&e&lEffects'
+      - '&e&l* &fStrength II'
+      - '&e&l* &fSpeed II'
   Banner-Cost: 5000 #The amount charged to change a banner into a War Banner
   Banner-Time: 60 #IN SECONDS - This is how long the banner will last.
   Banner-Place-Cooldown: 300

src/main/resources/lang/it_IT.yml

@@ -1,4 +1,4 @@
-# Lang file for P by drtshock & Driftay
+# Lang file for FactionsPlugin by drtshock & Driftay
 # Use & for color codes.
 # Made with love <3
 

src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: Factions
 version: ${project.version}
 api-version: 1.13
-main: com.massivecraft.factions.P
+main: com.massivecraft.factions.FactionsPlugin
 authors: [Olof Larsson, Brett Flannigan, drtshock, ProSavage, SvenjaReißaus, FroggyKnight, Driftay]
 softdepend: [Skript, CoreProtect, PlayerVaults, PlaceholderAPI, MVdWPlaceholderAPI, PermissionsEx, Permissions, Essentials, EssentialsChat, HeroChat, iChat, LocalAreaChat, LWC, nChat, ChatManager, CAPI, AuthMe, Vault, Spout, WorldEdit, WorldGuard, AuthDB, CaptureThePoints, CombatTag, dynmap, FactionsTop]
 
@@ -26,6 +26,7 @@ permissions:
   factions.*:
     description: This is just an alias for factions.kit.admin
     children:
+      factions.convertconfig: true
       factions.kit.admin: true
   factions.kit.mod:
     description: All faction permissions but configuration and persistance.