diff --git a/.gitignore b/.gitignore
index a76913f8a..bd6b1ff4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,12 @@
 /.settings/
 /.classpath
 /.project
+
 # OS generated files
 *.DS_Store
+
+# IntelliJ project files
 *.iml
+*.ipr
+*.iws
+
diff --git a/build.properties b/build.properties
index 63b7bd7ca..54b08d4f1 100644
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,4 @@
 minecraft_version=1.11
-forge_version=13.19.0.2152
+forge_version=13.19.0.2173
 mod_version=6.0.0
-mappings_version=snapshot_nodoc_20161118
+mappings_version=snapshot_nodoc_20161130
diff --git a/src/main/java/biomesoplenty/client/particle/EntityPixieTrailFX.java b/src/main/java/biomesoplenty/client/particle/EntityPixieTrailFX.java
index 6ecfefba2..938ea9452 100644
--- a/src/main/java/biomesoplenty/client/particle/EntityPixieTrailFX.java
+++ b/src/main/java/biomesoplenty/client/particle/EntityPixieTrailFX.java
@@ -100,7 +100,7 @@ public class EntityPixieTrailFX extends Particle
         motionY *= 0.9599999785423279D;
         motionZ *= 0.9599999785423279D;
 
-        if (isCollided)
+        if (this.onGround)
         {
             motionX *= 0.699999988079071D;
             motionZ *= 0.699999988079071D;
diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java b/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java
index 98c2edb03..d68e58331 100644
--- a/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java
+++ b/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java
@@ -271,7 +271,7 @@ public class BlockBOPPlant extends BlockBOPDecoration implements IShearable, IHo
             case THORN:
                 if (!usingShears)
                 {
-                    player.attackEntityFrom(DamageSource.cactus, 2);
+                    player.attackEntityFrom(DamageSource.CACTUS, 2);
                 }
                 break;
             
@@ -452,7 +452,7 @@ public class BlockBOPPlant extends BlockBOPDecoration implements IShearable, IHo
                     if (inventory.armorInventory.get(0) != ItemStack.EMPTY && inventory.armorInventory.get(1) != ItemStack.EMPTY) {
                         break;
                     }
-                    entity.attackEntityFrom(DamageSource.cactus, 1);
+                    entity.attackEntityFrom(DamageSource.CACTUS, 1);
                 }
                 break;
             default:
diff --git a/src/main/java/biomesoplenty/common/init/ModBiomes.java b/src/main/java/biomesoplenty/common/init/ModBiomes.java
index fb65b5952..e0d3bba48 100644
--- a/src/main/java/biomesoplenty/common/init/ModBiomes.java
+++ b/src/main/java/biomesoplenty/common/init/ModBiomes.java
@@ -677,7 +677,7 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry
     {
         if (biome.isPresent())
         {
-            BiomeDictionary.registerBiomeType(biome.get(), types);
+            BiomeDictionary.addTypes(biome.get(), types);
         }
     }
 
diff --git a/src/main/java/biomesoplenty/core/BiomesOPlenty.java b/src/main/java/biomesoplenty/core/BiomesOPlenty.java
index 1c730be51..f1e3cee00 100644
--- a/src/main/java/biomesoplenty/core/BiomesOPlenty.java
+++ b/src/main/java/biomesoplenty/core/BiomesOPlenty.java
@@ -44,7 +44,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
 import net.minecraftforge.fml.common.network.NetworkRegistry;
 
-@Mod(modid = BiomesOPlenty.MOD_ID, version = BiomesOPlenty.MOD_VERSION , name = BiomesOPlenty.MOD_NAME, dependencies = "required-after:forge@[13.19.0.2152,)", guiFactory = BiomesOPlenty.GUI_FACTORY)
+@Mod(modid = BiomesOPlenty.MOD_ID, version = BiomesOPlenty.MOD_VERSION , name = BiomesOPlenty.MOD_NAME, dependencies = "required-after:forge@[13.19.0.2173,)", guiFactory = BiomesOPlenty.GUI_FACTORY)
 public class BiomesOPlenty
 {
     public static final String MOD_NAME = "Biomes O' Plenty";