+ Uploaded missing Hemp crop textures.

% Adjusted crafting recipe for Tumbaga when hand-crafted. Closes #433.
$ Fixed A2 Spam. Closes #432.

9 files changed, 32 insertions, 11 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 17aaf5e106..912e3ff30d 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -219,6 +219,8 @@ public final class ModItems {
 	public static Item dustCalciumCarbonate;
 	public static Item dustLi2CO3CaOH2;
 	public static Item dustLi2BeF4;
+	
+	public static Item dustTumbagaMix;
 
 	public static Item dustAer;
 	public static Item dustIgnis;
@@ -696,7 +698,8 @@ public final class ModItems {
 		GT_OreDictUnificator.registerOre("pelletZirconium", new ItemStack(itemZirconiumChlorideCinterPellet));
 		//Zirconium Chloride
 		dustZrCl4 = ItemUtils.generateSpecialUseDusts("ZrCl4", "ZrCl4", "ZrCl4", Utils.rgbtoHexValue(180, 180, 180))[0]; //http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf
-		dustCookedZrCl4 = ItemUtils.generateSpecialUseDusts("CookedZrCl4", "Cooked ZrCl4", "ZrCl4", Utils.rgbtoHexValue(180, 180, 180))[0]; //http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf
+		dustCookedZrCl4 = ItemUtils.generateSpecialUseDusts("CookedZrCl4", "Cooked ZrCl4", "ZrCl4", Utils.rgbtoHexValue(180, 180, 180))[0]; //http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf		
+		
 		//Zirconium Tetrafluoride
 		/*GT_OreDictUnificator.registerOre("cellZrF4", ItemUtils.getItemStackOfAmountFromOreDict("cellZirconiumTetrafluoride", 1));
 		GT_OreDictUnificator.registerOre("dustZrF4", ItemUtils.getItemStackOfAmountFromOreDict("dustZirconiumTetrafluoride", 1));*/
@@ -837,7 +840,9 @@ public final class ModItems {
 		if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDoubleEuropium", 1) == null) && CORE.ConfigSwitches.enableCustom_Pipes){
 			itemDoublePlateEuropium = new BaseItemPlateDouble(ELEMENT.getInstance().EUROPIUM);
 		}
-
+		
+		//Tumbaga Mix (For Simple Crafting)
+		dustTumbagaMix = ItemUtils.generateSpecialUseDusts("MixTumbaga", "Tumbaga Mix", "Au2Cu", Utils.rgbtoHexValue(255, 150, 80))[0];
 		
 		/*
 		 * Decayable Materials
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index 500333a7a2..c2fd4adc41 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -162,14 +162,25 @@ public class RECIPES_General {
 
 
 		//Shaped Crafting for ULV Material Dusts		
+		
 		//Potin
 		if (RecipeUtils.addShapelessGregtechRecipe(new Object[] {"dustLead", "dustBronze", "dustTin",
 				"dustLead", "dustBronze"}, ALLOY.POTIN.getDust(5))){
 			Logger.INFO("Added shapeless recipe for Potin Dust.");
 		}
+		
 		//Tumbaga
-		if (RecipeUtils.addShapelessGregtechRecipe(new Object[] {"dustRoseGold", "dustGold", "dustGold",
-				"dustGold", "dustCopper", "dustCopper"}, ALLOY.TUMBAGA.getDust(10))){
+		if (RecipeUtils.addShapelessGregtechRecipe(new Object[] {
+				"dustGold", "dustGold", "dustCopper"}, ItemUtils.getSimpleStack(ModItems.dustTumbagaMix))){
+			Logger.INFO("Added shapeless recipe for Tumbaga Mix.");
+		}	
+		if (RecipeUtils.addShapelessGregtechRecipe(new Object[] {
+				ItemUtils.getSimpleStack(ModItems.dustTumbagaMix),
+				ItemUtils.getSimpleStack(ModItems.dustTumbagaMix),
+				ItemUtils.getSimpleStack(ModItems.dustTumbagaMix),
+				"dustCopper"
+				},
+				ALLOY.TUMBAGA.getDust(10))){
 			Logger.INFO("Added shapeless recipe for Tumbaga Dust.");
 		}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index 7103c81980..7ae0c6b246 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -483,8 +483,13 @@ GT_MetaTileEntity_MultiBlockBase {
 	public void log(String s) {
 		boolean isDebugLogging = CORE.DEBUG;	
 		boolean reset = true;
+		
+		if (!isDebugLogging) {
+			return;
+		}
+		
 		if (aLogger == null || reset) {
-			if (true) {
+			if (isDebugLogging) {
 				try {
 					aLogger = Logger.class.getMethod("INFO", String.class);
 				} catch (NoSuchMethodException | SecurityException e) {}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
index 22ce41282f..7dd376759a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
@@ -82,14 +82,14 @@ public class GTPP_CapeRenderer extends RenderPlayer {
 		AbstractClientPlayer aPlayer = (AbstractClientPlayer) aEvent.entityPlayer;
 		if (!ConfigSwitches.enableCustomCapes) {
 			aEvent.setCanceled(true);
-			Logger.INFO("A1");
+			Logger.WARNING("A1");
 			return;
 		}
 		
 		if (hasResourceChecked) {
 			if (!hasCape && !CORE.DEVENV) {
 				aEvent.setCanceled(true);
-				Logger.INFO("A2");
+				Logger.WARNING("A2");
 				return;
 			}		
 		}
@@ -141,7 +141,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
 		if (GT_Utility.getFullInvisibility(aPlayer) || aPlayer.isInvisible()
 				|| GT_Utility.getPotion(aPlayer, Integer.valueOf(Potion.invisibility.id).intValue())) {
 			aEvent.setCanceled(true);
-			Logger.INFO("A3");
+			Logger.WARNING("A3");
 			return;
 		}
 
@@ -209,7 +209,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
 						Logger.WORLD("[Capes++] Mojang/Cache checking for " + name + ".");
 						GameProfile profile = MinecraftServer.getServer().func_152358_ax().func_152652_a(g);
 						if (profile != null) {
-							Logger.INFO("[Capes++] Found for UUID check: " + profile.getName() + ".");
+							Logger.WARNING("[Capes++] Found for UUID check: " + profile.getName() + ".");
 							return profile.getName();
 						}
 					} else {
@@ -218,7 +218,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
 							Logger.WORLD("[Capes++] Mojang/Cache checking for " + name + ".");
 							GameProfile profile = MinecraftServer.getServer().func_152358_ax().func_152652_a(g);
 							if (profile != null) {
-								Logger.INFO("[Capes++] Found for UUID check 2: " + profile.getName() + ".");
+								Logger.WARNING("[Capes++] Found for UUID check 2: " + profile.getName() + ".");
 								return profile.getName();
 							}
 						}
@@ -230,7 +230,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
 					Logger.WORLD("[Capes++] Mojang/Cache checking for " + name + ".");
 					GameProfile profile = MinecraftServer.getServer().func_152358_ax().func_152655_a(name);
 					if (profile != null) {
-						Logger.INFO("[Capes++] Found for name check: " + profile.getName() + ".");
+						Logger.WARNING("[Capes++] Found for name check: " + profile.getName() + ".");
 						return profile.getName();
 					}
 				}
diff --git a/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.1.png b/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.1.png
new file mode 100644
index 0000000000..8c5f1ec338
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.1.png
diff --git a/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.2.png b/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.2.png
new file mode 100644
index 0000000000..75ff7b2558
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.2.png
diff --git a/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.3.png b/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.3.png
new file mode 100644
index 0000000000..edcfc53edd
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.3.png
diff --git a/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.4.png b/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.4.png
new file mode 100644
index 0000000000..8176e98807
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.4.png
diff --git a/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.5.png b/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.5.png
new file mode 100644
index 0000000000..0737748bb9
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.5.png