Merge remote-tracking branch 'origin/1.21.1/6.0.0-dev' into 1.21.1/6.0.0-dev

Author: RaymondBlaze

CHANGELOG.md

@@ -1,9 +1,10 @@
-### Create: Enchantment Industry 2.0.2
+### Create: Enchantment Industry 2.0.4
+
+Requires Create: Dragons Plus 1.3.1, which contains an important bugfix
 
 #### Update
-* `es_es` translation by @carlosdi0
-* `ja_jp` translation by @yukkuriofuton
+* Improve ponder to explain Super Enchanting Material more clearly
 
 #### Fix
-* Fix Super Enchanting/Forging's lightning only checks for vanilla lightning rod.
-  Now uses the `c:lightning_rods` Poi & Block tag, supports Friends & Foes lightning rods by default.
+* Fix Spouting liquid experience onto mending tools duplicates the tool
+* Fix Mechanical Grindstone does not drop processing item when be destoryed

gradle.properties

@@ -17,7 +17,7 @@ mod_id = create_enchantment_industry
 mod_artifact_id = create-enchantment-industry
 mod_name = Create: Enchantment Industry
 mod_license = LGPL-3.0-or-later
-mod_version = 2.0.2
+mod_version = 2.0.4
 mod_group_id = plus.dragons.createenchantmentindustry
 mod_authors = DragonsPlus
 mod_description = Automatic Enchanting with Create.
@@ -31,8 +31,8 @@ ponder_version = 1.0.45
 create_version = 6.0.4-50
 create_version_production = 6.0.4
 create_version_range = [6.0.4,)
-create_dragons_plus_version = 1.3.0
-create_dragons_plus_version_range = [1.3,)
+create_dragons_plus_version = 1.3.1
+create_dragons_plus_version_range = [1.3.1,)
 jei_minecraft_version = 1.21.1
 jei_version = 19.21.0.247
 curios_minecraft_version = 1.21.1

src/generated/resources/assets/create_enchantment_industry/lang/en_ud.json

@@ -114,7 +114,7 @@
   "create_enchantment_industry.ponder.experience.advance.header": "ʍouʞ oʇ ʇuɐʍ ʇɥbıɯ noʎ sbuıɥ⟘",
   "create_enchantment_industry.ponder.experience.advance.text_1": "sʇuǝɯʇuɐɥɔuǝ uo buıʞɹoʍ ʇɹɐʇs oʇ ʎpɐǝɹ ǝɹ,noʎ ǝɹoɟǝq sbuıɥʇ ǝɹoɯ ʍǝɟ ɐ ʍouʞ oʇ pǝǝu noʎ",
   "create_enchantment_industry.ponder.experience.advance.text_2": "ɹǝʇɐן ʇı pǝǝu ןן,noʎ ˙ʞɔoןq ǝbɐɹoʇs puɐ ǝʌıʇɐɹoɔǝp ʎןǝɹnd ɹǝbuoן ou sı ǝɔuǝıɹǝdxƎ ɟo ʞɔoןᗺ",
-  "create_enchantment_industry.ponder.experience.advance.text_3": "buıʇuɐɥɔuƎ ɹǝdnS ɹoɟ ʇı pǝǝu ןן,noʎ ˙ǝɔuǝıɹǝdxƎ ɹǝdnS ɟo ʞɔoןᗺ sı sıɥ⟘",
+  "create_enchantment_industry.ponder.experience.advance.text_3": "ǝʇɐןdɯǝ⟘ buıʇuɐɥɔuƎ ɹǝdnS buıʞɐɯ ɹoɟ ʇı pǝǝu ןן,noʎ ˙ǝɔuǝıɹǝdxƎ ɹǝdnS ɟo ʞɔoןᗺ sı sıɥ⟘",
   "create_enchantment_industry.ponder.experience.advance.text_4": "ɹǝʇuɐɥɔuƎ ǝzɐןᗺ",
   "create_enchantment_industry.ponder.experience.advance.text_5": "ɹǝbɹoℲ ǝzɐןᗺ",
   "create_enchantment_industry.ponder.experience.advance.text_6": "¡ʇıɯıן ǝɥʇ ʞɐǝɹq oʇ noʎ sʍoןןɐ buıʇuɐɥɔuƎ ɹǝdnS",
