Merge remote-tracking branch 'origin/version-1.6-0.4.0' into

version-1.7-0.4.0

Conflicts:
	build.properties
	build_number.properties

build.properties

@@ -11,4 +11,4 @@ CCCore_version=1.0.0
 NEI_version=1.0.1
 forestry_version=2.4.0.0-711
 
-libs_path=../minecraft_17/libs
+libs_path=../minecraft_17/libs

build_number.properties

@@ -1 +1 @@
-6
+6

doc/info.txt

@@ -1,8 +1,8 @@
-[center][img]http://i.imgur.com/4Pe8YfI.png[/img][/center][center][color=#A63F00]An evil mod for Minecraft[/color][/center][center][b]Download for MC 1.6.4:[/b] http://bit.ly/1epMEax (version 0.3.2b)[/center][center][b]Download for MC 1.7.2:[/b] http://bit.ly/1iNigUT (version 0.3.2b)[/center][center][b]Currently working on:[/b] New features, additional content and bugfixes.[/center]
+[center][img]http://i.imgur.com/4Pe8YfI.png[/img][/center][center][color=#A63F00]An evil mod for Minecraft[/color][/center][center][b]Download for MC 1.6.4:[/b] http://bit.ly/1njwwL1 (version 0.4.0b)[/center][center][b]Download for MC 1.7.2:[/b] http://bit.ly/1fVBPOs (version 0.4.0b)[/center][center][b]Currently working on:[/b] New features, additional content and bugfixes.[/center]
 
  EvilCraft is a mod developed by two guys who wanted to get some experience in Minecraft modding. This mod basically adds various evil things to Minecraft, from everything such as little flying monster that will follow you around and try to poison you, to bottles that allow you to store and control the weather. 
 
- With our latest release, we provide support for both Minecraft 1.6.4 and 1.7.X. Since a lot of mods still didn't convert yet to 1.7 and because some people might be interested in combining EvilCraft with other mods (e.g. in mod packs), we will do our best to keep both 1.6.4 and 1.7.X up to date. This means that we will still provide bug fixes for 1.6.4 and 1.7.X aswel as small features (e.g. features that do not depend on the changes made to Minecraft since 1.7.X). For bigger features however, we will only provide support for 1.7.X. As soon as we notice that forge for 1.7.X becomes the new "standard" amongst other mods and most users start to use mods and/or modpacks for 1.7.X, we will abandon support for 1.6 (note however that this might still take a while, since A LOT of mod authors still haven't even started on updating their mods to the newer version). Once that happens, we will probably do a major release which (hopefully) contains a lot of new content so people will actually have a feeling that things have changed since 1.6. 
+ With our latest release, we provide support for both Minecraft 1.6.4 and 1.7.X. This will however be the last 1.6.4 supported update because maintaining a mod for two Minecraft versions is very time-consuming. But of course, we will keep fixing bugs in that version as they are discovered. 
 
 [b][size=20]Features[/size][/b]
 NOTE: YOU CAN DISABLE ALMOST EVERY SINGLE FEATURE SEPARATELY IN THE CONFIGURATION FILE
@@ -37,7 +37,7 @@ As its name suggests, the [u]blood infuser[/u] can infuse or fill items with [u]
 
 [/center]
 [u][b]Environmental Accumulator[/b][/u]
-The [u]environmental accumulator[/u] allows you to fill [u]weather containers[/u] with the weather that is currently active. You do this by throwing an [u]empty weather container[/u] into the brown beam emitted by the accumulator. This will suck up the weather, bottle it into the weather container and change the weather to its complete opposite (sunshine becomes rain, rain/lightning becomes sunshine). Once used, the beam of the environmental accumulator will become black, which means that it is currently in a cooldown state. It will remain in this state for about half a Minecraft day, and you can see that it has returned to its originally state because the beam will change back to a brown color. (NOTE: the cooldown time can be changed in the configuration file) Note that this block can not be crafted or picked up and that these blocks only spawn at the centre of [u]dark temples[/u]. 
+The [u]environmental accumulator[/u] allows you to fill [u]weather containers[/u] with the weather that is currently active. You do this by throwing an [u]empty weather container[/u] into the brown beam emitted by the accumulator. This will suck up the weather, bottle it into the weather container and change the weather to its complete opposite (sunshine becomes rain, rain/lightning becomes sunshine). Once used, the beam of the environmental accumulator will become black, which means that it is currently in a cooldown state. It will remain in this state for about half a Minecraft day, and you can see that it has returned to its originally state because the beam will change back to a brown color. (NOTE: the cooldown time can be changed in the configuration file) When this block in recharging, you should get away as fast as possible, because the machine will start accumulating energy from the environment. This will degrade a certain area around the Environmental Accumulator and it will also trigger a bunch of possible bad effects. These effects include (but are not limited to) Biome degradation, Knockbacks, Nausea and Terraforming. All of these effects can be disabled from within the config file if they seem too evil for you. Note that this block can not be crafted or picked up and that these blocks only spawn at the centre of [u]dark temples[/u]. 
 [img]http://i.imgur.com/J5FLxFO.png[/img]
 [u][b]Purifier[/b][/u]
 You know that the [u]Blood Chest[/u] could add some bad enchantments to your tools, right? Well, now there is a way to circumvent this uncomfortability. The Purifier runs on [u]blood[/u] that can be inserted with regular buckets, or your favorite fluid pipes. You just right click with your cursed tool, and for each bucket that is inside the Purifier, one level of bad enchantment will go off the tool. Right click with an empty hand to get back your tool. But hold on, that is not all! The Purifier can also be used to remove random enchantments from tools and move them to books. Since regular books are not 'spongy' enough, you will have to infuse a book with blood to make a [u]Blook[/u], you can insert that inside the Purifier together with your tool. From the moment the Purifier is completely filled with [u]blood[/u], the process will begin. [img]http://i.imgur.com/I3fcQc4.png[/img] 
