From b86941a519e1986cbbe93675134a22032bb0ae2d Mon Sep 17 00:00:00 2001 From: garyantonyo Date: Fri, 15 Jan 2021 00:38:47 -0500 Subject: [PATCH 1/5] Added missing ae2 compatibility recipe. --- .../compat/ae2/milling/fluix_crystal.json | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/main/resources/data/create/recipes/compat/ae2/milling/fluix_crystal.json diff --git a/src/main/resources/data/create/recipes/compat/ae2/milling/fluix_crystal.json b/src/main/resources/data/create/recipes/compat/ae2/milling/fluix_crystal.json new file mode 100644 index 000000000..a1571b58f --- /dev/null +++ b/src/main/resources/data/create/recipes/compat/ae2/milling/fluix_crystal.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "appliedenergistics2" + } + ], + "type": "create:milling", + "ingredients": [ + { + "item": "appliedenergistics2:fluix_crystal" + } + ], + "results": [ + { + "item": "appliedenergistics2:fluix_dust", + "count": 1 + } + ], + "processingTime": 200 +} \ No newline at end of file From eaf131c57fac67105ad9f2cdf0577efbb562c2f0 Mon Sep 17 00:00:00 2001 From: garyantonyo Date: Fri, 15 Jan 2021 01:06:41 -0500 Subject: [PATCH 2/5] I think this was left in here by mistake. --- .../compat/ae2/milling/glowflower.json | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 src/main/resources/data/create/recipes/compat/ae2/milling/glowflower.json diff --git a/src/main/resources/data/create/recipes/compat/ae2/milling/glowflower.json b/src/main/resources/data/create/recipes/compat/ae2/milling/glowflower.json deleted file mode 100644 index 431878641..000000000 --- a/src/main/resources/data/create/recipes/compat/ae2/milling/glowflower.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "appliedenergistics2" - } - ], - "type": "create:milling", - "ingredients": [ - { - "item": "appliedenergistics2:certus_quartz_crystal" - } - ], - "results": [ - { - "item": "appliedenergistics2:certus_quartz_dust", - "count": 1 - } - ], - "processingTime": 200 -} \ No newline at end of file From 645d28ac319e4472e4d093e2dd186ee13d67a15f Mon Sep 17 00:00:00 2001 From: Chubz <69413529+Chubzik1@users.noreply.github.com> Date: Fri, 15 Jan 2021 21:24:33 +0400 Subject: [PATCH 3/5] Small fix for an incorrectly translated line Everyone makes mistakes, right? --- src/main/resources/assets/create/lang/ru_ru.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/create/lang/ru_ru.json b/src/main/resources/assets/create/lang/ru_ru.json index cf0f2eb4e..b757efb38 100644 --- a/src/main/resources/assets/create/lang/ru_ru.json +++ b/src/main/resources/assets/create/lang/ru_ru.json @@ -1414,7 +1414,7 @@ "block.create.adjustable_chain_gearshift.tooltip": "ADJUSTABLE CHAIN GEARSHIFT", "block.create.adjustable_chain_gearshift.tooltip.summary": "_Передаёт вращение_ по прямой линии и к смежным _цепным приводам в кожухе_. Полученный _сигнал редстоуна_ будет контролировать, какой размер шестерни взаимодействует с присоединенными цепными приводами.", "block.create.adjustable_chain_gearshift.tooltip.condition1": "Кнонтроль редстоуном", - "block.create.adjustable_chain_gearshift.tooltip.behaviour1": "_Без_ сигнала редстоуна присоединённые приводы будут иметь _такую же_ скорость. При получении _сигнала редстоуна_ максимального уровня, соединённые приводы будут вращаться с ровно в два раза меньшей скоростью. Всё, что между этими значениями, будет выдавать скорость от 1 до 2 кратной скорости цепного механизма.", + "block.create.adjustable_chain_gearshift.tooltip.behaviour1": "_Без_ сигнала редстоуна присоединённые приводы будут иметь _такую же_ скорость. При получении _сигнала редстоуна_ максимального уровня, соединённые приводы будут вращаться с удвоенной скоростью. Всё, что между минимальным и максимальным значениями, будет выдавать скорость от 1 до 2 кратной скорости цепного механизма.", "item.create.belt_connector.tooltip": "BELT CONNECTOR", "item.create.belt_connector.tooltip.summary": "Соединяет _2_ _Вала_ с помощью _механического_ _ремня_._ Соединённые валы будут иметь одинаковые _скорость_ и _направление_ _вращения._ Лента может служить как _конвейер_ для _транспортировки._", From 1622d719291b346d9938a7d8708449ed663ef70b Mon Sep 17 00:00:00 2001 From: Bobert <60948714+Bobisnotap@users.noreply.github.com> Date: Sat, 16 Jan 2021 13:00:58 -0700 Subject: [PATCH 4/5] The Nerf Nerfs Arid Sand splashing, shouldn't hurt pogression anymore. Removes RYS recipes, that mod is being rebuilt and reworked, I will submit new recipes when the new version is released for 1.16 --- .../atmospheric/splashing/arid_sand.json | 4 +-- .../splashing/rys_spashing_smoothing.json | 21 ------------- .../splashing/rys_splashing_clay_deposit.json | 31 ------------------- .../splashing/rys_splashing_gold_deposit.json | 31 ------------------- .../splashing/rys_splashing_iron_deposit.json | 31 ------------------- .../splashing/rys_splashing_peat_deposit.json | 31 ------------------- 6 files changed, 2 insertions(+), 147 deletions(-) delete mode 100644 src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_spashing_smoothing.json delete mode 100644 src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_clay_deposit.json delete mode 100644 src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_gold_deposit.json delete mode 100644 src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_iron_deposit.json delete mode 100644 src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_peat_deposit.json diff --git a/src/main/resources/data/create/recipes/compat/atmospheric/splashing/arid_sand.json b/src/main/resources/data/create/recipes/compat/atmospheric/splashing/arid_sand.json index 4c4da1935..5c51a9d3b 100644 --- a/src/main/resources/data/create/recipes/compat/atmospheric/splashing/arid_sand.json +++ b/src/main/resources/data/create/recipes/compat/atmospheric/splashing/arid_sand.json @@ -18,9 +18,9 @@ "chance": 0.25 }, { - "item": "minecraft:quartz", + "item": "atmospheric:aloe_kernels", "count": 1, - "chance": 0.15 + "chance": 0.05 } ] } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_spashing_smoothing.json b/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_spashing_smoothing.json deleted file mode 100644 index c150bffc7..000000000 --- a/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_spashing_smoothing.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "rys" - } - ], - "type": "create:splashing", - "group": "minecraft:misc", - "ingredients": [ - { - "item": "rys:tough_dirt" - } - ], - "results": [ - { - "item": "rys:smooth_dirt", - "count": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_clay_deposit.json b/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_clay_deposit.json deleted file mode 100644 index 604d8d847..000000000 --- a/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_clay_deposit.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "rys" - } - ], - "type": "create:splashing", - "group": "minecraft:misc", - "ingredients": [ - { - "item": "rys:clay_deposit" - } - ], - "results": [ - { - "item": "minecraft:clay_ball", - "count": 2 - }, - { - "item": "minecraft:clay_ball", - "count": 4, - "chance": 0.5 - }, - { - "item": "minecraft:dirt", - "count": 1, - "chance": 0.125 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_gold_deposit.json b/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_gold_deposit.json deleted file mode 100644 index f9ddf4a85..000000000 --- a/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_gold_deposit.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "rys" - } - ], - "type": "create:splashing", - "group": "minecraft:misc", - "ingredients": [ - { - "item": "rys:gold_deposit" - } - ], - "results": [ - { - "item": "minecraft:gold_nugget", - "count": 2 - }, - { - "item": "minecraft:gold_nugget", - "count": 4, - "chance": 0.5 - }, - { - "item": "minecraft:dirt", - "count": 1, - "chance": 0.125 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_iron_deposit.json b/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_iron_deposit.json deleted file mode 100644 index f3d6d707c..000000000 --- a/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_iron_deposit.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "rys" - } - ], - "type": "create:splashing", - "group": "minecraft:misc", - "ingredients": [ - { - "item": "rys:iron_deposit" - } - ], - "results": [ - { - "item": "minecraft:iron_nugget", - "count": 2 - }, - { - "item": "minecraft:iron_nugget", - "count": 4, - "chance": 0.5 - }, - { - "item": "minecraft:dirt", - "count": 1, - "chance": 0.125 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_peat_deposit.json b/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_peat_deposit.json deleted file mode 100644 index eeb3a6710..000000000 --- a/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_peat_deposit.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "rys" - } - ], - "type": "create:splashing", - "group": "minecraft:misc", - "ingredients": [ - { - "item": "rys:peat_deposit" - } - ], - "results": [ - { - "item": "rys:peat", - "count": 2 - }, - { - "item": "rys:peat", - "count": 4, - "chance": 0.5 - }, - { - "item": "minecraft:dirt", - "count": 1, - "chance": 0.125 - } - ] -} \ No newline at end of file From 32d240f91de18eea81b3b3456608f300ce1fb963 Mon Sep 17 00:00:00 2001 From: Bobert <60948714+Bobisnotap@users.noreply.github.com> Date: Sat, 16 Jan 2021 13:10:08 -0700 Subject: [PATCH 5/5] =?UTF-8?q?Uhh,=20didn't=20know=20it=20would=20do=20th?= =?UTF-8?q?at=20=F0=9F=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Un-removed RYS compat, apperently that breaks things --- .../splashing/rys_spashing_smoothing.json | 21 +++++++++++++ .../splashing/rys_splashing_clay_deposit.json | 31 +++++++++++++++++++ .../splashing/rys_splashing_gold_deposit.json | 31 +++++++++++++++++++ .../splashing/rys_splashing_iron_deposit.json | 31 +++++++++++++++++++ .../splashing/rys_splashing_peat_deposit.json | 31 +++++++++++++++++++ 5 files changed, 145 insertions(+) create mode 100644 src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_spashing_smoothing.json create mode 100644 src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_clay_deposit.json create mode 100644 src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_gold_deposit.json create mode 100644 src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_iron_deposit.json create mode 100644 src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_peat_deposit.json diff --git a/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_spashing_smoothing.json b/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_spashing_smoothing.json new file mode 100644 index 000000000..c150bffc7 --- /dev/null +++ b/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_spashing_smoothing.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "rys" + } + ], + "type": "create:splashing", + "group": "minecraft:misc", + "ingredients": [ + { + "item": "rys:tough_dirt" + } + ], + "results": [ + { + "item": "rys:smooth_dirt", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_clay_deposit.json b/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_clay_deposit.json new file mode 100644 index 000000000..604d8d847 --- /dev/null +++ b/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_clay_deposit.json @@ -0,0 +1,31 @@ +{ + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "rys" + } + ], + "type": "create:splashing", + "group": "minecraft:misc", + "ingredients": [ + { + "item": "rys:clay_deposit" + } + ], + "results": [ + { + "item": "minecraft:clay_ball", + "count": 2 + }, + { + "item": "minecraft:clay_ball", + "count": 4, + "chance": 0.5 + }, + { + "item": "minecraft:dirt", + "count": 1, + "chance": 0.125 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_gold_deposit.json b/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_gold_deposit.json new file mode 100644 index 000000000..f9ddf4a85 --- /dev/null +++ b/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_gold_deposit.json @@ -0,0 +1,31 @@ +{ + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "rys" + } + ], + "type": "create:splashing", + "group": "minecraft:misc", + "ingredients": [ + { + "item": "rys:gold_deposit" + } + ], + "results": [ + { + "item": "minecraft:gold_nugget", + "count": 2 + }, + { + "item": "minecraft:gold_nugget", + "count": 4, + "chance": 0.5 + }, + { + "item": "minecraft:dirt", + "count": 1, + "chance": 0.125 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_iron_deposit.json b/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_iron_deposit.json new file mode 100644 index 000000000..f3d6d707c --- /dev/null +++ b/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_iron_deposit.json @@ -0,0 +1,31 @@ +{ + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "rys" + } + ], + "type": "create:splashing", + "group": "minecraft:misc", + "ingredients": [ + { + "item": "rys:iron_deposit" + } + ], + "results": [ + { + "item": "minecraft:iron_nugget", + "count": 2 + }, + { + "item": "minecraft:iron_nugget", + "count": 4, + "chance": 0.5 + }, + { + "item": "minecraft:dirt", + "count": 1, + "chance": 0.125 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_peat_deposit.json b/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_peat_deposit.json new file mode 100644 index 000000000..eeb3a6710 --- /dev/null +++ b/src/main/resources/data/create/recipes/compat/readyyourshovels/splashing/rys_splashing_peat_deposit.json @@ -0,0 +1,31 @@ +{ + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "rys" + } + ], + "type": "create:splashing", + "group": "minecraft:misc", + "ingredients": [ + { + "item": "rys:peat_deposit" + } + ], + "results": [ + { + "item": "rys:peat", + "count": 2 + }, + { + "item": "rys:peat", + "count": 4, + "chance": 0.5 + }, + { + "item": "minecraft:dirt", + "count": 1, + "chance": 0.125 + } + ] +} \ No newline at end of file