From 6d597cffd52ee74c0985394c6611784c9ae0a242 Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Sat, 14 Nov 2015 22:17:23 -0800 Subject: [PATCH] Small updates to match new crafting algorithm --- .../versions/0.4.2A2/mod-version.cg | 2 ++ .../versions/1.2.2/mod-version.cg | 2 ++ data/forestry/versions/3.4.0.7/mod-version.cg | 2 ++ .../versions/1.7.10-6/mod-version.cg | 2 ++ .../versions/2.2.663/mod-version.cg | 30 ++++++++++++++----- .../versions/7.1.1.127/mod-version.cg | 6 +++- data/minecraft/versions/1.7.10/mod-version.cg | 13 ++++++++ .../versions/2.8.0RC8-86/mod-version.cg | 4 +-- data/railcraft/versions/9.5.0/mod-version.cg | 3 ++ .../versions/4.0.0B8-23/mod-version.cg | 7 +++++ 10 files changed, 61 insertions(+), 10 deletions(-) diff --git a/data/big_reactors/versions/0.4.2A2/mod-version.cg b/data/big_reactors/versions/0.4.2A2/mod-version.cg index 3fe1adec..a365fd6b 100644 --- a/data/big_reactors/versions/0.4.2A2/mod-version.cg +++ b/data/big_reactors/versions/0.4.2A2/mod-version.cg @@ -172,6 +172,7 @@ group: Minerals tools: Pulverizer item: Ludicrite Ingot + gatherable: yes recipe: input: Ludicrite Dust, furnace fuel pattern: .0. ... .1. @@ -220,6 +221,7 @@ group: Minerals tools: Pulverizer item: Yellorium Ingot + gatherable: yes recipe: input: Yellorite Ore, furnace fuel pattern: .0. ... .1. diff --git a/data/extra_utilities/versions/1.2.2/mod-version.cg b/data/extra_utilities/versions/1.2.2/mod-version.cg index fef7ddda..7ae5ebbf 100644 --- a/data/extra_utilities/versions/1.2.2/mod-version.cg +++ b/data/extra_utilities/versions/1.2.2/mod-version.cg @@ -8,6 +8,7 @@ group: Materials tools: Crafting Table item: Unstable Ingot + gatherable: yes recipe: input: Iron Ingot, Division Sigil (Activated), Diamond pattern: 0.. 1.. 2.. @@ -22,6 +23,7 @@ group: Materials extras: Division Sigil (Activated) item: Bedrockium Ingot + gatherable: yes recipe: input: Triple Compressed Cobblestone, Quadruple Compressed Cobblestone, Block of Diamond pattern: 010 121 010 diff --git a/data/forestry/versions/3.4.0.7/mod-version.cg b/data/forestry/versions/3.4.0.7/mod-version.cg index 941dc2bf..17bdb00e 100644 --- a/data/forestry/versions/3.4.0.7/mod-version.cg +++ b/data/forestry/versions/3.4.0.7/mod-version.cg @@ -2736,6 +2736,7 @@ group: Minerals quantity: 9 item: Copper Ingot + gatherable: yes recipe: input: Copper Ore, furnace fuel pattern: .0. ... .1. @@ -2749,6 +2750,7 @@ group: Minerals gatherable: yes item: Tin Ingot + gatherable: yes recipe: input: Tin Ore, furnace fuel pattern: .0. ... .1. diff --git a/data/ic2_classic/versions/1.7.10-6/mod-version.cg b/data/ic2_classic/versions/1.7.10-6/mod-version.cg index 80b3f749..e8be6cd9 100644 --- a/data/ic2_classic/versions/1.7.10-6/mod-version.cg +++ b/data/ic2_classic/versions/1.7.10-6/mod-version.cg @@ -329,6 +329,7 @@ item: Copper Dust tools: Macerator item: Copper Ingot + gatherable: yes recipe: input: Copper Ore, furnace fuel pattern: .0. ... .1. @@ -1231,6 +1232,7 @@ item: Tin Dust tools: Macerator item: Tin Ingot + gatherable: yes recipe: input: Tin Ore, furnace fuel pattern: .0. ... .1. diff --git a/data/industrial_craft_2/versions/2.2.663/mod-version.cg b/data/industrial_craft_2/versions/2.2.663/mod-version.cg index 69b584c5..6311c59c 100644 --- a/data/industrial_craft_2/versions/2.2.663/mod-version.cg +++ b/data/industrial_craft_2/versions/2.2.663/mod-version.cg @@ -1692,6 +1692,7 @@ group: Minerals tools: Compressor item: Copper Ingot + gatherable: yes recipe: input: Copper Ore, furnace fuel pattern: .0. ... .1. @@ -1811,6 +1812,7 @@ group: Minerals tools: Compressor item: Lead Ingot + gatherable: yes recipe: input: furnace fuel, Lead Ore pattern: .1. ... .0. @@ -1945,6 +1947,7 @@ group: Minerals tools: Thermal Centrifuge item: Silver Ingot + gatherable: yes recipe: input: furnace fuel, Silver Dust pattern: .1. ... .0. @@ -2004,6 +2007,7 @@ group: Minerals tools: Compressor item: Tin Ingot + gatherable: yes recipe: input: furnace fuel, Tin Ore pattern: .1. ... .0. @@ -2138,11 +2142,13 @@ group: Minerals: Dusts tools: Macerator recipe: extras: Tiny Pile of Gold Dust + ignoreDuringCrafting: yes input: Slag pattern: ... .0. ... quantity: 5 tools: Thermal Centrifuge recipe: + ignoreDuringCrafting: yes input: furnace fuel, Hydrated Coal Dust pattern: .1. ... .0. tools: Furnace @@ -2281,10 +2287,12 @@ group: Minerals: Dusts pattern: ... .0. ... tools: Thermal Centrifuge recipe: + ignoreDuringCrafting: yes input: Tiny Pile of Iron Dust pattern: 000 000 000 tools: Crafting Table recipe: + ignoreDuringCrafting: yes input: 9 Tiny Pile of Iron Dust pattern: ... .0. ... tools: Compressor @@ -2293,45 +2301,53 @@ group: Minerals: Dusts pattern: ... .0. ... tools: Macerator recipe: + ignoreDuringCrafting: yes input: Fuel Rod (Empty) pattern: ... .0. ... tools: Macerator recipe: extras: 3 Plutonium + ignoreDuringCrafting: yes input: Pellets of RTG Fuel pattern: ... .0. ... quantity: 54 tools: Thermal Centrifuge recipe: extras: Tiny Pile of Plutonium, 4 Uranium + ignoreDuringCrafting: yes input: Fuel Rod (Depleted Uranium) pattern: ... .0. ... tools: Thermal Centrifuge recipe: extras: 2 Tiny Pile of Plutonium, 8 Uranium 238 + ignoreDuringCrafting: yes input: Dual Fuel Rod (Depleted Uranium) pattern: ... .0. ... quantity: 3 tools: Thermal Centrifuge recipe: extras: 4 Tiny Pile of Plutonium, 16 Uranium 238 + ignoreDuringCrafting: yes input: Quad Fuel Rod (Depleted Uranium) pattern: ... .0. ... quantity: 6 tools: Thermal Centrifuge recipe: extras: Tiny Pile of Plutonium, 3 Plutonium + ignoreDuringCrafting: yes input: Fuel Rod (Depleted MOX) pattern: ... .0. ... tools: Thermal Centrifuge recipe: extras: 2 Tiny Pile of Plutonium, 6 Plutonium + ignoreDuringCrafting: yes input: Dual Fuel Rod (Depleted MOX) pattern: ... .0. ... quantity: 3 tools: Thermal Centrifuge recipe: extras: 4 Tiny Pile of Plutonium, 12 Plutonium + ignoreDuringCrafting: yes input: Quad Fuel Rod (Depleted MOX) pattern: ... .0. ... quantity: 6 @@ -2358,23 +2374,23 @@ group: Minerals: Dusts item: Lead Dust recipe: - extras: Tiny Pile of Copper Dust - input: Purified Crushed Lead Ore + input: Lead Ingot pattern: ... .0. ... - tools: Thermal Centrifuge + tools: Macerator recipe: extras: Stone Dust input: Crushed Lead Ore pattern: ... .0. ... tools: Thermal Centrifuge + recipe: + extras: Tiny Pile of Copper Dust + input: Purified Crushed Lead Ore + pattern: ... .0. ... + tools: Thermal Centrifuge recipe: input: Tiny Pile of Lead Dust pattern: 000 000 000 tools: Crafting Table - recipe: - input: Lead Ingot - pattern: ... .0. ... - tools: Macerator recipe: input: 9 Tiny Pile of Lead Dust pattern: ... .0. ... diff --git a/data/mekanism/versions/7.1.1.127/mod-version.cg b/data/mekanism/versions/7.1.1.127/mod-version.cg index e96d30e3..867d288f 100644 --- a/data/mekanism/versions/7.1.1.127/mod-version.cg +++ b/data/mekanism/versions/7.1.1.127/mod-version.cg @@ -1790,6 +1790,7 @@ group: Minerals tools: Crusher item: Copper Ingot + gatherable: yes recipe: input: Copper Dust, furnace fuel pattern: .0. ... .1. @@ -2188,6 +2189,7 @@ group: Minerals tools: Crusher item: Osmium Ingot + gatherable: yes recipe: input: Osmium Dust, furnace fuel pattern: .0. ... .1. @@ -2398,6 +2400,7 @@ group: Minerals tools: Crusher item: Tin Ingot + gatherable: yes recipe: input: Tin Dust, furnace fuel pattern: .0. ... .1. @@ -2918,4 +2921,5 @@ update: Stick recipe: input: Oak Wood Planks pattern: ... .0. ... - quantity: 6 \ No newline at end of file + quantity: 6 + tools: Precision Sawmill diff --git a/data/minecraft/versions/1.7.10/mod-version.cg b/data/minecraft/versions/1.7.10/mod-version.cg index f42453be..458ea299 100644 --- a/data/minecraft/versions/1.7.10/mod-version.cg +++ b/data/minecraft/versions/1.7.10/mod-version.cg @@ -82,6 +82,10 @@ group: Agriculture input: Bowl, Mushroom (brown), Mushroom (red) pattern: .2. .1. .0. + item: Mushroom (brown) + + item: Mushroom (red) + item: Nether Wart gatherable: yes @@ -1359,8 +1363,10 @@ group: Minerals pattern: 00. 00. ... item: Glowstone Dust + gatherable: yes item: Gold Ingot + gatherable: yes recipe: input: Gold Ore, furnace fuel pattern: .0. ... .1. @@ -1387,6 +1393,7 @@ group: Minerals gatherable: yes item: Iron Ingot + gatherable: yes recipe: input: Iron Ore, furnace fuel pattern: .0. ... .1. @@ -1570,6 +1577,9 @@ group: Plants item: Red Tulip gatherable: yes + item: Rose + gatherable: yes + item: Rose Bush gatherable: yes @@ -2367,6 +2377,9 @@ group: Tools input: Flint, Iron Ingot pattern: ... .1. ..0 + item: furnace fuel + gatherable: yes + item: Golden Axe recipe: input: Gold Ingot, Stick diff --git a/data/minefactory_reloaded/versions/2.8.0RC8-86/mod-version.cg b/data/minefactory_reloaded/versions/2.8.0RC8-86/mod-version.cg index a4fe040a..15d010d5 100644 --- a/data/minefactory_reloaded/versions/2.8.0RC8-86/mod-version.cg +++ b/data/minefactory_reloaded/versions/2.8.0RC8-86/mod-version.cg @@ -697,7 +697,7 @@ group: Machine Parts pattern: 00. 00. ... quantity: 4 recipe: - input: Plastic Block + input: Block of Plastic pattern: ... .0. ... quantity: 4 @@ -1904,7 +1904,7 @@ group: Tools item: Needlegun Ammo (Lava) recipe: extras: Bucket - input: Lava Bucket, Needlegun Ammo, Plastic Cup + input: Lava Bucket, Needlegun Ammo (Needles), Plastic Cup pattern: 12. 0.. ... item: Needlegun Ammo (Needles) diff --git a/data/railcraft/versions/9.5.0/mod-version.cg b/data/railcraft/versions/9.5.0/mod-version.cg index 235ab75f..9830236e 100644 --- a/data/railcraft/versions/9.5.0/mod-version.cg +++ b/data/railcraft/versions/9.5.0/mod-version.cg @@ -2275,6 +2275,7 @@ group: Minerals tools: Coke Oven item: Copper Ingot + gatherable: yes recipe: input: Copper Ore, furnace fuel pattern: .0. ... .1. @@ -2333,6 +2334,7 @@ group: Minerals tools: Furnace item: Lead Ingot + gatherable: yes recipe: input: Lead Ore, furnace fuel pattern: .0. ... .1. @@ -2443,6 +2445,7 @@ group: Minerals gatherable: yes item: Tin Ingot + gatherable: yes recipe: input: Tin Ore, furnace fuel pattern: .0. ... .1. diff --git a/data/thermal_expansion/versions/4.0.0B8-23/mod-version.cg b/data/thermal_expansion/versions/4.0.0B8-23/mod-version.cg index d5298cb3..8f782a65 100644 --- a/data/thermal_expansion/versions/4.0.0B8-23/mod-version.cg +++ b/data/thermal_expansion/versions/4.0.0B8-23/mod-version.cg @@ -1098,6 +1098,7 @@ group: Minerals tools: Crafting Table item: Copper Ingot + gatherable: yes recipe: input: Pulverized Copper pattern: ... .0. ... @@ -1262,6 +1263,7 @@ group: Minerals tools: Crafting Table item: Ferrous Ingot + gatherable: yes recipe: input: Pulverized Ferrous Metal pattern: ... .0. ... @@ -1405,6 +1407,7 @@ group: Minerals tools: Crafting Table item: Lead Ingot + gatherable: yes recipe: input: Pulverized Lead pattern: ... .0. ... @@ -1538,6 +1541,7 @@ group: Minerals tools: Crafting Table item: Mana Infused Ingot + gatherable: yes recipe: input: Pulverized Mana Infused Metal pattern: ... .0. ... @@ -1740,6 +1744,7 @@ group: Minerals tools: Crafting Table item: Shiny Ingot + gatherable: yes recipe: input: Pulverized Shiny Metal pattern: ... .0. ... @@ -1856,6 +1861,7 @@ group: Minerals tools: Crafting Table item: Silver Ingot + gatherable: yes recipe: input: Pulverized Silver pattern: ... .0. ... @@ -1930,6 +1936,7 @@ group: Minerals tools: Crafting Tools item: Tin Ingot + gatherable: yes recipe: input: Pulverized Tin pattern: ... .0. ...