diff --git a/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml b/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml
index ab3359e0..f10c7a8c 100644
--- a/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml
+++ b/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml
@@ -115,19 +115,30 @@ sand/cobble/wood=0.1
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang
index 0668e9a3..00838acc 100644
--- a/resources/assets/enderio/lang/en_US.lang
+++ b/resources/assets/enderio/lang/en_US.lang
@@ -56,6 +56,7 @@ enderio.binderComposite.name=Binder Composite
enderio.phasedIronNugget.name=Pulsating Iron Nugget
tile.blockDarkIronBars.name=Dark Iron Bars
enderio.blastResistant=Blast Resistant
+enderio.lightEmitter=Emits Light
//Fluids
fluid.nutrient_distillation=Nutrient Distillation
@@ -90,6 +91,8 @@ enderio.darkGrindingBall.tooltip.detailed.line4=Power Reduction
tile.blockFusedQuartz.name=Fused Quartz
enderio.blockFusedQuartz.fusedQuartz.name=Fused Quartz
enderio.blockFusedQuartz.fusedGlass.name=Quite Clear Glass
+enderio.blockFusedQuartz.enlightenedFusedQuartz.name=Enlightened Fused Quartz
+enderio.blockFusedQuartz.enlightenedFusedGlass.name=Enlightened Clear Glass
item.enderio.itemFusedQuartzFrame.name=Fused Quartz Frame
enderio.itemPowderIngot=Powders & Ingots
diff --git a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java
index 653bbe48..d9d8f3e1 100644
--- a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java
+++ b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java
@@ -32,7 +32,9 @@ public class BlockFusedQuartz extends BlockEio {
public enum Type {
FUSED_QUARTZ("fusedQuartz", "enderio:fusedQuartz", "enderio:fusedQuartzFrame", "enderio:fusedQuartzItem"),
- GLASS("fusedGlass", "enderio:fusedGlass", "enderio:fusedGlassFrame", "enderio:fusedGlassItem");
+ GLASS("fusedGlass", "enderio:fusedGlass", "enderio:fusedGlassFrame", "enderio:fusedGlassItem"),
+ ENLIGHTENED_FUSED_QUARTZ("enlightenedFusedQuartz", "enderio:fusedQuartz", "enderio:fusedQuartzFrame", "enderio:fusedQuartzItem"),
+ ENLIGHTENED_GLASS("enlightenedFusedGlass", "enderio:fusedGlass", "enderio:fusedGlassFrame", "enderio:fusedGlassItem");
final String unlocalisedName;
final String blockIcon;
@@ -70,7 +72,7 @@ public class BlockFusedQuartz extends BlockEio {
GameRegistry.registerTileEntity(teClass, name + "TileEntity");
}
}
-
+
@Override
public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) {
int meta = world.getBlockMetadata(x, y, z);
@@ -115,6 +117,19 @@ public class BlockFusedQuartz extends BlockEio {
return 0;
}
+ @Override
+ public int getLightValue(IBlockAccess world, int x, int y, int z) {
+ Block block = world.getBlock(x, y, z);
+ if(block != this) {
+ return super.getLightValue(world, x, y, z);
+ }
+ int meta = world.getBlockMetadata(x, y, z);
+ if(meta > 1) {
+ return 15;
+ }
+ return super.getLightValue(world, x, y, z);
+ }
+
@Override
public int damageDropped(int par1) {
return par1;
diff --git a/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java b/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java
index f6de920e..ca503dd1 100644
--- a/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java
+++ b/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java
@@ -43,9 +43,12 @@ public class ItemFusedQuartz extends ItemBlockWithMetadata {
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
int meta = par1ItemStack.getItemDamage();
meta = MathHelper.clamp_int(meta, 0, BlockFusedQuartz.Type.values().length - 1);
- if(meta == 0) {
+ if(meta == 0 || meta == 2) {
par3List.add(Lang.localize("blastResistant"));
}
+ if(meta > 1) {
+ par3List.add(Lang.localize("lightEmitter"));
+ }
}
diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java
index 4e5c2028..636e7a12 100644
--- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java
+++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java
@@ -29,6 +29,7 @@ public class MaterialRecipes {
OreDictionary.registerOre("glass", Blocks.glass);
OreDictionary.registerOre("stickWood", Items.stick);
OreDictionary.registerOre("woodStick", Items.stick);
+ OreDictionary.registerOre("sand", Blocks.sand);
ItemStack pureGlass = new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.GLASS.ordinal());
OreDictionary.registerOre("glass", pureGlass);