tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Merge branch 'rv2' of https://github.com/AppliedEnergistics/Applied-Energistics-2 into rv2

Browse source
This commit is contained in:
thatsIch 2014-09-28 17:01:44 +02:00
commit 07c98ca67c
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/resources/assets/appliedenergistics2/recipes/process.recipe
View file

@ -162,7 +162,7 @@ shaped=
grindfz= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust grindfz= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust
grindfz= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust grindfz= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust
grindfz= mc:ender_pearl -> ae2:ItemMaterial.EnderDust grindfz= mc:ender_pearl -> ae2:ItemMaterial.EnderDust
# grindfz= mc:wheat -> ae2:ItemMaterial.Flour # grindfz= oredictionary:cropWheat -> ae2:ItemMaterial.Flour
grindfz= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust grindfz= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust
grindfz= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust grindfz= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust
# grindfz= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust # grindfz= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust
@ -172,7 +172,7 @@ shaped=
mekcrusher= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust mekcrusher= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust
mekcrusher= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust mekcrusher= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust
mekcrusher= mc:ender_pearl -> ae2:ItemMaterial.EnderDust mekcrusher= mc:ender_pearl -> ae2:ItemMaterial.EnderDust
# mekcrusher= mc:wheat -> ae2:ItemMaterial.Flour # mekcrusher= oredictionary:cropWheat -> ae2:ItemMaterial.Flour
mekcrusher= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust mekcrusher= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust
mekcrusher= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust mekcrusher= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust
mekcrusher= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust mekcrusher= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust
@ -182,7 +182,7 @@ shaped=
hccrusher= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust hccrusher= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust
hccrusher= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust hccrusher= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust
hccrusher= mc:ender_pearl -> ae2:ItemMaterial.EnderDust hccrusher= mc:ender_pearl -> ae2:ItemMaterial.EnderDust
hccrusher= mc:wheat -> ae2:ItemMaterial.Flour hccrusher= oredictionary:cropWheat -> ae2:ItemMaterial.Flour
hccrusher= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust hccrusher= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust
hccrusher= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust hccrusher= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust
hccrusher= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust hccrusher= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust
@ -192,7 +192,7 @@ shaped=
crusher= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust crusher= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust
crusher= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust crusher= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust
crusher= mc:ender_pearl -> ae2:ItemMaterial.EnderDust crusher= mc:ender_pearl -> ae2:ItemMaterial.EnderDust
crusher= oredictionary:itemWheat -> ae2:ItemMaterial.Flour crusher= oredictionary:cropWheat -> ae2:ItemMaterial.Flour
crusher= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust crusher= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust
crusher= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust crusher= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust
crusher= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust crusher= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust
@ -202,7 +202,7 @@ shaped=
macerator= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust macerator= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust
macerator= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust macerator= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust
macerator= mc:ender_pearl -> ae2:ItemMaterial.EnderDust macerator= mc:ender_pearl -> ae2:ItemMaterial.EnderDust
# macerator= oredictionary:itemWheat -> ae2:ItemMaterial.Flour # macerator= oredictionary:cropWheat -> ae2:ItemMaterial.Flour
macerator= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust macerator= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust
macerator= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust macerator= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust
macerator= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust macerator= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust
@ -212,7 +212,7 @@ shaped=
pulverizer= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust pulverizer= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust
pulverizer= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust pulverizer= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust
pulverizer= mc:ender_pearl -> ae2:ItemMaterial.EnderDust pulverizer= mc:ender_pearl -> ae2:ItemMaterial.EnderDust
pulverizer= oredictionary:itemWheat -> ae2:ItemMaterial.Flour pulverizer= oredictionary:cropWheat -> ae2:ItemMaterial.Flour
pulverizer= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust pulverizer= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust
pulverizer= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust pulverizer= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust
pulverizer= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust pulverizer= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust