Merge branch 'release/1.6.0'

Conflicts: api/ForestryAPI/forestry/api/genetics/IFlowerRegistry.java
KillenCraft · Jun 26, 2015 · ee65cfd · ee65cfd
2 parents 8bb8543 + aff8e77
commit ee65cfd
Show file tree

Hide file tree

Showing 201 changed files with 275 additions and 7,111 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 ## Ancient Trees
-**LATEST OFFICIAL VERSION**: [Ancient Trees 1.5.1 for MC 1.7.10][latest] ([changelog][changelog.md]) ([all
+**LATEST OFFICIAL VERSION**: [Ancient Trees 1.6.0 for MC 1.7.10][latest] ([changelog][changelog.md]) ([all
 releases][releases])<br />
 *DEPENDS ON*: [Kore Sample 1.3.0 (or later) for MC 1.7.10][koresample]
 

diff --git a/api/ForestryAPI/LICENSE.txt b/api/ForestryAPI/LICENSE.txt
diff --git a/api/ForestryAPI/README.md b/api/ForestryAPI/README.md
diff --git a/api/ForestryAPI/forestry/api/apiculture/BeeManager.java b/api/ForestryAPI/forestry/api/apiculture/BeeManager.java
diff --git a/api/ForestryAPI/forestry/api/apiculture/EnumBeeChromosome.java b/api/ForestryAPI/forestry/api/apiculture/EnumBeeChromosome.java
diff --git a/api/ForestryAPI/forestry/api/apiculture/EnumBeeType.java b/api/ForestryAPI/forestry/api/apiculture/EnumBeeType.java
diff --git a/api/ForestryAPI/forestry/api/apiculture/FlowerManager.java b/api/ForestryAPI/forestry/api/apiculture/FlowerManager.java
diff --git a/api/ForestryAPI/forestry/api/apiculture/IAlleleBeeEffect.java b/api/ForestryAPI/forestry/api/apiculture/IAlleleBeeEffect.java
diff --git a/api/ForestryAPI/forestry/api/apiculture/IAlleleBeeSpecies.java b/api/ForestryAPI/forestry/api/apiculture/IAlleleBeeSpecies.java
diff --git a/api/ForestryAPI/forestry/api/apiculture/IAlvearyComponent.java b/api/ForestryAPI/forestry/api/apiculture/IAlvearyComponent.java