@@ -131,9 +131,9 @@
   "create_enchantment_industry.ponder.experience.intro.text_8": "ǝɹnʇɐǝɹɔ ɐ sןןıʞ ʇı uǝɥʍ ʇǝbbnu ǝɔuǝıɹǝdxǝ ɟo ʇunoɯɐ ןןɐɯs ʎɹǝʌ ɐ buıddoɹp ɟo ǝɔuɐɥɔ ɐ sɐɥ ʇI :ɯsıuɐɥɔǝɯ ʍǝu ɐ sɐɥ ʍou ןǝǝɥM buıɥsnɹƆ",
   "create_enchantment_industry.ponder.experience.intro.text_9": "pǝddoɹp ǝɹɐ sʇǝbbnu ǝɔuǝıɹǝdxǝ 'ɹǝʎoןdǝp ʎq pǝןןıʞ sı qoɯ uǝɥM :ɯsıuɐɥɔǝɯ ʍǝu ɐ sɐɥ osןɐ ɹǝʎoןdǝᗡ",
   "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.header": "ʇuɐɥɔuƎ ɹǝdnS ɹoɟ sןɐıɹǝʇɐɯ ǝɹɐdǝɹԀ",
-  "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.text_1": "ǝɔuǝıɹǝdxƎ ɟo ʞɔoןᗺ ɟo ǝsn ǝɥʇ sǝɹınbǝɹ sıɥ⟘ ˙ǝʇɐןdɯǝ⟘ buıʇuɐɥɔuƎ ɹǝdnS ǝɥʇ ǝʞɐɯ oʇ pǝsn ǝq ןןıʍ ɥɔıɥʍ 'ǝɔuǝıɹǝdxƎ ɹǝdnS ɟo ʞɔoןᗺ ǝʞɐɯ oʇ pǝǝu noʎ 'ʇsɹıℲ",
+  "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.text_1": "ǝɔuǝıɹǝdxƎ ɟo ʞɔoןᗺ ɟo ǝsn ǝɥʇ sǝɹınbǝɹ sıɥ⟘ ˙ǝʇɐןdɯǝ⟘ buıʇuɐɥɔuƎ ɹǝdnS ǝɥʇ ǝʞɐɯ oʇ pǝsn ǝq ןןıʍ ɥɔıɥʍ 'ǝɔuǝıɹǝdxƎ ɹǝdnS ɟo ʞɔoןᗺ sı ןɐıɹǝʇɐɯ ʇsɹıℲ",
   "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.text_2": "¡ǝʞıɹʇS buıʇɥbıꞀ",
-  "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.text_3": "sıɥʇ buıʇɐǝ ǝʌoן ןןıʍ ǝzɐןᗺ ˙buıʇuɐɥɔuƎ ,o ǝʞɐƆ ǝʞɐɯ oʇ pǝǝu noʎ 'puoɔǝS",
+  "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.text_3": "sıɥʇ buıʇɐǝ ǝʌoן ןןıʍ ǝzɐןᗺ ˙ǝpoɯ buıɥʇǝǝs ǝzɐןq ʇɹoddns oʇ \"ǝɔuǝıɹǝdxƎ ɹǝdnS\" sɐ sʞɹoʍ ʇI ˙buıʇuɐɥɔuƎ ,o ǝʞɐƆ sı ןɐıɹǝʇɐɯ puoɔǝS",
   "create_enchantment_industry.ponder.experience_hatch.intro.header": "ɥɔʇɐH ǝɔuǝıɹǝdxƎ oʇ uoıʇɔnpoɹʇuI",
   "create_enchantment_industry.ponder.experience_hatch.intro.text_1": "˙˙˙ǝɔuǝıɹǝdxƎ ǝɹoʇs oʇ ɥɔʇɐH ʞɔıןɔ ʇɥbıᴚ ˙ǝsn oʇ ǝןdɯıs ʎɹǝʌ sı ʇI",
   "create_enchantment_industry.ponder.experience_hatch.intro.text_2": "ǝɔuǝıɹǝdxƎ pǝɹoʇs ʇɔɐɹʇxǝ oʇ ɥɔʇɐH ʞɔıןƆ-ʇɥbıᴚ-ʇɟıɥS˙˙˙",
