Merge branch 'master' of https://github.com/BiomesOPlenty/BiomesOPlenty

README.md

@@ -82,6 +82,8 @@
 	- Added config options for the ocean biomes, wither wart and burning blossom
 	- Added Icy Iris
 	- Added Flat Mushroom
+	- Added cocoa trees to the Tropical Rainforest
+	- Added jungle wood to trees in the Brushland and Scrubland
 
 	  Version 0.6.2 '20-08-13'
 	- Fixed bigtrees compatibility

build.xml

@@ -7,7 +7,7 @@
 		<isset property="env.DRONE_BUILD_NUMBER" />
 	</condition>
 	<property name="mc.version" value="1.6.4" />
-	<property name="forge.version" value="9.11.0.881" />
+	<property name="forge.version" value="9.11.0.883" />
 	<property name="fmp.version" value="1.0.0.173" />
 
 	<property name="src.dir" value="" />

common/biomesoplenty/handlers/SoundHandler.java

@@ -23,7 +23,7 @@ public class SoundHandler
 		{
 			try 
 			{
-				event.manager.addSound(soundFile);
+				event.manager.soundPoolSounds.addSound(soundFile);
 			}
 
 			catch (Exception e) 
@@ -36,7 +36,7 @@ public class SoundHandler
         {
             try 
             {
-                event.manager.addSound(recordSoundFile);
+                event.manager.soundPoolStreaming.addSound(recordSoundFile);
             }
 
             catch (Exception e)