Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into endgame

src/main/resources/advanced.yml

@@ -209,7 +209,14 @@ Skills:
     Fishing:
 
         ShakeChance:
-            Rank_1: 30
+            Rank_1: 15.0
+            Rank_2: 20.0
+            Rank_3: 25.0
+            Rank_4: 35.0
+            Rank_5: 45.0
+            Rank_6: 55.0
+            Rank_7: 65.0
+            Rank_8: 75.0
 
         # VanillaXPMultiplier: Vanilla XP gained from fishing is multiplied by these values.
         VanillaXPMultiplier:

src/main/resources/experience.yml

@@ -330,7 +330,7 @@ Experience_Values:
         Big_Dripleaf: 140
         Cave_Vines: 90
         Cave_Vines_Plant: 90
-        Glow_Lichen: 200
+        Glow_Lichen: 5
         Moss_Block: 150
         Crimson_Roots: 6
         Warped_Roots: 6
@@ -403,6 +403,7 @@ Experience_Values:
         Rose_Bush: 50
         Fern: 10
         Grass: 10
+        Short_Grass: 10
         Sugar_Cane: 30
         Sunflower: 50
         Tall_Grass: 50

src/main/resources/plugin.yml

@@ -14,8 +14,9 @@ author: nossr50
 authors: [GJ, NuclearW, bm01, Glitchfinder, TfT_02, t00thpick1, Riking, electronicboy, kashike]
 website: https://www.mcmmo.org
 main: com.gmail.nossr50.mcMMO
-softdepend: [WorldGuard, CombatTag, HealthBar]
+softdepend: [WorldGuard, CombatTag, HealthBar, PlaceholderAPI]
 load: POSTWORLD
+folia-supported: true
 api-version: 1.13
 
 commands:

src/main/resources/skillranks.yml

@@ -479,8 +479,22 @@ Fishing:
     Shake:
         Standard:
             Rank_1: 15
+            Rank_2: 20
+            Rank_3: 25
+            Rank_4: 30
+            Rank_5: 40
+            Rank_6: 50
+            Rank_7: 60
+            Rank_8: 70
         RetroMode:
             Rank_1: 150
+            Rank_2: 200
+            Rank_3: 250
+            Rank_4: 300
+            Rank_5: 400
+            Rank_6: 500
+            Rank_7: 600
+            Rank_8: 700
     MasterAngler:
         Standard:
             Rank_1: 1