diff --git a/.gitignore b/.gitignore index d785bb5c1..4afb35865 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,5 @@ local.properties # PDT-specific .buildpath + +.DS_Store \ No newline at end of file diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 9a774dc8e..b607c4402 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -530,21 +530,21 @@ bf2b0310500213ff853c748c236eb5d01f61658e assets/create/blockstates/yellow_toolbo 6801fa1f466f172700e573e5b8ee8ee5f9ca4583 assets/create/blockstates/yellow_valve_handle.json 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json -64a8442735a333c7444cac12cfb22c454ca06b6b assets/create/lang/en_ud.json -b984531bff326c47aa13a4aee8e230b03d97eb6e assets/create/lang/en_us.json -367a1c79a27c9d0496457a164f1d192eeabd5fa4 assets/create/lang/unfinished/de_de.json -842b0aaf8ad5a404a128fb29f312da8b6b6a61b7 assets/create/lang/unfinished/es_cl.json -7c42d400daae6a49b30de6180dc467cb42afe602 assets/create/lang/unfinished/es_es.json -322d3a2b9303659ffd0633afe067e6f753d58d84 assets/create/lang/unfinished/fr_fr.json -e85c66d2cbbc2db9b2f5504d44f345c5d4be47cb assets/create/lang/unfinished/it_it.json -f1176ef353e193be026d3c3581a9ed5f40576e6f assets/create/lang/unfinished/ja_jp.json -0e042c6fa4e1ed497c3eeee4203e41f4b9d644cf assets/create/lang/unfinished/ko_kr.json -26c92f47ceacbc236bb2ef1a60837a361d39c07c assets/create/lang/unfinished/nl_nl.json -20dc5fd426c579319c1c5f8d8a0b961867dae295 assets/create/lang/unfinished/pl_pl.json -890c8c28f57270f5b8ff871d9b0d5a8c68c71cbd assets/create/lang/unfinished/pt_br.json -dbb9348844951afa663d750b87f333f095007bec assets/create/lang/unfinished/ru_ru.json -60c5ddb490b9293b42647595f95e06ebbcf48c20 assets/create/lang/unfinished/zh_cn.json -d5ebaf58f6356272d311d8e12bf4ecd218d7d29a assets/create/lang/unfinished/zh_tw.json +f33899d90db924319a1b99065bf1faff1aa40d6a assets/create/lang/en_ud.json +6be350b9d57fa573e464b8ed250b66234d767631 assets/create/lang/en_us.json +f7b78c385c001eccef20718886ec62aebb49920b assets/create/lang/unfinished/de_de.json +9a13b14a41fabc846638b5aa1557ab3be915e24f assets/create/lang/unfinished/es_cl.json +a8cc635c26b070336407991f068e7b42b476aed7 assets/create/lang/unfinished/es_es.json +ce38f5577b7b96460025372563ee88cef2318e7c assets/create/lang/unfinished/fr_fr.json +2c85e6efd817348d94c55292e20fadf6b704209c assets/create/lang/unfinished/it_it.json +5f72b4b2cee27254765f63e309568bcec78959f4 assets/create/lang/unfinished/ja_jp.json +26880b09a44d9642be8764fbbae52e384fd5883b assets/create/lang/unfinished/ko_kr.json +983b53cab576e43b0e61f899590b6488d220cd36 assets/create/lang/unfinished/nl_nl.json +0d4aa18fa90d8620d4761ce2fbe900ef8f407a50 assets/create/lang/unfinished/pl_pl.json +776f4179fd212ca6faf0d66ad08bf204f019db6a assets/create/lang/unfinished/pt_br.json +9a1d7bbd01321fae009c00bbf5b2bc091ef38e13 assets/create/lang/unfinished/ru_ru.json +703c7a655bedc1f1a59ba6c6df5a3f7f56f28bee assets/create/lang/unfinished/zh_cn.json +b316488ca9891c2444a6df03bc5ddfbcd1f84de0 assets/create/lang/unfinished/zh_tw.json 487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json 3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json @@ -4103,6 +4103,7 @@ a7c97582bae243ab04ff5ff9914b24af25d40d59 data/create/recipes/crushing/iron_horse 554b6555888fe01de349efaaab36b68a338ac397 data/create/recipes/crushing/iron_ore.json c9a9d6d28a7eac1210108d52840b60b26d58bcfe data/create/recipes/crushing/lapis_ore.json e870d049abc5cd5f389f70414c67e76ddc14060d data/create/recipes/crushing/leather_horse_armor.json +a3b45ccedd37bfc7e69eb72863576b6482f6fddf data/create/recipes/crushing/magma_block.json cc5a817901d6f0d68e4ceb3e65d7f2187ab37ceb data/create/recipes/crushing/nether_gold_ore.json 6cd97c6f12687790943db810f85036b02586c753 data/create/recipes/crushing/nether_quartz_ore.json 6e424d7e9f7d8b585384053a713db28f9d36448b data/create/recipes/crushing/nether_wart_block.json @@ -4855,6 +4856,7 @@ f6e2fb5725f3730d01fae4a2b1a04d11095eab5f data/create/recipes/scorchia_pillar_fro d6e16599de7424513e1457b07acb6370815d2bd7 data/create/recipes/scoria_pillar_from_stone_types_scoria_stonecutting.json 1b6bec69b00c44e74951973d69caae53d85383cb data/create/recipes/sequenced_assembly/cogwheel.json 3bc3d13856f9ab8ccc47c3188cfd839f6db2359b data/create/recipes/sequenced_assembly/large_cogwheel.json +60bcef06c4fe292c3e90441aed49f5773b8934e6 data/create/recipes/sequenced_assembly/netherrack.json b49a0da57a179edc087eee224221ded22fd1be01 data/create/recipes/sequenced_assembly/precision_mechanism.json 5e7648d55555c263539a2696b8d1f8d352a71dc9 data/create/recipes/small_andesite_brick_slab.json 180c1ca843163ef4ed3701ac93e3eac060ad2cc4 data/create/recipes/small_andesite_brick_slab_from_andesite_stonecutting.json diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json index 2ed4baaf7..3e6800457 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -594,6 +594,7 @@ "item.create.honeyed_apple": "\u01DD\u05DFdd\u2C6F p\u01DD\u028E\u01DDuoH", "item.create.incomplete_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 \u01DD\u0287\u01DD\u05DFd\u026Fo\u0254uI", "item.create.incomplete_large_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 \u01DDb\u0279\u0250\uA780 \u01DD\u0287\u01DD\u05DFd\u026Fo\u0254uI", + "item.create.incomplete_netherrack": "\u029E\u0254\u0250\u0279\u0279\u01DD\u0265\u0287\u01DDN \u01DD\u0287\u01DD\u05DFd\u026Fo\u0254uI", "item.create.incomplete_precision_mechanism": "\u026Fs\u0131u\u0250\u0265\u0254\u01DDW uo\u0131s\u0131\u0254\u01DD\u0279\u0500 \u01DD\u0287\u01DD\u05DFd\u026Fo\u0254uI", "item.create.iron_sheet": "\u0287\u01DD\u01DD\u0265S uo\u0279I", "item.create.linked_controller": "\u0279\u01DD\u05DF\u05DFo\u0279\u0287uo\u0186 p\u01DD\u029Eu\u0131\uA780", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index aa455f4a5..0c413ba4c 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -601,6 +601,7 @@ "item.create.honeyed_apple": "Honeyed Apple", "item.create.incomplete_cogwheel": "Incomplete Cogwheel", "item.create.incomplete_large_cogwheel": "Incomplete Large Cogwheel", + "item.create.incomplete_netherrack": "Incomplete Netherrack", "item.create.incomplete_precision_mechanism": "Incomplete Precision Mechanism", "item.create.iron_sheet": "Iron Sheet", "item.create.linked_controller": "Linked Controller", @@ -820,6 +821,8 @@ "create.recipe.fan_washing.fan": "Fan behind Flowing Water", "create.recipe.fan_smoking": "Bulk Smoking", "create.recipe.fan_smoking.fan": "Fan behind Fire", + "create.recipe.fan_soul_smoking": "Bulk Soul Smoking", + "create.recipe.fan_soul_smoking.fan": "Fan behind Soul Fire", "create.recipe.fan_blasting": "Bulk Blasting", "create.recipe.fan_blasting.fan": "Fan behind Lava", "create.recipe.pressing": "Pressing", diff --git a/src/generated/resources/assets/create/lang/unfinished/de_de.json b/src/generated/resources/assets/create/lang/unfinished/de_de.json index cbf1b849d..7aa135ef0 100644 --- a/src/generated/resources/assets/create/lang/unfinished/de_de.json +++ b/src/generated/resources/assets/create/lang/unfinished/de_de.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1319", + "_": "Missing Localizations: 1322", "_": "->------------------------] Game Elements [------------------------<-", @@ -602,6 +602,7 @@ "item.create.honeyed_apple": "Honigapfel", "item.create.incomplete_cogwheel": "UNLOCALIZED: Incomplete Cogwheel", "item.create.incomplete_large_cogwheel": "UNLOCALIZED: Incomplete Large Cogwheel", + "item.create.incomplete_netherrack": "UNLOCALIZED: Incomplete Netherrack", "item.create.incomplete_precision_mechanism": "UNLOCALIZED: Incomplete Precision Mechanism", "item.create.iron_sheet": "Eisenblech", "item.create.linked_controller": "UNLOCALIZED: Linked Controller", @@ -821,6 +822,8 @@ "create.recipe.fan_washing.fan": "Propeller hinter fließendem Wasser", "create.recipe.fan_smoking": "Sammelräuchern", "create.recipe.fan_smoking.fan": "Propeller hinter Feuer", + "create.recipe.fan_soul_smoking": "UNLOCALIZED: Bulk Soul Smoking", + "create.recipe.fan_soul_smoking.fan": "UNLOCALIZED: Fan behind Soul Fire", "create.recipe.fan_blasting": "Sammelschmelzen", "create.recipe.fan_blasting.fan": "Propeller hinter Lava", "create.recipe.pressing": "Mechanische Presse", diff --git a/src/generated/resources/assets/create/lang/unfinished/es_cl.json b/src/generated/resources/assets/create/lang/unfinished/es_cl.json index 06c6235ba..7cd6072b2 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_cl.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_cl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 330", + "_": "Missing Localizations: 333", "_": "->------------------------] Game Elements [------------------------<-", @@ -602,6 +602,7 @@ "item.create.honeyed_apple": "Manzana Enmielada", "item.create.incomplete_cogwheel": "Engranaje Incompleto", "item.create.incomplete_large_cogwheel": "Engranaje Grande Incompleto", + "item.create.incomplete_netherrack": "UNLOCALIZED: Incomplete Netherrack", "item.create.incomplete_precision_mechanism": "Mecanismo de Precisión Incompleto", "item.create.iron_sheet": "Plancha de Hierro", "item.create.linked_controller": "Controlador Vinculable", @@ -821,6 +822,8 @@ "create.recipe.fan_washing.fan": "Ventilador detrás de una Corriente de Agua", "create.recipe.fan_smoking": "Ahumado", "create.recipe.fan_smoking.fan": "Ventilador tras Fuego", + "create.recipe.fan_soul_smoking": "UNLOCALIZED: Bulk Soul Smoking", + "create.recipe.fan_soul_smoking.fan": "UNLOCALIZED: Fan behind Soul Fire", "create.recipe.fan_blasting": "Fundición", "create.recipe.fan_blasting.fan": "Ventilador tras Lava", "create.recipe.pressing": "Prensando", diff --git a/src/generated/resources/assets/create/lang/unfinished/es_es.json b/src/generated/resources/assets/create/lang/unfinished/es_es.json index 9dcca1b36..303d0106f 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_es.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_es.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 330", + "_": "Missing Localizations: 333", "_": "->------------------------] Game Elements [------------------------<-", @@ -602,6 +602,7 @@ "item.create.honeyed_apple": "Manzana con miel", "item.create.incomplete_cogwheel": "Engranaje pequeño incompleto", "item.create.incomplete_large_cogwheel": "Engranaje grande incompleto", + "item.create.incomplete_netherrack": "UNLOCALIZED: Incomplete Netherrack", "item.create.incomplete_precision_mechanism": "Mecanismo de precisión incompleto", "item.create.iron_sheet": "Lámina de hierro", "item.create.linked_controller": "Controlador enlazado", @@ -821,6 +822,8 @@ "create.recipe.fan_washing.fan": "Ventilador detrás del agua fluyente", "create.recipe.fan_smoking": "Ahumador a granel", "create.recipe.fan_smoking.fan": "Ventilador detrás del fuego", + "create.recipe.fan_soul_smoking": "UNLOCALIZED: Bulk Soul Smoking", + "create.recipe.fan_soul_smoking.fan": "UNLOCALIZED: Fan behind Soul Fire", "create.recipe.fan_blasting": "Voladuras a granel", "create.recipe.fan_blasting.fan": "Ventilador detrás de la lava", "create.recipe.pressing": "Prensando", diff --git a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json index 581d9a163..23f58db4b 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1581", + "_": "Missing Localizations: 1584", "_": "->------------------------] Game Elements [------------------------<-", @@ -602,6 +602,7 @@ "item.create.honeyed_apple": "UNLOCALIZED: Honeyed Apple", "item.create.incomplete_cogwheel": "UNLOCALIZED: Incomplete Cogwheel", "item.create.incomplete_large_cogwheel": "UNLOCALIZED: Incomplete Large Cogwheel", + "item.create.incomplete_netherrack": "UNLOCALIZED: Incomplete Netherrack", "item.create.incomplete_precision_mechanism": "UNLOCALIZED: Incomplete Precision Mechanism", "item.create.iron_sheet": "Plaque de Fer", "item.create.linked_controller": "UNLOCALIZED: Linked Controller", @@ -821,6 +822,8 @@ "create.recipe.fan_washing.fan": "Ventilateur derrière de l'eau", "create.recipe.fan_smoking": "Fumage", "create.recipe.fan_smoking.fan": "Ventilateur derrière du feu", + "create.recipe.fan_soul_smoking": "UNLOCALIZED: Bulk Soul Smoking", + "create.recipe.fan_soul_smoking.fan": "UNLOCALIZED: Fan behind Soul Fire", "create.recipe.fan_blasting": "Fonte", "create.recipe.fan_blasting.fan": "Ventilateur derrière de la lave", "create.recipe.pressing": "Pressage", diff --git a/src/generated/resources/assets/create/lang/unfinished/it_it.json b/src/generated/resources/assets/create/lang/unfinished/it_it.json index ea99d5cc5..d0cbef3a6 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1270", + "_": "Missing Localizations: 1273", "_": "->------------------------] Game Elements [------------------------<-", @@ -602,6 +602,7 @@ "item.create.honeyed_apple": "UNLOCALIZED: Honeyed Apple", "item.create.incomplete_cogwheel": "UNLOCALIZED: Incomplete Cogwheel", "item.create.incomplete_large_cogwheel": "UNLOCALIZED: Incomplete Large Cogwheel", + "item.create.incomplete_netherrack": "UNLOCALIZED: Incomplete Netherrack", "item.create.incomplete_precision_mechanism": "UNLOCALIZED: Incomplete Precision Mechanism", "item.create.iron_sheet": "Lamiera di ferro", "item.create.linked_controller": "UNLOCALIZED: Linked Controller", @@ -821,6 +822,8 @@ "create.recipe.fan_washing.fan": "Ventilatore dietro l'acqua corrente", "create.recipe.fan_smoking": "Fumo volumetrico", "create.recipe.fan_smoking.fan": "Ventilatore dietro il fuoco", + "create.recipe.fan_soul_smoking": "UNLOCALIZED: Bulk Soul Smoking", + "create.recipe.fan_soul_smoking.fan": "UNLOCALIZED: Fan behind Soul Fire", "create.recipe.fan_blasting": "Esplosione volumetrica", "create.recipe.fan_blasting.fan": "Ventilatore dietro la lava", "create.recipe.pressing": "Pressatura", diff --git a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json index 62620b1d6..c00561beb 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json +++ b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 330", + "_": "Missing Localizations: 333", "_": "->------------------------] Game Elements [------------------------<-", @@ -602,6 +602,7 @@ "item.create.honeyed_apple": "リンゴのハチミツかけ", "item.create.incomplete_cogwheel": "組み立て中の歯車", "item.create.incomplete_large_cogwheel": "組み立て中の大きな歯車", + "item.create.incomplete_netherrack": "UNLOCALIZED: Incomplete Netherrack", "item.create.incomplete_precision_mechanism": "組み立て中の精密機構", "item.create.iron_sheet": "鉄板", "item.create.linked_controller": "リンクコントローラー", @@ -821,6 +822,8 @@ "create.recipe.fan_washing.fan": "水の奥のケース入りファン", "create.recipe.fan_smoking": "一括燻製", "create.recipe.fan_smoking.fan": "炎の奥のケース入りファン", + "create.recipe.fan_soul_smoking": "UNLOCALIZED: Bulk Soul Smoking", + "create.recipe.fan_soul_smoking.fan": "UNLOCALIZED: Fan behind Soul Fire", "create.recipe.fan_blasting": "一括精錬", "create.recipe.fan_blasting.fan": "溶岩の奥のケース入りファン", "create.recipe.pressing": "プレス", diff --git a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json index 288ff3eab..0d47d1cee 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json +++ b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 330", + "_": "Missing Localizations: 333", "_": "->------------------------] Game Elements [------------------------<-", @@ -602,6 +602,7 @@ "item.create.honeyed_apple": "꿀 바른 사과", "item.create.incomplete_cogwheel": "미완성된 톱니바퀴", "item.create.incomplete_large_cogwheel": "미완성된 큰 톱니바퀴", + "item.create.incomplete_netherrack": "UNLOCALIZED: Incomplete Netherrack", "item.create.incomplete_precision_mechanism": "미완성된 정밀 기계장치", "item.create.iron_sheet": "철 판", "item.create.linked_controller": "레드스톤 링크 조작기", @@ -821,6 +822,8 @@ "create.recipe.fan_washing.fan": "물과 선풍기", "create.recipe.fan_smoking": "훈연", "create.recipe.fan_smoking.fan": "불과 선풍기", + "create.recipe.fan_soul_smoking": "UNLOCALIZED: Bulk Soul Smoking", + "create.recipe.fan_soul_smoking.fan": "UNLOCALIZED: Fan behind Soul Fire", "create.recipe.fan_blasting": "제련", "create.recipe.fan_blasting.fan": "용암과 선풍기", "create.recipe.pressing": "압착", diff --git a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json index 41ccfd642..41d3bb91f 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1934", + "_": "Missing Localizations: 1937", "_": "->------------------------] Game Elements [------------------------<-", @@ -602,6 +602,7 @@ "item.create.honeyed_apple": "UNLOCALIZED: Honeyed Apple", "item.create.incomplete_cogwheel": "UNLOCALIZED: Incomplete Cogwheel", "item.create.incomplete_large_cogwheel": "UNLOCALIZED: Incomplete Large Cogwheel", + "item.create.incomplete_netherrack": "UNLOCALIZED: Incomplete Netherrack", "item.create.incomplete_precision_mechanism": "UNLOCALIZED: Incomplete Precision Mechanism", "item.create.iron_sheet": "IJzeren Platen", "item.create.linked_controller": "UNLOCALIZED: Linked Controller", @@ -821,6 +822,8 @@ "create.recipe.fan_washing.fan": "UNLOCALIZED: Fan behind Flowing Water", "create.recipe.fan_smoking": "UNLOCALIZED: Bulk Smoking", "create.recipe.fan_smoking.fan": "UNLOCALIZED: Fan behind Fire", + "create.recipe.fan_soul_smoking": "UNLOCALIZED: Bulk Soul Smoking", + "create.recipe.fan_soul_smoking.fan": "UNLOCALIZED: Fan behind Soul Fire", "create.recipe.fan_blasting": "UNLOCALIZED: Bulk Blasting", "create.recipe.fan_blasting.fan": "UNLOCALIZED: Fan behind Lava", "create.recipe.pressing": "Persen", diff --git a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json index 7ba861df3..a992beea9 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json +++ b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 369", + "_": "Missing Localizations: 372", "_": "->------------------------] Game Elements [------------------------<-", @@ -602,6 +602,7 @@ "item.create.honeyed_apple": "Jabłko w miodzie", "item.create.incomplete_cogwheel": "Niedokończone koło zębate", "item.create.incomplete_large_cogwheel": "Niedokończone duże koło zębate", + "item.create.incomplete_netherrack": "UNLOCALIZED: Incomplete Netherrack", "item.create.incomplete_precision_mechanism": "Niedokończony precyzyjny mechanizm", "item.create.iron_sheet": "Arkusz żelaza", "item.create.linked_controller": "Zdalny sterownik", @@ -821,6 +822,8 @@ "create.recipe.fan_washing.fan": "Wiatrak za płynącą wodą", "create.recipe.fan_smoking": "Hurtowe wędzenie", "create.recipe.fan_smoking.fan": "Wiatrak za ogniem", + "create.recipe.fan_soul_smoking": "UNLOCALIZED: Bulk Soul Smoking", + "create.recipe.fan_soul_smoking.fan": "UNLOCALIZED: Fan behind Soul Fire", "create.recipe.fan_blasting": "Hurtowe topienie", "create.recipe.fan_blasting.fan": "Wiatrak za lawą", "create.recipe.pressing": "Tłoczenie", diff --git a/src/generated/resources/assets/create/lang/unfinished/pt_br.json b/src/generated/resources/assets/create/lang/unfinished/pt_br.json index b0084498d..18924017a 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_br.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_br.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1670", + "_": "Missing Localizations: 1673", "_": "->------------------------] Game Elements [------------------------<-", @@ -602,6 +602,7 @@ "item.create.honeyed_apple": "Maçã com Cobertura de Mel", "item.create.incomplete_cogwheel": "Roda Dentada Incompleta", "item.create.incomplete_large_cogwheel": "Roda Dentada Grande Incompleta", + "item.create.incomplete_netherrack": "UNLOCALIZED: Incomplete Netherrack", "item.create.incomplete_precision_mechanism": "Mecanismo de Precisão", "item.create.iron_sheet": "Chapa de Ferro", "item.create.linked_controller": "Controle conectado", @@ -821,6 +822,8 @@ "create.recipe.fan_washing.fan": "Ventilador atrás de água", "create.recipe.fan_smoking": "Defumação em massa", "create.recipe.fan_smoking.fan": "Ventilador atrás de fogo", + "create.recipe.fan_soul_smoking": "UNLOCALIZED: Bulk Soul Smoking", + "create.recipe.fan_soul_smoking.fan": "UNLOCALIZED: Fan behind Soul Fire", "create.recipe.fan_blasting": "Fundição em massa", "create.recipe.fan_blasting.fan": "entilador atrás de lava", "create.recipe.pressing": "Prensa Mecânica", diff --git a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json index fc951a2ba..977de76c4 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json +++ b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 374", + "_": "Missing Localizations: 377", "_": "->------------------------] Game Elements [------------------------<-", @@ -602,6 +602,7 @@ "item.create.honeyed_apple": "Яблоко в меду", "item.create.incomplete_cogwheel": "Незаконченная шестерня", "item.create.incomplete_large_cogwheel": "Незаконченная большая шестерня", + "item.create.incomplete_netherrack": "UNLOCALIZED: Incomplete Netherrack", "item.create.incomplete_precision_mechanism": "Незаконченный механизм точности", "item.create.iron_sheet": "Железный лист", "item.create.linked_controller": "Контроллер связей", @@ -821,6 +822,8 @@ "create.recipe.fan_washing.fan": "Вентилятор за текущей водой", "create.recipe.fan_smoking": "Массовое копчение", "create.recipe.fan_smoking.fan": "Вентилятор за горящим огнём", + "create.recipe.fan_soul_smoking": "UNLOCALIZED: Bulk Soul Smoking", + "create.recipe.fan_soul_smoking.fan": "UNLOCALIZED: Fan behind Soul Fire", "create.recipe.fan_blasting": "Массовое плавление", "create.recipe.fan_blasting.fan": "Вентилятор за текущей лавой", "create.recipe.pressing": "Прессование", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json index 3e1f9c608..4819af007 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 330", + "_": "Missing Localizations: 333", "_": "->------------------------] Game Elements [------------------------<-", @@ -602,6 +602,7 @@ "item.create.honeyed_apple": "蜜渍苹果", "item.create.incomplete_cogwheel": "齿轮（半成品）", "item.create.incomplete_large_cogwheel": "大齿轮（半成品）", + "item.create.incomplete_netherrack": "UNLOCALIZED: Incomplete Netherrack", "item.create.incomplete_precision_mechanism": "精密构件（半成品）", "item.create.iron_sheet": "铁板", "item.create.linked_controller": "无线红石遥控器", @@ -821,6 +822,8 @@ "create.recipe.fan_washing.fan": "在水后放置鼓风机", "create.recipe.fan_smoking": "批量烟熏", "create.recipe.fan_smoking.fan": "在火焰后放置鼓风机", + "create.recipe.fan_soul_smoking": "UNLOCALIZED: Bulk Soul Smoking", + "create.recipe.fan_soul_smoking.fan": "UNLOCALIZED: Fan behind Soul Fire", "create.recipe.fan_blasting": "批量熔炼", "create.recipe.fan_blasting.fan": "在熔岩后放置鼓风机", "create.recipe.pressing": "金属压片", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json index ed72f6072..b2ad59999 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 388", + "_": "Missing Localizations: 391", "_": "->------------------------] Game Elements [------------------------<-", @@ -602,6 +602,7 @@ "item.create.honeyed_apple": "蜂蜜蘋果", "item.create.incomplete_cogwheel": "未完成的小齒輪", "item.create.incomplete_large_cogwheel": "未完成的大齒輪", + "item.create.incomplete_netherrack": "UNLOCALIZED: Incomplete Netherrack", "item.create.incomplete_precision_mechanism": "未完成的精確控制器", "item.create.iron_sheet": "鐵板", "item.create.linked_controller": "遙控器", @@ -821,6 +822,8 @@ "create.recipe.fan_washing.fan": "在水後放置鼓風機", "create.recipe.fan_smoking": "批次煙燻", "create.recipe.fan_smoking.fan": "在火焰後放置鼓風機", + "create.recipe.fan_soul_smoking": "UNLOCALIZED: Bulk Soul Smoking", + "create.recipe.fan_soul_smoking.fan": "UNLOCALIZED: Fan behind Soul Fire", "create.recipe.fan_blasting": "批次融煉", "create.recipe.fan_blasting.fan": "在熔岩後放置鼓風機", "create.recipe.pressing": "金屬壓片", diff --git a/src/generated/resources/data/create/recipes/sequenced_assembly/netherrack.json b/src/generated/resources/data/create/recipes/sequenced_assembly/netherrack.json new file mode 100644 index 000000000..c80798fe8 --- /dev/null +++ b/src/generated/resources/data/create/recipes/sequenced_assembly/netherrack.json @@ -0,0 +1,86 @@ +{ + "type": "create:sequenced_assembly", + "ingredient": { + "item": "minecraft:blackstone" + }, + "transitionalItem": { + "item": "create:incomplete_netherrack" + }, + "sequence": [ + { + "type": "create:deploying", + "ingredients": [ + { + "item": "create:incomplete_netherrack" + }, + { + "item": "create:cinder_flour" + } + ], + "results": [ + { + "item": "create:incomplete_netherrack" + } + ] + }, + { + "type": "create:filling", + "ingredients": [ + { + "item": "create:incomplete_netherrack" + }, + { + "fluid": "minecraft:lava", + "nbt": {}, + "amount": 50 + } + ], + "results": [ + { + "item": "create:incomplete_netherrack" + } + ] + }, + { + "type": "create:cutting", + "ingredients": [ + { + "item": "create:incomplete_netherrack" + } + ], + "results": [ + { + "item": "create:incomplete_netherrack" + } + ], + "processingTime": 50 + } + ], + "results": [ + { + "item": "minecraft:netherrack", + "count": 2, + "chance": 35.0 + }, + { + "item": "minecraft:blackstone", + "chance": 5.0 + }, + { + "item": "minecraft:basalt", + "chance": 4.0 + }, + { + "item": "minecraft:deepslate", + "chance": 3.0 + }, + { + "item": "minecraft:magma_block", + "chance": 2.0 + }, + { + "item": "minecraft:obsidian" + } + ], + "loops": 2 +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllItems.java b/src/main/java/com/simibubi/create/AllItems.java index b8a592f2e..f0630ae58 100644 --- a/src/main/java/com/simibubi/create/AllItems.java +++ b/src/main/java/com/simibubi/create/AllItems.java @@ -94,6 +94,11 @@ public class AllItems { .model(AssetLookup.existingItemModel()) .register(); + public static final ItemEntry INCOMPLETE_NETHERRACK = + REGISTRATE.item("incomplete_netherrack", SequencedAssemblyItem::new) + .model(AssetLookup.existingItemModel()) + .register(); + public static final ItemEntry BLAZE_CAKE_BASE = REGISTRATE.item("blaze_cake_base", HiddenIngredientItem::new) .tag(AllItemTags.UPRIGHT_ON_BELT.tag) diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java index edf8058e8..1aca88abb 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java @@ -6,7 +6,10 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; import com.simibubi.create.Create; import com.simibubi.create.content.contraptions.components.deployer.DeployerApplicationRecipe; +import com.simibubi.create.content.contraptions.components.fan.SoulSmokingRecipe; +import com.simibubi.create.content.contraptions.components.press.PressingRecipe; import com.simibubi.create.content.contraptions.components.saw.CuttingRecipe; +import com.simibubi.create.content.contraptions.fluids.actors.FillingRecipe; import com.simibubi.create.content.contraptions.itemAssembly.SequencedAssemblyRecipeBuilder; import net.minecraft.data.DataGenerator; @@ -14,6 +17,7 @@ import net.minecraft.tags.ItemTags; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.material.Fluids; public class SequencedAssemblyRecipeGen extends CreateRecipeProvider { @@ -75,7 +79,21 @@ public class SequencedAssemblyRecipeGen extends CreateRecipeProvider { .addStep(DeployerApplicationRecipe::new, rb -> rb.require(I.planks())) .addStep(DeployerApplicationRecipe::new, rb -> rb.require(ItemTags.WOODEN_BUTTONS)) .addStep(CuttingRecipe::new, rb -> rb.duration(50)) - ) + ), + + NETHERRACK = create("netherrack", b->b.require(Items.BLACKSTONE) + .transitionTo(AllItems.INCOMPLETE_NETHERRACK.get()) + .addOutput(new ItemStack(Blocks.NETHERRACK,2),35) + .addOutput(new ItemStack(Blocks.BLACKSTONE, 1), 5) + .addOutput(new ItemStack(Blocks.BASALT, 1), 4) + .addOutput(new ItemStack(Blocks.DEEPSLATE, 1), 3) + .addOutput(new ItemStack(Blocks.MAGMA_BLOCK, 1), 2) + .addOutput(new ItemStack(Blocks.OBSIDIAN, 1), 1) + .loops(2) + .addStep(DeployerApplicationRecipe::new, rb -> rb.require(AllItems.CINDER_FLOUR.get())) + .addStep(FillingRecipe::new, rb -> rb.require(Fluids.LAVA,50)) + .addStep(CuttingRecipe::new, rb -> rb.duration(50)) + ) ; public SequencedAssemblyRecipeGen(DataGenerator p_i48262_1_) { diff --git a/src/main/resources/assets/create/lang/default/interface.json b/src/main/resources/assets/create/lang/default/interface.json index 46b88fe9e..45c15026a 100644 --- a/src/main/resources/assets/create/lang/default/interface.json +++ b/src/main/resources/assets/create/lang/default/interface.json @@ -510,7 +510,7 @@ "create.tooltip.chute.fans_pull_up": "Fans pull from Above", "create.tooltip.chute.fans_pull_down": "Fans pull from Below", "create.tooltip.chute.contains": "Contains: %1$s x%2$s", - + "create.tooltip.brass_tunnel.contains": "Currently distributing:", "create.tooltip.brass_tunnel.contains_entry": "> %1$s x%2$s", "create.tooltip.brass_tunnel.retrieve": "Right-Click to retrieve", diff --git a/src/main/resources/assets/create/models/item/incomplete_netherrack.json b/src/main/resources/assets/create/models/item/incomplete_netherrack.json new file mode 100644 index 000000000..d69068a1c --- /dev/null +++ b/src/main/resources/assets/create/models/item/incomplete_netherrack.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "create:block/incomplete_netherrack" + } +} diff --git a/src/main/resources/assets/create/textures/block/incomplete_netherrack.png b/src/main/resources/assets/create/textures/block/incomplete_netherrack.png new file mode 100644 index 000000000..43f34f300 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/incomplete_netherrack.png differ