Version bump to 2.2.2; ammonia coolant now always show durability bar…

…; aluminium/magnalium/titanium ingots now can be crushed into dust
3TUSK · Jan 9, 2018 · e90f49b · e90f49b
1 parent df350a8
commit e90f49b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ Mapping_Ver=snapshot_20171219
 
 FCR_Ver_Major=2
 FCR_Ver_Minor=2
-FCR_Ver_Patch=1
+FCR_Ver_Patch=2
 
 IC2_Ver=2.8.30
 JEI_Ver=4.8.5.138

diff --git a/src/main/java/frogcraftrebirth/common/FrogRecipes.java b/src/main/java/frogcraftrebirth/common/FrogRecipes.java
@@ -164,7 +164,10 @@ public static void postInit() {
 		Recipes.macerator.addRecipe(Recipes.inputFactory.forStack(new ItemStack(FrogRegistees.ORE, 1, 0)), null, true, new ItemStack(FrogRegistees.ORE_CRUSHED, 3, 0));
 		Recipes.macerator.addRecipe(Recipes.inputFactory.forStack(new ItemStack(FrogRegistees.ORE, 1, 1)), null, true, new ItemStack(FrogRegistees.ORE_CRUSHED, 3, 1));
 		Recipes.macerator.addRecipe(Recipes.inputFactory.forStack(new ItemStack(FrogRegistees.ORE, 1, 2)), null, true, new ItemStack(FrogRegistees.ORE_CRUSHED, 3, 2));
-
+		Recipes.macerator.addRecipe(Recipes.inputFactory.forOreDict("ingotAluminium"), null, true, new ItemStack(FrogRegistees.METAL_DUST, 1, 0));
+		Recipes.macerator.addRecipe(Recipes.inputFactory.forOreDict("ingotMagnalium"), null, true, new ItemStack(FrogRegistees.METAL_DUST, 1, 1));
+		Recipes.macerator.addRecipe(Recipes.inputFactory.forOreDict("ingotTitanium"), null, true, new ItemStack(FrogRegistees.NON_METAL_DUST, 1, 2));
+
 		NBTTagCompound oreWashingMetadata = new NBTTagCompound();
 		oreWashingMetadata.setInteger("amount", 500);
 		Recipes.oreWashing.addRecipe(Recipes.inputFactory.forStack(new ItemStack(FrogRegistees.ORE_CRUSHED, 1, 0)), oreWashingMetadata, true, new ItemStack(FrogRegistees.ORE_PURIFIED, 1, 0), new ItemStack(FrogRegistees.ORE_DUST_TINY, 2, 0), new ItemStack(Blocks.SAND));

diff --git a/src/main/java/frogcraftrebirth/common/item/ItemAmmoniaCoolant.java b/src/main/java/frogcraftrebirth/common/item/ItemAmmoniaCoolant.java
@@ -50,6 +50,11 @@ public ItemAmmoniaCoolant(String type, int storage) {
 	public void addInformation(ItemStack stack, World worldIn, List<String> tooltips, ITooltipFlag flag) {
 		tooltips.add(I18n.format("item.CoolantAmmonia.info", type));
 	}
+
+	@Override
+	public boolean showDurabilityBar(ItemStack stack) {
+		return true;
+	}
 
 	@Override
 	public boolean canBePlacedIn(ItemStack stack, IReactor reactor) {