From dc8965f62157cf5e23754ec994267bd355f16ef6 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sat, 29 Nov 2014 21:59:21 +0800 Subject: [PATCH] #1320 Charged Certus Quartz Ore now produces charged rather than normal certus quartz in the SAG Mill --- ReleaseNotes.txt | 7 ++++--- .../assets/enderio/config/SAGMillRecipes_Core.xml | 11 +++++++++++ .../enderio/machine/crusher/TileCrusher.java | 3 +-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 932e4674..7cfbc0c5 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -15,9 +15,10 @@ Changes - #1257 Upgrading Dark Steel items with capacitors now increases the amount of damage absorbed by power as well as the amount of power stored - #900 New texture for quite clear glass block -- Reduced amount of powered stored in wireless charger from 1 mil to 200k - #1011 Shift-clicking armor from a Capacitor Bank's charge slots will re-equip the item if possible -- Increased max stack size for Soul Vials and Broken Spawners to 64 +- #1320 Charged Certus Quartz Ore now produces charged rather than normal certus quartz in the SAG Mill +- Increased max stack size for Soul Vials and Broken Spawners to 64 +- Reduced amount of powered stored in wireless charger from 1 mil to 200k API - #1254 Add method for tools to control hiding of facades @@ -54,7 +55,7 @@ Changes - #1223 Various small GUI- and NEI-related improvements and tweaks (Tonius) - #1232 Painted Glowstone now implements IFacade and will have connected textures with chisel - #1238, #1251 Improved control and modification of grinding balls via the SAGMillRecipes_User.xml file -- #1164 Conduit resistance increased +- #1164 Conduit resistance increased Bugs - #1226 Redstone color not showing on MFR machines / BR ports diff --git a/resources/assets/enderio/config/SAGMillRecipes_Core.xml b/resources/assets/enderio/config/SAGMillRecipes_Core.xml index bf3836ec..c27061b2 100644 --- a/resources/assets/enderio/config/SAGMillRecipes_Core.xml +++ b/resources/assets/enderio/config/SAGMillRecipes_Core.xml @@ -626,6 +626,17 @@ Examples: + + + + + + + + + + + diff --git a/src/main/java/crazypants/enderio/machine/crusher/TileCrusher.java b/src/main/java/crazypants/enderio/machine/crusher/TileCrusher.java index 09c574b3..43a73225 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/TileCrusher.java +++ b/src/main/java/crazypants/enderio/machine/crusher/TileCrusher.java @@ -2,8 +2,6 @@ package crazypants.enderio.machine.crusher; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractPoweredTaskEntity; import crazypants.enderio.machine.IMachineRecipe; @@ -142,6 +140,7 @@ public class TileCrusher extends AbstractPoweredTaskEntity { return "machine.sagmill"; } + @Override public float getVolume() { return super.getVolume() * 0.125f; }