@@ -107,7 +107,7 @@ Who said only zombies can come back from the dead? Just put a dead bush, found i
 [img]http://i.imgur.com/AyrkMPV.png[/img]
 [/spoiler]
 [spoiler='Items'][u][b]Blood Containers[/b][/u]
-[u]Blood containers[/u] are storages for all your blood needs! They come in three sizes: cell, can and basin, in increasing order of size. When you shift-right click a blood container, you will activate auto-refill mode, which will automatically refill an item you hold in your hand with blood, given that item can contain blood. This can prove useful when using the [u]blood pearl of teleportation[/u]. If you activate multiple blood containers, the rate at which the held item is refilled will be proportional to the number of activated containers.
+[u]Blood containers[/u] are storages for all your blood needs! They come in three sizes: cell, can and basin, in increasing order of size. There is also one Creative Blood Container available (creative-mode only) which can be used as infinite source and drain for blood. When you shift-right click a blood container, you will activate auto-refill mode, which will automatically refill an item you hold in your hand with blood, given that item can contain blood. This can prove useful when using the [u]blood pearl of teleportation[/u]. If you activate multiple blood containers, the rate at which the held item is refilled will be proportional to the number of activated containers.
 [b]Recipes:[/b]
 [center]
 [img]http://i.imgur.com/lNkmioA.png[/img]
@@ -152,19 +152,39 @@ At the moment this item has no use at all, except that it works in all recipes w
 
 [/center]
 [u][b]Hardened Blood Shard[/b][/u]
