Skip to content

Commit

Permalink
Merge pull request #502 from TDarkShadow/Some-Changes---None-Conflict
Browse files Browse the repository at this point in the history
Some changes - No conflicts
  • Loading branch information
BBoldt authored Aug 11, 2016
2 parents 24b07c8 + 0425655 commit 07b3158
Show file tree
Hide file tree
Showing 17 changed files with 276 additions and 12 deletions.
3 changes: 2 additions & 1 deletion config/agricraft/SoilWhitelist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
#You can get these values from NEI
#Whitelisting a block as a fertile soil means you can plant crops on them
#Note that this only works for crops that can be planted on farmland, crops that require a specific soil (e.g. nether wart or cactus) will still need that particular soil
#For example: Forestry:soil:0 (this will add forestry humus to the whitelist)
#For example: Forestry:soil:0 (this will add forestry humus to the whitelist)
<RandomThings:fertilizedDirt>
4 changes: 2 additions & 2 deletions config/aobd.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ Cobalt {


Cobaltum {
B:"Disable All"=false
B:"Disable All"=true
B:Eln=true
B:EnderIO=true
B:HydCraft=true
Expand Down Expand Up @@ -1023,7 +1023,7 @@ Tungsten {


Wolframium {
B:"Disable All"=false
B:"Disable All"=true
B:Eln=true
B:EnderIO=true
B:HydCraft=true
Expand Down
2 changes: 1 addition & 1 deletion config/asielib.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Configuration file

base {
B:enableChatTweaks=true
B:enableChatTweaks=false
B:enableColor=false
}

Expand Down
2 changes: 1 addition & 1 deletion config/biomesoplenty/ids.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
I:"Lush River ID"=101
I:"Lush Swamp ID"=102
I:"Mangrove ID"=103
I:"Maple Woods ID"=104
I:"Maple Woods ID"=160
I:"Marsh ID"=105
I:"Meadow Forest ID"=106
I:"Meadow ID"=107
Expand Down
4 changes: 1 addition & 3 deletions config/cofh/world/Vanilla.json
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,7 @@
"maxHeight": 118,
"retrogen": "true",
"biomeRestriction": "whitelist",
"biomes": [
"hell"
],
"biomes": "none",
"dimensionRestriction": "whitelist",
"dimensions": [
-1
Expand Down
2 changes: 1 addition & 1 deletion config/customthings/lang/en_US.lang
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
item.customthings.sparkpowder.name=Sparkpowder
item.sparkpowder.name=Sparkpowder
tile.customthings.ore.nether.iron.name=Nether Iron Ore
tile.customthings.ore.nether.gold.name=Nether Gold Ore
tile.customthings.ore.nether.redstone.name=Nether Redstone Ore
Expand Down
36 changes: 36 additions & 0 deletions scripts/Aether.zs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/* Aether
Tweaks and Alterations */

//Adding Berries to oredict
<ore:foodBerries>.add(<aether:blueBerry>);
<ore:foodBerries>.add(<aether:enchantedBerry>);
<ore:foodBerries>.add(<aether:rainbowStrawberry>);
<ore:foodBerries>.add(<aether:wyndberry>);

//Adding Oranges to oredict
<ore:cropOrange>.add(<aether:orange>);

//Adding Jelly to oredict
<ore:foodJelly>.add(<aether:swetJelly:0>);
<ore:foodJelly>.add(<aether:swetJelly:1>);
<ore:foodJelly>.add(<aether:swetJelly:2>);

//Crafting Aether food with other mods
//Blueberry Lollipop
recipes.addShapeless(<aether:blueberryLollipop>, [<plantmegapack:berriesBlue>, <minecraft:sugar>, <ore:stickWood>]);
<plantmegapack:berriesBlue>.addTooltip(format.darkGray("Crafting: ") + format.blue("Blueberry Lollipop"));
recipes.addShapeless(<aether:blueberryLollipop>, [<ExtraTrees:food:45>, <minecraft:sugar>, <ore:stickWood>]);
//Orange Lollipop
recipes.removeShapeless(<aether:orangeLollipop>);
recipes.addShapeless(<aether:orangeLollipop>, [<ore:cropOrange>, <minecraft:sugar>, <aether:skyrootStick>]);
recipes.addShapeless(<aether:orangeLollipop>, [<ore:cropOrange>, <minecraft:sugar>, <ore:stickWood>]);
//Jelly Pumpkin
recipes.removeShapeless(<aether:jellyPumpkin>);
recipes.addShapeless(<aether:jellyPumpkin>, [<ore:cropOrange>, <ore:foodJelly>, <minecraft:sugar>]);

//Crafing Plant Mega Pack food with Aether's blueberries
//Muffin
recipes.addShapeless(<plantmegapack:foodBlueberryMuffin> * 6, [<aether:blueBerry>, <aether:blueBerry>, <minecraft:bread>]);
recipes.addShapeless(<plantmegapack:foodBlueberryMuffin> * 6, [<aether:blueBerry>, <aether:blueBerry>, <plantmegapack:foodCornBread>]);
//Slushie
recipes.addShaped(<plantmegapack:foodBlueberrySlushie>, [[<aether:blueBerry>, <aether:blueBerry>, <aether:blueBerry>], [<minecraft:sugar>, <ore:bucketMilk>, <minecraft:sugar>], [null, <minecraft:glass_bottle>, null]]);
42 changes: 42 additions & 0 deletions scripts/BOP.zs
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,45 @@ mods.forestry.Squeezer.addRecipe(<liquid:poison> * 10, <Forestry:mulch> % 5,[<pl
mods.forestry.Squeezer.addRecipe(<liquid:poison> * 10, <Forestry:mulch> % 5,[<plantmegapack:shrubDwarfElder>], 20);
mods.forestry.Squeezer.addRecipe(<liquid:poison> * 10, <Forestry:mulch> % 5,[<plantmegapack:shrubSpicebush>], 20);

//Poison extract Jar Filling
mods.thermalexpansion.Transposer.addFillRecipe(2000, <BiomesOPlenty:jarEmpty>, <BiomesOPlenty:jarFilled:1>, <liquid:poison> * 40);
mods.thermalexpansion.Transposer.addExtractRecipe(2000, <BiomesOPlenty:jarFilled:1>, <liquid:poison> * 40, <BiomesOPlenty:jarEmpty>, 100);

//Crafting Dart Blower with Bamboo
recipes.addShaped(<BiomesOPlenty:dartBlower>, [[<tropicraft:bambooStick>, null, <tropicraft:bambooStick>], [<tropicraft:bambooStick>, null, <tropicraft:bambooStick>], [<tropicraft:bambooStick>, null, <tropicraft:bambooStick>]]);

//Crafting Darts with Bamboo, feathers, and a knife
recipes.addShaped(<BiomesOPlenty:dart> * 3, [[<tropicraft:bambooStick>, null], [<tropicraft:bambooStick>, <cfm:ItemKnife>.anyDamage().transformDamage(6)], [<minecraft:feather>, null]]);

//Adding Berries to oredict
<ore:foodBerries>.add(<BiomesOPlenty:food:0>);

//Fruit Salad can be crafted with any Berry
recipes.remove(<BiomesOPlenty:food:4>);
recipes.addShapeless(<BiomesOPlenty:food:4>, [<minecraft:bowl>, <ore:foodBerries>, <minecraft:apple>, <minecraft:melon>]);

//Amber Recipe removed (added to Chisel category, can be chiseled from TC Amber)
recipes.remove(<BiomesOPlenty:gemOre:15>);

//Leaf Pile Crafting
recipes.addShaped(<BiomesOPlenty:foliage:14> * 3, [[<ore:treeLeaves>, <ore:treeLeaves>]]);
//dead Leaf Pile Drying
mods.tconstruct.Drying.addRecipe(<BiomesOPlenty:foliage:14>, <BiomesOPlenty:foliage:15>, 1000);

//Lilly Varieties Crafting
recipes.addShapeless(<BiomesOPlenty:lilyBop:1>, [<gendustry:MutagenBucket>, <ore:fertilizerRich>, <BiomesOPlenty:lilyBop:2>]);
recipes.addShapeless(<BiomesOPlenty:lilyBop:0>, [<gendustry:MutagenBucket>, <ore:fertilizerRich>, <BiomesOPlenty:lilyBop:1>]);
recipes.addShapeless(<minecraft:waterlily>, [<gendustry:MutagenBucket>, <ore:fertilizerRich>, <BiomesOPlenty:lilyBop:0>]);

recipes.addShapeless(<BiomesOPlenty:lilyBop:2>, [<gendustry:MutagenBucket>, <Botany:misc:7>, <BiomesOPlenty:lilyBop:1>]);
recipes.addShapeless(<BiomesOPlenty:lilyBop:1>, [<gendustry:MutagenBucket>, <Botany:misc:7>, <BiomesOPlenty:lilyBop>]);
recipes.addShapeless(<BiomesOPlenty:lilyBop>, [<gendustry:MutagenBucket>, <Botany:misc:7>, <minecraft:waterlily>]);
//Lilly production with photogenic insolator
mods.thermalexpansion.Insolator.addRecipe(7200, <ThermalExpansion:material:516>, <BiomesOPlenty:lilyBop:1>, <BiomesOPlenty:lilyBop:0> * 2);
mods.thermalexpansion.Insolator.addRecipe(9600, <ThermalExpansion:material:517>, <BiomesOPlenty:lilyBop:1>, <BiomesOPlenty:lilyBop:0> * 6);

mods.thermalexpansion.Insolator.addRecipe(7200, <ThermalExpansion:material:516>, <BiomesOPlenty:lilyBop:1>, <BiomesOPlenty:lilyBop:1> * 2);
mods.thermalexpansion.Insolator.addRecipe(9600, <ThermalExpansion:material:517>, <BiomesOPlenty:lilyBop:1>, <BiomesOPlenty:lilyBop:1> * 6);

mods.thermalexpansion.Insolator.addRecipe(7200, <ThermalExpansion:material:516>, <BiomesOPlenty:lilyBop:1>, <BiomesOPlenty:lilyBop:2> * 2);
mods.thermalexpansion.Insolator.addRecipe(9600, <ThermalExpansion:material:517>, <BiomesOPlenty:lilyBop:1>, <BiomesOPlenty:lilyBop:2> * 6);
13 changes: 13 additions & 0 deletions scripts/Binnie.zs
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
/* Binnie's Mods
Tweaks and Alterations */

//Adding Berries to oredict
<ore:foodBerries>.add(<ExtraTrees:food:34>);
<ore:foodBerries>.add(<ExtraTrees:food:43>);
<ore:foodBerries>.add(<ExtraTrees:food:44>);
<ore:foodBerries>.add(<ExtraTrees:food:45>);
<ore:foodBerries>.add(<ExtraTrees:food:46>);
<ore:foodBerries>.add(<ExtraTrees:food:48>);
<ore:foodBerries>.add(<ExtraTrees:food:49>);

//Soil recipies

recipes.addShapeless(<Botany:soil:3> * 4, [<Botany:soil:0>, <Botany:soil:0>, <Botany:soil:0>, <Botany:soil:0>, <BiomesOPlenty:misc:1>]);
Expand Down Expand Up @@ -31,6 +40,10 @@ recipes.addShapeless(<Botany:flowerbed:8> * 4, [<Botany:flowerbed:5>, <Botany:fl
recipes.removeShapeless(<Botany:misc>);
recipes.addShapeless(<Botany:misc> * 4, [<ore:dustAsh>]);

//Adding wood pulp powder
recipes.remove(<Botany:misc:1>);
recipes.addShapeless(<Botany:misc:1> * 4, [<ore:pulpWood>]);

/* Fences */

// Gate fix
Expand Down
81 changes: 80 additions & 1 deletion scripts/Chisel.zs
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,83 @@ mods.chisel.Groups.addVariation("granite", <Botania:stone:7>);
mods.chisel.Groups.addVariation("granite", <Botania:stone:11>);

// Uranium
mods.chisel.Groups.addVariation("uraniumblock", <BigReactors:BRMetalBlock>);
mods.chisel.Groups.addVariation("uraniumblock", <BigReactors:BRMetalBlock>);

//Ice Stairs
mods.chisel.Groups.addVariation("ice_stairs", <Railcraft:stair:4>);
mods.chisel.Groups.addVariation("ice_stairs", <witchery:icestairs>);

//Ruby Blocks
mods.chisel.Groups.addGroup("ruby_block");
mods.chisel.Groups.addVariation("ruby_block", <BiomesOPlenty:gemOre:3>);
mods.chisel.Groups.addVariation("ruby_block", <bluepower:ruby_block>);

//Sapphire Blocks
mods.chisel.Groups.addGroup("sapphire_block");
mods.chisel.Groups.addVariation("sapphire_block", <BiomesOPlenty:gemOre:13>);
mods.chisel.Groups.addVariation("sapphire_block", <bluepower:sapphire_block>);

//Amber
mods.chisel.Groups.addVariation("amber", <BiomesOPlenty:gemOre:15>);

//TinCo
//Seared Stone
mods.chisel.Groups.addGroup("seared_stone");
mods.chisel.Groups.addVariation("seared_stone", <TConstruct:Smeltery:2>);
mods.chisel.Groups.addVariation("seared_stone", <TConstruct:Smeltery:4>);
mods.chisel.Groups.addVariation("seared_stone", <TConstruct:Smeltery:5>);
mods.chisel.Groups.addVariation("seared_stone", <TConstruct:Smeltery:6>);
mods.chisel.Groups.addVariation("seared_stone", <TConstruct:Smeltery:7>);
mods.chisel.Groups.addVariation("seared_stone", <TConstruct:Smeltery:8>);
mods.chisel.Groups.addVariation("seared_stone", <TConstruct:Smeltery:9>);
mods.chisel.Groups.addVariation("seared_stone", <TConstruct:Smeltery:10>);
mods.chisel.Groups.addVariation("seared_stone", <TConstruct:Smeltery:11>);

//Seared Slab
mods.chisel.Groups.addGroup("seared_slab");
mods.chisel.Groups.addVariation("seared_slab", <TConstruct:SearedSlab:0>);
mods.chisel.Groups.addVariation("seared_slab", <TConstruct:SearedSlab:1>);
mods.chisel.Groups.addVariation("seared_slab", <TConstruct:SearedSlab:2>);
mods.chisel.Groups.addVariation("seared_slab", <TConstruct:SearedSlab:3>);
mods.chisel.Groups.addVariation("seared_slab", <TConstruct:SearedSlab:4>);
mods.chisel.Groups.addVariation("seared_slab", <TConstruct:SearedSlab:5>);
mods.chisel.Groups.addVariation("seared_slab", <TConstruct:SearedSlab:6>);
mods.chisel.Groups.addVariation("seared_slab", <TConstruct:SearedSlab:7>);

//Nether Seared Stone
mods.chisel.Groups.addGroup("nether_seared_stone");
mods.chisel.Groups.addVariation("nether_seared_stone", <TConstruct:SmelteryNether:2>);
mods.chisel.Groups.addVariation("nether_seared_stone", <TConstruct:SmelteryNether:4>);
mods.chisel.Groups.addVariation("nether_seared_stone", <TConstruct:SmelteryNether:5>);
mods.chisel.Groups.addVariation("nether_seared_stone", <TConstruct:SmelteryNether:6>);
mods.chisel.Groups.addVariation("nether_seared_stone", <TConstruct:SmelteryNether:7>);
mods.chisel.Groups.addVariation("nether_seared_stone", <TConstruct:SmelteryNether:8>);
mods.chisel.Groups.addVariation("nether_seared_stone", <TConstruct:SmelteryNether:9>);
mods.chisel.Groups.addVariation("nether_seared_stone", <TConstruct:SmelteryNether:10>);
mods.chisel.Groups.addVariation("nether_seared_stone", <TConstruct:SmelteryNether:11>);

//Rough Brownstone
mods.chisel.Groups.addGroup("rough_brownstone");
mods.chisel.Groups.addVariation("rough_brownstone", <TConstruct:SpeedBlock:0>);
mods.chisel.Groups.addVariation("rough_brownstone", <TConstruct:SpeedBlock:1>);

//Rough Brownstone Slab
mods.chisel.Groups.addGroup("rough_brownstone_slab");
mods.chisel.Groups.addVariation("rough_brownstone_slab", <TConstruct:SpeedSlab:0>);
mods.chisel.Groups.addVariation("rough_brownstone_slab", <TConstruct:SpeedSlab:1>);

//Brownstone
mods.chisel.Groups.addGroup("brownstone");
mods.chisel.Groups.addVariation("brownstone", <TConstruct:SpeedBlock:2>);
mods.chisel.Groups.addVariation("brownstone", <TConstruct:SpeedBlock:3>);
mods.chisel.Groups.addVariation("brownstone", <TConstruct:SpeedBlock:4>);
mods.chisel.Groups.addVariation("brownstone", <TConstruct:SpeedBlock:5>);
mods.chisel.Groups.addVariation("brownstone", <TConstruct:SpeedBlock:6>);

//Brownstone Slab
mods.chisel.Groups.addGroup("brownstone_slab");
mods.chisel.Groups.addVariation("brownstone_slab", <TConstruct:SpeedSlab:2>);
mods.chisel.Groups.addVariation("brownstone_slab", <TConstruct:SpeedSlab:3>);
mods.chisel.Groups.addVariation("brownstone_slab", <TConstruct:SpeedSlab:4>);
mods.chisel.Groups.addVariation("brownstone_slab", <TConstruct:SpeedSlab:5>);
mods.chisel.Groups.addVariation("brownstone_slab", <TConstruct:SpeedSlab:6>);
2 changes: 2 additions & 0 deletions scripts/Compat.zs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<ore:silicon>.mirror(<ore:itemSilicon>);

// Endermen head exchange
recipes.addShapeless(<EnderIO:blockEndermanSkull>, [<IguanaTweaksTConstruct:skullItem>.noReturn()]);
recipes.addShapeless(<IguanaTweaksTConstruct:skullItem>, [<HardcoreEnderExpansion:enderman_head>]);
recipes.addShapeless(<HardcoreEnderExpansion:enderman_head>, [<EnderIO:blockEndermanSkull>]);

/* Compacting fixes */
Expand Down
62 changes: 62 additions & 0 deletions scripts/GalaxySpace.zs
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/*Galaxy Space
Tweaks and Alterations*/

//Cobalt and Cobaltum Unification
<ore:ingotCobaltum>.addAll(<ore:ingotCobalt>);
<ore:oreCobaltum>.addAll(<ore:oreCobalt>);
<ore:blockCobaltum>.addAll(<ore:blockCobalt>);

<ore:ingotCobalt>.mirror(<ore:ingotCobaltum>);
<ore:oreCobalt>.mirror(<ore:oreCobaltum>);
<ore:blockCobalt>.mirror(<ore:blockCobaltum>);
//Cobaltum ore processing
mods.mekanism.Enrichment.addRecipe(<GalaxySpace:phoboscobaltumore>, <TConstruct:materials:39> * 2);
mods.mekanism.Purification.addRecipe(<GalaxySpace:phoboscobaltumore>, <gas:oxygen>, <aobd:clumpCobalt> * 3);
mods.mekanism.chemical.Injection.addRecipe(<GalaxySpace:phoboscobaltumore>, <gas:hydrogenchloride>, <aobd:shardCobalt> * 4);
mods.mekanism.chemical.Dissolution.addRecipe(<GalaxySpace:phoboscobaltumore>, <gas:Cobalt>);

mods.tconstruct.Smeltery.addMelting(<GalaxySpace:phoboscobaltumore>, <liquid:cobalt.molten> * 288, 650, <GalaxySpace:phoboscobaltumore>);
mods.tconstruct.Smeltery.addMelting(<GalaxySpace:item.CobaltumIngot>, <liquid:cobalt.molten> * 144, 600, <TConstruct:MetalBlock>);

mods.thaumcraft.Crucible.addRecipe("PUREORE", <aobd:clusterCobalt>, <GalaxySpace:phoboscobaltumore>, "metallum 1, ordo 1");

mods.railcraft.RockCrusher.addRecipe(<GalaxySpace:phoboscobaltumore>, false, false, [<aobd:crushedCobalt> * 2], [1]);

//Tungsten and Wolframium Unification
<ore:ingotWolframium>.addAll(<ore:ingotTungsten>);
<ore:oreWolframium>.addAll(<ore:oreTungsten>);
<ore:blockWolframium>.addAll(<ore:blockTungsten>);

<ore:ingotTungsten>.mirror(<ore:ingotWolframium>);
<ore:oreTungsten>.mirror(<ore:oreWolframium>);
<ore:blockTungsten>.mirror(<ore:blockWolframium>);
//Wolframium ore processing
mods.mekanism.Enrichment.addRecipe(<GalaxySpace:proteuswolframiumore>, <aobd:dustTungsten> * 2);
mods.mekanism.Purification.addRecipe(<GalaxySpace:proteuswolframiumore>, <gas:oxygen>, <aobd:clumpTungsten> * 3);
mods.mekanism.chemical.Injection.addRecipe(<GalaxySpace:proteuswolframiumore>, <gas:hydrogenchloride>, <aobd:shardTungsten> * 4);
mods.mekanism.chemical.Dissolution.addRecipe(<GalaxySpace:proteuswolframiumore>, <gas:Tungsten>);

mods.tconstruct.Smeltery.addMelting(<GalaxySpace:proteuswolframiumore>, <liquid:tungsten> * 288, 1200, <GalaxySpace:proteuswolframiumore>);
mods.tconstruct.Smeltery.addMelting(<GalaxySpace:item.WolframiumIngot>, <liquid:tungsten> * 144, 1200, <bluepower:tungsten_block>);

mods.thaumcraft.Crucible.addRecipe("PUREORE", <aobd:clusterTungsten>, <GalaxySpace:proteuswolframiumore>, "metallum 1, ordo 1");

mods.railcraft.RockCrusher.addRecipe(<GalaxySpace:proteuswolframiumore>, false, false, [<aobd:crushedTungsten> * 2], [1]);

//Lead Armor Crafting (Using wrought iron as a cheap early game material)
recipes.remove(<GalaxySpace:item.lead_leg>);
recipes.remove(<GalaxySpace:item.lead_boots>);
recipes.remove(<GalaxySpace:item.lead_plate>);
recipes.remove(<GalaxySpace:item.lead_helmet>);

recipes.addShaped(<GalaxySpace:item.lead_boots>, [[<ore:ingotWroughtIron>, null, <ore:ingotWroughtIron>], [<ore:ingotLead>, null, <ore:ingotLead>]]);
recipes.addShaped(<GalaxySpace:item.lead_leg>, [[<ore:ingotWroughtIron>, <ore:ingotLead>, <ore:ingotWroughtIron>], [<ore:ingotLead>, null, <ore:ingotLead>], [<ore:ingotLead>, null, <ore:ingotLead>]]);
recipes.addShaped(<GalaxySpace:item.lead_plate>, [[<ore:ingotWroughtIron>, null, <ore:ingotWroughtIron>], [<ore:ingotLead>, <ore:ingotLead>, <ore:ingotLead>], [<ore:ingotLead>, <ore:ingotLead>, <ore:ingotLead>]]);
recipes.addShaped(<GalaxySpace:item.lead_helmet>, [[<ore:ingotLead>, <ore:ingotLead>, <ore:ingotLead>], [<ore:ingotWroughtIron>, null, <ore:ingotWroughtIron>]]);

//Schematics Recipes
recipes.addShaped(<GalaxySpace:item.SchematicTier8>, [[<GalaxySpace:item.HeavyDutyPlate7>, <GalaxySpace:item.HeavyDutyPlate8>, <GalaxySpace:item.HeavyDutyPlate7>], [<GalaxySpace:item.HeavyDutyPlate7>, <GalaxySpace:item.HeavyDutyPlate8>, <GalaxySpace:item.HeavyDutyPlate7>], [<GalaxySpace:item.HeavyDutyPlate8>, <GalaxySpace:item.HeavyDutyPlate6>, <GalaxySpace:item.HeavyDutyPlate8>]]);
recipes.addShaped(<GalaxySpace:item.SchematicTier7>, [[<GalaxySpace:item.HeavyDutyPlate6>, <GalaxySpace:item.HeavyDutyPlate7>, <GalaxySpace:item.HeavyDutyPlate6>], [<GalaxySpace:item.HeavyDutyPlate6>, <GalaxySpace:item.HeavyDutyPlate7>, <GalaxySpace:item.HeavyDutyPlate6>], [<GalaxySpace:item.HeavyDutyPlate7>, <GalaxySpace:item.HeavyDutyPlate5>, <GalaxySpace:item.HeavyDutyPlate7>]]);
recipes.addShaped(<GalaxySpace:item.SchematicTier6>, [[<GalaxySpace:item.HeavyDutyPlate5>, <GalaxySpace:item.HeavyDutyPlate6>, <GalaxySpace:item.HeavyDutyPlate5>], [<GalaxySpace:item.HeavyDutyPlate5>, <GalaxySpace:item.HeavyDutyPlate6>, <GalaxySpace:item.HeavyDutyPlate5>], [<GalaxySpace:item.HeavyDutyPlate6>, <GalaxySpace:item.HeavyDutyPlate4>, <GalaxySpace:item.HeavyDutyPlate6>]]);
recipes.addShaped(<GalaxySpace:item.SchematicTier5>, [[<GalaxySpace:item.HeavyDutyPlate4>, <GalaxySpace:item.HeavyDutyPlate5>, <GalaxySpace:item.HeavyDutyPlate4>], [<GalaxySpace:item.HeavyDutyPlate4>, <GalaxySpace:item.HeavyDutyPlate5>, <GalaxySpace:item.HeavyDutyPlate4>], [<GalaxySpace:item.HeavyDutyPlate5>, <GalaxySpace:item.HeavyDutyPlate4>, <GalaxySpace:item.HeavyDutyPlate5>]]);
recipes.addShaped(<GalaxySpace:item.SchematicTier4>, [[<GalacticraftMars:item.itemBasicAsteroids>, <GalaxySpace:item.HeavyDutyPlate4>, <GalacticraftMars:item.itemBasicAsteroids>], [<GalacticraftMars:item.itemBasicAsteroids>, <GalaxySpace:item.HeavyDutyPlate4>, <GalacticraftMars:item.itemBasicAsteroids>], [<GalaxySpace:item.HeavyDutyPlate4>, <GalacticraftMars:item.itemBasicAsteroids>, <GalaxySpace:item.HeavyDutyPlate4>]]);
4 changes: 4 additions & 0 deletions scripts/Tconstruct.zs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ recipes.addShaped(<TConstruct:knapsack>, [[<minecraft:leather>, <minecraft:leath
recipes.remove(<minecraft:light_weighted_pressure_plate>);
recipes.addShaped(<minecraft:light_weighted_pressure_plate>, [[<ore:ingotGold>, <ore:ingotGold>, null], [null, null, null], [null, null, null]]);

//Adv. Drawbridge crafting with oredict
recipes.removeShapeless(<TMechworks:RedstoneMachine:3>);
recipes.addShapeless(<TMechworks:RedstoneMachine:3>, [<ore:ingotCobalt>, <ore:ingotCobalt>, <ore:ingotCobalt>, <ore:ingotArdite>, <ore:ingotArdite>, <ore:ingotArdite>, <ore:blockRedstone>, <TMechworks:RedstoneMachine>]);

// Smeltery removals
mods.tconstruct.Smeltery.removeMelting(<minecraft:minecart>);

Expand Down
4 changes: 4 additions & 0 deletions scripts/Thaumcraft.zs
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,7 @@ game.setLocalization("en_US", "botania.page.tcIntegration8", "&o99 problems but

/* Vanilla */
recipes.addShapeless(<Thaumcraft:ItemResource:9>, [<minecraft:book>, <Thaumcraft:ItemShard:*>, <Thaumcraft:ItemShard:*>]);

//Amber Oredict Crafting
recipes.remove(<Thaumcraft:blockCosmeticOpaque:0>);
recipes.addShaped(<Thaumcraft:blockCosmeticOpaque:0>, [[<ore:gemAmber>, <ore:gemAmber>], [<ore:gemAmber>, <ore:gemAmber>]]);
Loading

0 comments on commit 07b3158

Please sign in to comment.