Merge branch 'master' into HEAD

Conflicts:
	src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java

src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java

@@ -35,7 +35,7 @@ public class AlleleEffectEmpowering extends AlleleEffect {
 		World world = housing.getWorld();
 		ChunkCoordinates coords = housing.getCoordinates();
 		IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
-		int range = (int)Math.ceil(genome.getTerritory()[0] * beeModifier.getTerritoryModifier(genome, 1f));
+		int range = Math.max((int)Math.ceil(genome.getTerritory()[0] * beeModifier.getTerritoryModifier(genome, 1f)), 1);
 		List<Chunk> chunks = BlockUtil.getChunksInSearchRange(world, coords.posX, coords.posZ, range);
 		
         if (NodeHelper.growNodeInRange(chunks, world, coords.posX, coords.posY, coords.posZ, range)) {

src/main/java/magicbees/main/utils/compat/botania/SubTileBeegonia.java

@@ -66,8 +66,13 @@ public class SubTileBeegonia extends SubTileGenerating {
 			return 0;
 		}
 		else {
-			int halfComplexity = species.getComplexity() / 2;
-			return (halfComplexity >= 1) ? halfComplexity : 1;
+			try {
+				int halfComplexity = species.getComplexity() / 2;
+				return (halfComplexity >= 1) ? halfComplexity : 1;
+			}
+			catch (NoSuchMethodError error) {
+				return 1;
+			}
 		}
 	}
 	

src/main/java/magicbees/main/utils/compat/thaumcraft/NodeHelper.java

@@ -102,7 +102,8 @@ public class NodeHelper {
 				if (node != null) {
 					++attemptedNodes;
 					AspectList aspectsBase = node.getAspectsBase();
-		            if (world.rand.nextInt(aspectsBase.visSize()) < 120) {
+					int randBase = Math.max(aspectsBase.visSize(), 1);
+		            if (world.rand.nextInt(randBase) < 120) {
 						Aspect aspectToAdd;
 						int rollAttempts = 0;
 						do {