Merge remote-tracking branch 'origin/master-1.18' into master-1.19-lts

resources/changelog/1.18.2-1.1.3.txt

@@ -0,0 +1,7 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.13.4 or higher.
+
+Changes:
+* Clarify manual recipe creation for Auto-Planking advancement
+  Closes CyclopsMC/IntegratedDynamics#1290
+

src/main/resources/assets/integratedcrafting/lang/en_us.json

@@ -17,7 +17,7 @@
   "advancement.integratedcrafting.craft_crafting_interface": "Crafting² Interface",
   "advancement.integratedcrafting.craft_crafting_interface.desc": "Craft a Crafting Interface",
   "advancement.integratedcrafting.insert_recipe_planks": "Auto-Planking",
-  "advancement.integratedcrafting.insert_recipe_planks.desc": "Insert the recipe for Oak Planks into a Crafting Interface",
+  "advancement.integratedcrafting.insert_recipe_planks.desc": "Insert the manually-created recipe for Oak Planks into a Crafting Interface",
   "advancement.integratedcrafting.craft_crafting_writer": "Crafting² Writer",
   "advancement.integratedcrafting.craft_crafting_writer.desc": "Craft a Crafting Writer",
   "advancement.integratedcrafting.craft_planks": "Effective Auto-Planking",
@@ -129,7 +129,7 @@
   "info_book.integratedcrafting.tutorials.autocrafting_setup": "Setup Autocrafting",
   "info_book.integratedcrafting.tutorials.autocrafting_setup.text1": "In this first &lIntegrated Crafting&r tutorial, we are going to cover the basic setup of autocrafting.",
   "info_book.integratedcrafting.tutorials.autocrafting_setup.text2": "The first requirement for autocrafting is the &lCrafting Interface&r, which is a network part that must be faced to a machine, such as a Crafting Table or Furnace. First, craft such a &lCrafting Interface&r, and make it face a &lCrafting Table&r.",
-  "info_book.integratedcrafting.tutorials.autocrafting_setup.text3": "Next, we are going to tell the &lCrafting Interface&r how it can craft Oak Planks. Do this by opening up your &lLogic Programmer&r, and write a &lVariable Card&r that contains a &lRecipe&r with as input an Oak Log, and as output 4 Oak Planks &o(do not change the default item match settings)&r.",
+  "info_book.integratedcrafting.tutorials.autocrafting_setup.text3": "Next, we are going to tell the &lCrafting Interface&r how it can craft Oak Planks. Do this by opening up your &lLogic Programmer&r, and write a &lVariable Card&r that contains a &lRecipe&r with as input an Oak Log, and as output 4 Oak Planks &o(do not change the default item match settings)&r. &lThis recipe MUST be created manually, and not auto-filled using mods such as JEI.&r",
   "info_book.integratedcrafting.tutorials.autocrafting_setup.text4": "Finally, let's insert your newly created recipe into your &lCrafting Interface&r to finish this first tutorial. If a &2green checkmark&0 is shown, this means that your recipe is valid, and that the recipe is now available to the network for autocrafting.",
 
   "info_book.integratedcrafting.tutorials.autocrafting_trigger": "Trigger Autocrafting",