Skip to content

Commit

Permalink
conversion recipe between black quartz types, fixes #1834
Browse files Browse the repository at this point in the history
  • Loading branch information
NielsPilgaard committed Oct 14, 2020
1 parent 56be6d3 commit c67a0ce
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions scripts/RecipeConflicts.zs
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import mods.jei.JEI.removeAndHide as rh;

# Conversion recipe between Thaumic Tinkerer Black Quartz Block & Botania Block of Smokey Quartz
recipes.addShapeless(<botania:quartztypedark>, [<thaumictinkerer:black_quartz_block>]);
recipes.addShapeless(<thaumictinkerer:black_quartz_block>, [<botania:quartztypedark>]);

# *======= Variables =======*

val marble = <ore:stoneMarble>;

# *======= Recipe Conflicts =======*

# Disk Platter / Iron Chain Link
recipes.remove(<iceandfire:chain_link>);
recipes.addShaped(<iceandfire:chain_link> * 2,
Expand Down Expand Up @@ -51,8 +48,9 @@ import mods.jei.JEI.removeAndHide as rh;
<harvestcraft:softpretzelitem>,
[<ore:toolBakeware>, <ore:foodDough>, <ore:foodButter>,
<ore:itemSalt>, <ore:itemSalt>]);

# Quark Polished Marble
val marble = <ore:stoneMarble>;
recipes.removeShaped(<quark:marble:1>);
recipes.addShaped("Polished Marble", <quark:marble:1> * 9,
[[marble, marble, marble],
Expand Down

0 comments on commit c67a0ce

Please sign in to comment.