-This item is used in the recipes for several items and can be obtained by using a flint and steel on a [u]hardened blood[/u] block.
+This item is used in the recipes for several items and can be obtained by using a flint and steel on a [u]hardened blood[/u] block. It's red, so maybe you could use it as some kind of red dye?
+[u][b]Inverted Potentia[/b][/u]
+The mysterious power of [u]Potentia Spheres[/u] can be inverted to do even crazier things! When it is inverted, you can't do a lot with it, you will have to empower it to access it's real potential. You can do this by infusing it with the power of lightning, this can be done by either throwing it into the [u]Environmental Accumulator[/u] while there is thunder, or by somehow striking it with an actual lightning strike (make sure it doesn't burn!). 
+[b]Recipe:[/b]
+[center][img]http://i.imgur.com/LyXJNQ1.png[/img]
+
+[/center]
+[u][b]Kineticator[/b][/u]
+This item can move things towards you within a certain area, for example items and experience orbs. This item needs blood to function. It can be enabled by Shift-Right clicking and it's range can be configured by right-clicking with the item. Fun fact: This item will also function when dropped as item in the world, don't let this expensive item despawn though! 
+[b]Recipe:[/b]
+[center][img]http://i.imgur.com/s9zcw8h.png[/img]
+
+[/center]
 [u][b]Lightning Grenade[/b][/u]
 Lightning is now completely under you control with the [u]lightning grenade[/u]! Simply throw it like an ender pearl and it will spawn lightning on the block it hits when it falls on the ground. Very useful when you want to burn down forests, create supercharged creepers or kill your friends with lightning bolts. 
 [img]http://i.imgur.com/S2RVgWr.png[/img]
 
 [b]Recipe:[/b]
 [center][img]http://i.imgur.com/H9VNjnU.png[/img]
 
+[/center]
+[u][b]Mace of Distortion[/b][/u]
+Why would you kill every mob in the area one by one? With the [u]Mace of Distortion[/u], you can target all the mobs in a certain area all at once. You can increase this area by clicking and holding right-click, from the moment your release, the damage will be done. A nice side-effect of this weapon is the fact that all the entities withing that given radius also get a knockback dependant on the radius of the attack. The damage and knockback distance can be changed by toggling between power-levels, which can be done by Shift-Right clicking with the item. This item runs on [u]Blood[/u], and the larger the area and power-level, the more blood it will drain for each attack. Note that this weapon also has a decent attack damage when just using it as a regular hit weapon, but this does also drain some blood and will become unusable when ran out of blood. 
+[img]http://i.imgur.com/uuAo7Yl.png[/img]
+
+[b]Recipe:[/b]
+[center][img]http://i.imgur.com/tpjrwy0.png[/img]
+
 [/center]
 [u][b]Poison Sac[/b][/u]
-It looks like and ink sac and it's filled with poison! These items can only be obtained by killing a [u]Poisonous Libelle[/u]. This item acts as poisoned item besides poisoned potatoes and can thus be used in recipes that require poisoned items.
+It looks like an ink sac and it's filled with poison! These items can only be obtained by killing a [u]Poisonous Libelle[/u]. This item acts as poisoned item besides poisoned potatoes and can thus be used in recipes that require poisoned items.
 [u][b]Potentia Sphere[/b][/u]
-A pretty expensive item that has the potential to do great things. For now the only use of this is that it can be infused with [u]blood[/u] to make Ender Pearls. This can however be disabled in the config since this is a pretty powerful recipe. 
+A pretty expensive item that has the potential to do great things. It can for example be infused with [u]blood[/u] to make Ender Pearls. This can however be disabled in the config since this is a pretty powerful recipe. 
 [b]Recipe:[/b]
 [center][img]http://i.imgur.com/dzmhUQu.png[/img]
 
@@ -226,20 +246,23 @@ EvilCraft allows you to craft potions of poison without having to do any brewing
 [center][img]http://i.imgur.com/z4fMqT0.png[/img]
 
 [/center]
-[u][b]Farts[/b][/u]
-Ever noticed that whenever a player shifts it looks like he's farting? Well what can I say... EvilCraft adds the option to let loose all those internal gases. To use this feature, simply press the fart hotkey (by default mapped on P) and whenever you shift a fart should be let loose! And in case you were wondering: Yes, it does work on servers, so now you don't have to fart alone anymore, you can now also do it with friends... I guess... 
-[img]http://i.imgur.com/51gkECl.png[/img]
 [/spoiler]
 [spoiler='Cross-mod compatibilities'][u][b]General[/b][/u]
 This mod is able to communicate with several other mods. NOTE: these mods are [b]NOT required[/b], they will only be used when they are available.
 [u][b]Thermal Expansion[/b][/u]
-This mod is compatible with various Thermal Expansion machines, like for example the use of the Fluid Transposer that will work exactly the same as the Blood Infuser but it will use 1.5X the amount of Blood instead.
+[b]Minecraft 1.6.4 only:[/b] This mod is compatible with various Thermal Expansion machines, like for example the use of the Fluid Transposer that will work exactly the same as the Blood Infuser but it will use 1.5X the amount of Blood instead.
 [u][b]BuildCraft[/b][/u]
 We also provide some facades when BuildCraft is installed.
 [u][b]NEI[/b][/u]
-Obviously all of the recipes are also available in the NEI plugin. [b]Minecraft 1.6.4 only:[/b] Blood Infuser recipes are also visible.
+Obviously all of the recipes are also available in the NEI plugin. Blood Infuser and Environmental Accumulator recipes are also visible.
 [u][b]Waila[/b][/u]
-[b]Minecraft 1.6.4 only:[/b] Machines status and minor block display improvements.
+Machines status and minor block display improvements.
+[u][b]Forge Multipart[/b][/u]
+[b]Minecraft 1.6.4 only:[/b] Regular blocks have microblock support.
+[u][b]Forestry[/b][/u]
+Several items can be placed in the Forestry backpacks. Undead logs and leaves can be placed in the squeezer to recieve blood and sometimes even a Hardened Blood Shard. Undead Sapplings also have Multifarm support.
+[u][b]Tinkers' Construct[/b][/u]
+All Tinkers' Construct tools can be repaired in the Blood Chest. This behavior can be disabled in the config file.
 [/spoiler]
 [u][b]Configuration[/b][/u]
 Almost every feature can be disabled and changed in the config file (config/evilcraft.cfg). It is however mandatory that config files at server and client side are identical, otherwise you might encounter ID conflicts.