Merge branch 'master' into update

ArmaRealms · Nov 22, 2024 · bbbe87f · bbbe87f
2 parents 993f547 + 1b6b127
commit bbbe87f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,6 +1,7 @@
 Version 2.2.028
-    Fixed a bug where you had to wait to summon another COTW summon if one or more of them had died or otherwise expired before their time limit
     Fixed stack overflow during ChunkUnloadEvent
+    Fixed a bug where you had to wait to summon another COTW summon if one or more of them had died or otherwise expired before their time limit
+    McMMOItemSpawnEvent#setItemStack being ignored (thanks galacticwarrior9)
     (API) Added McMMOPlayerMasterAnglerEvent (thanks bobcat4848)
 
 Version 2.2.027

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.2.028-SNAPSHOT</version>
+    <version>2.2.029-SNAPSHOT</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>

diff --git a/src/main/resources/advanced.yml b/src/main/resources/advanced.yml
@@ -541,7 +541,6 @@ Skills:
         FastFoodService:
             # Chance: The chance for wolves to heal hp when inflicting damage
             Chance: 50.0
-        EnvironmentallyAware:
         ThickFur:
             # Modifier: Damage will get divided by this modifier
             Modifier: 2.0