Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4

# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java

README.md

@@ -1,6 +1,6 @@
-# TechReborn
+# TechReborn 1.9.4 Branch
 
-TechReborn is a resurrection of GregTech 2.78 for modern Minecraft. It brings most of GT4's features and behaviors to Minecraft, with lots of tweaks, and a few editions. It also aims to be more compatible with other mods than GregTech, and has the ultimate goal of becoming a standalone mod, compatible with but not dependent on IC2.
+TechReborn is a resurrection of GregTech 2.78 for modern Minecraft. It brings most of it's features and behaviors to Minecraft, with lots of tweaks, and a few editions. It also aims to be more compatible with other mods than GregTech, and has the ultimate goal of becoming a standalone mod, compatible with, but not dependent on IC2. We have no plans of ever supporting IC2 classic as of now.
 
 TechReborn is currently in a beta state. Crashes or bugs may happen at any time, so *please* do not use this on a world that is important to you, or at the very least back it up on every update.
 
@@ -18,27 +18,27 @@ And suggestions should be posted to our forum:
 
 # Recommended Builds:
 
-See [this list](http://minecraft.curseforge.com/projects/techreborn/files?sort=releasetype). The top one should always be the latest, recommended build of TechReborn. Currently TechReborn does not have a recommended 1.8.9 build.
+See [this list](http://minecraft.curseforge.com/projects/techreborn/files?sort=releasetype). The top one should always be the latest, recommended build of TechReborn.
 
 # Jenkins Builds:
 
-Jenkins builds of TechReborn are compiled directly from this repository. Please remember to backup your worlds before using a jenkins build of TechReborn.
+Jenkins builds of TechReborn are compiled directly from this repository. Please remember to backup your worlds before using a jenkins build of TechReborn. Before reporting a bug, we highly encourage trying to reproduce the bug with the latest jenkins build in a seperate environment, to make sure we haven't fixed it already.
 
 1.9.4:
 ---
 
-*This version is constantly recieving updates, and does not have a stable, recommended, release. Once again, remember to backup your worlds before using jenkins builds.*
+*This version is constantly recieving updates, and does has a semi-stable release. Any 1.9.4 builds (including semi-stable releases) are still subject to change and potentially (though unlikely) could break worlds. Once again, remember to backup your worlds before using any jenkins builds.*
 
 [![Build Status](http://modmuss50.me:8080/job/TechReborn/job/TechReborn-1.9.4/badge/icon)](http://modmuss50.me:8080/job/TechReborn/job/TechReborn-1.9.4/)
 
-*1.9 builds are also available:
+1.9.0 builds are also available, but are not supported at all:
 
 [![Build Status](http://modmuss50.me:8080/job/TechReborn/job/TechReborn-1.9/badge/icon)](http://modmuss50.me:8080/job/TechReborn/job/TechReborn-1.9/)
 
 1.8.9:
 ---
 
-*This version is only semi-supported while ic2 is on 1.8.9*
+*This version is not supported at all. Use at your own risk, we won't push a new build with a bugfix no matter what, with the exceptions of pull requests, which we still discourage.*
 
 [![Build Status](http://modmuss50.me:8080/job/TechReborn/job/TechReborn-1.8.9/badge/icon)](http://modmuss50.me:8080/job/TechReborn/job/TechReborn-1.8.9/)
 

build.gradle

@@ -98,7 +98,7 @@ dependencies {
     }
     compile 'RebornCore:RebornCore-1.9.4:+:dev'
     deobfCompile "mezz.jei:jei_1.9.4:+"
-    compile "net.darkhax.tesla:Tesla:1.9.4-1.1.0.24:deobf"
+//    compile "net.darkhax.tesla:Tesla:1.9.4-1.1.0.24:deobf"
 	deobfCompile "slimeknights.mantle:Mantle:1.9.4-0.10.1.jenkins142"
 	deobfCompile "slimeknights:TConstruct:1.9.4-2.3.1.jenkins229"
     deobfCompile "mcjty.theoneprobe:TheOneProbe:1.9.4-1.0.4-14"

src/main/java/techreborn/init/ModRecipes.java

@@ -443,8 +443,6 @@ public class ModRecipes
 				new GrinderRecipe(BlockOre.getOreByName("Lead"), ItemDusts.getDustByName("lead", 2), ticktime, eutick));
 		RecipeHandler.addRecipe(
 				new GrinderRecipe(BlockOre.getOreByName("Silver"), ItemDusts.getDustByName("silver", 2), ticktime, eutick));
-		RecipeHandler
-				.addRecipe(new GrinderRecipe(ItemGems.getGemByName("ruby"), ItemDusts.getDustByName("ruby"), ticktime, eutick));
 
 		// Ingots to Dust
 		RecipeHandler.addRecipe(
@@ -484,6 +482,18 @@ public class ModRecipes
 		RecipeHandler.addRecipe(
 				new GrinderRecipe(ItemIngots.getIngotByName("zinc"), ItemDusts.getDustByName("zinc", 1), ticktime, eutick));
 
+		// Others to Dust
+		RecipeHandler.addRecipe(
+				new GrinderRecipe(ItemGems.getGemByName("ruby"), ItemDusts.getDustByName("ruby"), ticktime, eutick));
+		RecipeHandler.addRecipe(
+				new GrinderRecipe(ItemGems.getGemByName("sapphire"), ItemDusts.getDustByName("sapphire"), ticktime, eutick));
+		RecipeHandler.addRecipe(
+				new GrinderRecipe(ItemGems.getGemByName("peridot"), ItemDusts.getDustByName("peridot"), ticktime, eutick));
+		RecipeHandler.addRecipe(
+				new GrinderRecipe(ItemGems.getGemByName("redGarnet"), ItemDusts.getDustByName("redGarnet"), ticktime, eutick));
+		RecipeHandler.addRecipe(
+				new GrinderRecipe(ItemGems.getGemByName("yellowGarnet"), ItemDusts.getDustByName("yellowGarnet"), ticktime, eutick));
+
 	}
 
 	// static void addHammerRecipes()
@@ -3489,8 +3499,8 @@ public class ModRecipes
 	}
 
 	static void addGemToolRecipes(ItemStack gemsword, ItemStack gempick, ItemStack gemaxe, ItemStack gemHoe,
-			ItemStack gemspade, ItemStack gemhelmet, ItemStack gemchestplate, ItemStack gemleggings, ItemStack gemboots,
-			String gem)
+								  ItemStack gemspade, ItemStack gemhelmet, ItemStack gemchestplate, ItemStack gemleggings, ItemStack gemboots,
+								  String gem)
 	{
 		CraftingHelper.addShapedOreRecipe(gemsword, " G ", " G ", " S ", 'S', Items.STICK, 'G', gem);
 
@@ -3515,4 +3525,4 @@ public class ModRecipes
 	{
 		return UniversalBucket.getFilledBucket(ForgeModContainer.getInstance().universalBucket, fluid);
 	}
-}
+}