@@ -154,7 +154,7 @@
   "create_enchantment_industry.ponder.printer.intro.text_1": "ɹǝʇuıɹԀ ɐ sı sıɥ⟘",
   "create_enchantment_industry.ponder.printer.intro.text_2": "˙˙˙ʇoןs ɹǝʇןıɟ ǝɥʇ ɐıʌ ʇuıɹd oʇ ʇuɐʍ noʎ ʇɐɥʍ ʇǝs oʇ pǝǝu noʎ 'ǝsn oʇ ʇı ʇnd uɐɔ noʎ ǝɹoɟǝᗺ",
   "create_enchantment_industry.ponder.printer.intro.text_3": "pınןɟ buıpuodsǝɹɹoɔ ǝɥʇ uı ssɐd puɐ˙˙˙",
-  "create_enchantment_industry.ponder.printer.intro.text_4": "¡ƎԀIƆƎᴚ ⅁NI⟘NIᴚԀ ʞƆƎHƆ O⟘ ⟘Ǝ⅁ᴚOℲ ⟘ON Oᗡ",
+  "create_enchantment_industry.ponder.printer.intro.text_4": "sǝdıɔǝɹ buıʇuıɹd ןןɐ ʞɔǝɥɔ oʇ poɯ ʞooq ǝdıɔǝɹ ɹǝɥʇouɐ ɹo IƎſ ǝsn sʎɐʍןɐ uɐɔ noʎ",
   "create_enchantment_industry.ponder.tag.experience_appliances": "pǝʇɐןǝᴚ ǝɔuǝıɹǝdxƎ",
   "create_enchantment_industry.ponder.tag.experience_appliances.description": "ǝɔuǝıɹǝdxƎ buıʎןddɐ puɐ buıssǝɔoɹd uǝɥʍ pǝsn ǝq ןןıʍ ɥɔıɥʍ sʇuǝuodɯoƆ",
   "create_enchantment_industry.ponder.tag.super_experience_related": "pǝʇɐןǝᴚ ǝɔuǝıɹǝdxƎ ɹǝdnS",

src/generated/resources/assets/create_enchantment_industry/lang/en_us.json

@@ -114,7 +114,7 @@
   "create_enchantment_industry.ponder.experience.advance.header": "Things you might want to know",
   "create_enchantment_industry.ponder.experience.advance.text_1": "You need to know a few more things before you're ready to start working on enchantments",
   "create_enchantment_industry.ponder.experience.advance.text_2": "Block of Experience is no longer purely decorative and storage block. You'll need it later",
-  "create_enchantment_industry.ponder.experience.advance.text_3": "This is Block of Super Experience. You'll need it for Super Enchanting",
+  "create_enchantment_industry.ponder.experience.advance.text_3": "This is Block of Super Experience. You'll need it for making Super Enchanting Template",
   "create_enchantment_industry.ponder.experience.advance.text_4": "Blaze Enchanter",
   "create_enchantment_industry.ponder.experience.advance.text_5": "Blaze Forger",
   "create_enchantment_industry.ponder.experience.advance.text_6": "Super Enchanting allows you to break the limit!",
@@ -131,9 +131,9 @@
   "create_enchantment_industry.ponder.experience.intro.text_8": "Crushing Wheel now has a new mechanism: It has a chance of dropping a very small amount of experience nugget when it kills a creature",
   "create_enchantment_industry.ponder.experience.intro.text_9": "Deployer also has a new mechanism: When mob is killed by deployer, experience nuggets are dropped",
   "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.header": "Prepare materials for Super Enchant",
-  "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.text_1": "First, you need to make Block of Super Experience, which will be used to make the Super Enchanting Template. This requires the use of Block of Experience",
+  "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.text_1": "First material is Block of Super Experience, which will be used to make the Super Enchanting Template. This requires the use of Block of Experience",
   "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.text_2": "Lighting Strike!",
-  "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.text_3": "Second, you need to make Cake o' Enchanting. Blaze will love eating this",
+  "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.text_3": "Second material is Cake o' Enchanting. It works as \"Super Experience\" to support blaze seething mode. Blaze will love eating this",
   "create_enchantment_industry.ponder.experience_hatch.intro.header": "Introduction to Experience Hatch",
   "create_enchantment_industry.ponder.experience_hatch.intro.text_1": "It is very simple to use. Right click Hatch to store Experience...",
   "create_enchantment_industry.ponder.experience_hatch.intro.text_2": "...Shift-Right-Click Hatch to extract stored Experience",
@@ -154,7 +154,7 @@
   "create_enchantment_industry.ponder.printer.intro.text_1": "This is a Printer",
   "create_enchantment_industry.ponder.printer.intro.text_2": "Before you can put it to use, you need to set what you want to print via the filter slot...",
   "create_enchantment_industry.ponder.printer.intro.text_3": "...and pass in the corresponding fluid",
-  "create_enchantment_industry.ponder.printer.intro.text_4": "DO NOT FORGET TO CHECK PRINTING RECIPE!",
+  "create_enchantment_industry.ponder.printer.intro.text_4": "You can always use JEI or another recipe book mod to check all printing recipes",
   "create_enchantment_industry.ponder.tag.experience_appliances": "Experience Related",
   "create_enchantment_industry.ponder.tag.experience_appliances.description": "Components which will be used when processing and applying Experience",
   "create_enchantment_industry.ponder.tag.super_experience_related": "Super Experience Related",

src/generated/resources/assets/create_enchantment_industry/lang/es_es.json

@@ -1,4 +1,5 @@
 {
+  "_comment.unlocalized": "Remove this line after finishing localization.",
   "advancement.create_enchantment_industry.a_shower_experience": "Baño de Experiencia",
   "advancement.create_enchantment_industry.a_shower_experience.desc": "Rompe una Tubería de Fluido y date un baño de experiencia\n§7(Logro Oculto)",
   "advancement.create_enchantment_industry.blaze_enchantery": "Encantador de Blaze",
@@ -114,7 +115,7 @@
   "create_enchantment_industry.ponder.experience.advance.header": "Cosas que te conviene saber",
   "create_enchantment_industry.ponder.experience.advance.text_1": "Hay algunas cosas que debes saber antes de empezar a trabajar con encantamientos",
   "create_enchantment_industry.ponder.experience.advance.text_2": "El Bloque de Experiencia ya no es solo un adorno o un almacén. Lo necesitarás más adelante.",
-  "create_enchantment_industry.ponder.experience.advance.text_3": "Este es el Bloque de Superexperiencia. Lo necesitarás para el Súper Encantamiento",
+  "create_enchantment_industry.ponder.experience.advance.text_3": "This is Block of Super Experience. You'll need it for making Super Enchanting Template",
   "create_enchantment_industry.ponder.experience.advance.text_4": "Encantador de Blaze",
   "create_enchantment_industry.ponder.experience.advance.text_5": "Forjador de Blaze",
   "create_enchantment_industry.ponder.experience.advance.text_6": "¡El Súper Encantamiento te permite romper todas las reglas!",
@@ -131,9 +132,9 @@
   "create_enchantment_industry.ponder.experience.intro.text_8": "La Rueda de Trituración ahora tiene una función adicional: puede soltar una pequeña cantidad de pepitas de experiencia al matar criaturas",
   "create_enchantment_industry.ponder.experience.intro.text_9": "El desplegador también tiene una función adicional: suelta pepitas de experiencia al matar enemigos",
   "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.header": "Preparativos para el Súper Encantamiento",
-  "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.text_1": "Primero, necesitas un Bloque de Superexperiencia para crear la Súper Plantilla de Encantamiento. Para ello, necesitarás un Bloque de Experiencia",
+  "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.text_1": "First material is Block of Super Experience, which will be used to make the Super Enchanting Template. This requires the use of Block of Experience",
   "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.text_2": "¡Que caiga un Rayo!",
-  "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.text_3": "Segundo, necesitas Pastel de Encantamiento. A los Blaze les encanta este manjar",
+  "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.text_3": "Second material is Cake o' Enchanting. It works as \"Super Experience\" to support blaze seething mode. Blaze will love eating this",
   "create_enchantment_industry.ponder.experience_hatch.intro.header": "Descubre la Madriguera de Experiencia",
   "create_enchantment_industry.ponder.experience_hatch.intro.text_1": "Es muy fácil de usar. Haz clic derecho en la Madriguera para almacenar Experiencia...",
   "create_enchantment_industry.ponder.experience_hatch.intro.text_2": "...Mantén Shift y haz clic derecho para extraer la Experiencia almacenada",
@@ -154,7 +155,7 @@
   "create_enchantment_industry.ponder.printer.intro.text_1": "Esta es una Impresora",
   "create_enchantment_industry.ponder.printer.intro.text_2": "Antes de usarla, define qué quieres imprimir en la ranura de filtro...",
   "create_enchantment_industry.ponder.printer.intro.text_3": "...y suministra el fluido necesario",
-  "create_enchantment_industry.ponder.printer.intro.text_4": "¡NO OLVIDES CONSULTAR LA RECETA DE IMPRESIÓN!",
+  "create_enchantment_industry.ponder.printer.intro.text_4": "You can always use JEI or another recipe book mod to check all printing recipes",
   "create_enchantment_industry.ponder.tag.experience_appliances": "Herramientas de Experiencia",
   "create_enchantment_industry.ponder.tag.experience_appliances.description": "Componentes usados para procesar y aplicar Experiencia",
   "create_enchantment_industry.ponder.tag.super_experience_related": "Relacionado con la Súper Experiencia",

src/generated/resources/assets/create_enchantment_industry/lang/es_mx.json

@@ -115,7 +115,7 @@
   "create_enchantment_industry.ponder.experience.advance.header": "Things you might want to know",
   "create_enchantment_industry.ponder.experience.advance.text_1": "You need to know a few more things before you're ready to start working on enchantments",
   "create_enchantment_industry.ponder.experience.advance.text_2": "Block of Experience is no longer purely decorative and storage block. You'll need it later",
-  "create_enchantment_industry.ponder.experience.advance.text_3": "This is Block of Super Experience. You'll need it for Super Enchanting",
+  "create_enchantment_industry.ponder.experience.advance.text_3": "This is Block of Super Experience. You'll need it for making Super Enchanting Template",
   "create_enchantment_industry.ponder.experience.advance.text_4": "Blaze Enchanter",
   "create_enchantment_industry.ponder.experience.advance.text_5": "Blaze Forger",
   "create_enchantment_industry.ponder.experience.advance.text_6": "Super Enchanting allows you to break the limit!",
@@ -132,9 +132,9 @@
   "create_enchantment_industry.ponder.experience.intro.text_8": "Crushing Wheel now has a new mechanism: It has a chance of dropping a very small amount of experience nugget when it kills a creature",
   "create_enchantment_industry.ponder.experience.intro.text_9": "Deployer also has a new mechanism: When mob is killed by deployer, experience nuggets are dropped",
   "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.header": "Prepare materials for Super Enchant",
-  "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.text_1": "First, you need to make Block of Super Experience, which will be used to make the Super Enchanting Template. This requires the use of Block of Experience",
+  "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.text_1": "First material is Block of Super Experience, which will be used to make the Super Enchanting Template. This requires the use of Block of Experience",
   "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.text_2": "Lighting Strike!",
-  "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.text_3": "Second, you need to make Cake o' Enchanting. Blaze will love eating this",
+  "create_enchantment_industry.ponder.experience.prepare_for_super_enchant.text_3": "Second material is Cake o' Enchanting. It works as \"Super Experience\" to support blaze seething mode. Blaze will love eating this",
   "create_enchantment_industry.ponder.experience_hatch.intro.header": "Introduction to Experience Hatch",
   "create_enchantment_industry.ponder.experience_hatch.intro.text_1": "It is very simple to use. Right click Hatch to store Experience...",
   "create_enchantment_industry.ponder.experience_hatch.intro.text_2": "...Shift-Right-Click Hatch to extract stored Experience",
@@ -155,7 +155,7 @@
   "create_enchantment_industry.ponder.printer.intro.text_1": "This is a Printer",
   "create_enchantment_industry.ponder.printer.intro.text_2": "Before you can put it to use, you need to set what you want to print via the filter slot...",
   "create_enchantment_industry.ponder.printer.intro.text_3": "...and pass in the corresponding fluid",
-  "create_enchantment_industry.ponder.printer.intro.text_4": "DO NOT FORGET TO CHECK PRINTING RECIPE!",
+  "create_enchantment_industry.ponder.printer.intro.text_4": "You can always use JEI or another recipe book mod to check all printing recipes",
   "create_enchantment_industry.ponder.tag.experience_appliances": "Experience Related",
   "create_enchantment_industry.ponder.tag.experience_appliances.description": "Components which will be used when processing and applying Experience",
   "create_enchantment_industry.ponder.tag.super_experience_related": "Super Experience Related",