-
Notifications
You must be signed in to change notification settings - Fork 78
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #907 from P3pp3rF1y/1.18.x-dev
Release merge
- Loading branch information
Showing
41 changed files
with
709 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,15 @@ | ||
| org.gradle.daemon=false | ||
| minecraft_version=1.18.2 | ||
| forge_version=40.1.30 | ||
| mod_version=3.18.66 | ||
| mod_version=3.18.68 | ||
| jei_mc_version=1.18.2 | ||
| jei_version=9.7.0+ | ||
| curios_version=1.18.2-5.0.6.+ | ||
| botania_version=1.18.2-430-SNAPSHOT | ||
| patchouli_version=1.18.2-66 | ||
| balm_cf_file_id=3914491 | ||
| sc_version=1.18.2-0.5.97.+ | ||
| sc_version=1.18.2-0.5.104.+ | ||
| crafting_tweaks_cf_file_id=3584842 | ||
| chipped_cf_file_id=4293291 | ||
| ctm_cf_file_id=3933537 | ||
| parchment_version=1.18.1-2022.03.06-1.18.2 |
34 changes: 34 additions & 0 deletions
34
...packs/advancements/recipes/sophisticatedbackpacks/chipped/botanist_workbench_upgrade.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "rewards": { | ||
| "recipes": [ | ||
| "sophisticatedbackpacks:chipped/botanist_workbench_upgrade" | ||
| ] | ||
| }, | ||
| "criteria": { | ||
| "has_upgrade_base": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "sophisticatedbackpacks:upgrade_base" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "has_the_recipe": { | ||
| "trigger": "minecraft:recipe_unlocked", | ||
| "conditions": { | ||
| "recipe": "sophisticatedbackpacks:chipped/botanist_workbench_upgrade" | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_upgrade_base", | ||
| "has_the_recipe" | ||
| ] | ||
| ] | ||
| } |
34 changes: 34 additions & 0 deletions
34
...acks/advancements/recipes/sophisticatedbackpacks/chipped/carpenter_workbench_upgrade.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "rewards": { | ||
| "recipes": [ | ||
| "sophisticatedbackpacks:chipped/carpenter_workbench_upgrade" | ||
| ] | ||
| }, | ||
| "criteria": { | ||
| "has_upgrade_base": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "sophisticatedbackpacks:upgrade_base" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "has_the_recipe": { | ||
| "trigger": "minecraft:recipe_unlocked", | ||
| "conditions": { | ||
| "recipe": "sophisticatedbackpacks:chipped/carpenter_workbench_upgrade" | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_upgrade_base", | ||
| "has_the_recipe" | ||
| ] | ||
| ] | ||
| } |
34 changes: 34 additions & 0 deletions
34
...ks/advancements/recipes/sophisticatedbackpacks/chipped/glassblower_workbench_upgrade.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "rewards": { | ||
| "recipes": [ | ||
| "sophisticatedbackpacks:chipped/glassblower_workbench_upgrade" | ||
| ] | ||
| }, | ||
| "criteria": { | ||
| "has_upgrade_base": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "sophisticatedbackpacks:upgrade_base" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "has_the_recipe": { | ||
| "trigger": "minecraft:recipe_unlocked", | ||
| "conditions": { | ||
| "recipe": "sophisticatedbackpacks:chipped/glassblower_workbench_upgrade" | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_upgrade_base", | ||
| "has_the_recipe" | ||
| ] | ||
| ] | ||
| } |
34 changes: 34 additions & 0 deletions
34
...ackpacks/advancements/recipes/sophisticatedbackpacks/chipped/mason_workbench_upgrade.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "rewards": { | ||
| "recipes": [ | ||
| "sophisticatedbackpacks:chipped/mason_workbench_upgrade" | ||
| ] | ||
| }, | ||
| "criteria": { | ||
| "has_upgrade_base": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "sophisticatedbackpacks:upgrade_base" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "has_the_recipe": { | ||
| "trigger": "minecraft:recipe_unlocked", | ||
| "conditions": { | ||
| "recipe": "sophisticatedbackpacks:chipped/mason_workbench_upgrade" | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_upgrade_base", | ||
| "has_the_recipe" | ||
| ] | ||
| ] | ||
| } |
34 changes: 34 additions & 0 deletions
34
...ks/advancements/recipes/sophisticatedbackpacks/chipped/philosopher_workbench_upgrade.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "rewards": { | ||
| "recipes": [ | ||
| "sophisticatedbackpacks:chipped/philosopher_workbench_upgrade" | ||
| ] | ||
| }, | ||
| "criteria": { | ||
| "has_upgrade_base": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "sophisticatedbackpacks:upgrade_base" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "has_the_recipe": { | ||
| "trigger": "minecraft:recipe_unlocked", | ||
| "conditions": { | ||
| "recipe": "sophisticatedbackpacks:chipped/philosopher_workbench_upgrade" | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_upgrade_base", | ||
| "has_the_recipe" | ||
| ] | ||
| ] | ||
| } |
34 changes: 34 additions & 0 deletions
34
...packs/advancements/recipes/sophisticatedbackpacks/chipped/shepherd_workbench_upgrade.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "rewards": { | ||
| "recipes": [ | ||
| "sophisticatedbackpacks:chipped/shepherd_workbench_upgrade" | ||
| ] | ||
| }, | ||
| "criteria": { | ||
| "has_upgrade_base": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "sophisticatedbackpacks:upgrade_base" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "has_the_recipe": { | ||
| "trigger": "minecraft:recipe_unlocked", | ||
| "conditions": { | ||
| "recipe": "sophisticatedbackpacks:chipped/shepherd_workbench_upgrade" | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_upgrade_base", | ||
| "has_the_recipe" | ||
| ] | ||
| ] | ||
| } |
34 changes: 34 additions & 0 deletions
34
...packs/advancements/recipes/sophisticatedbackpacks/chipped/tinkerer_workbench_upgrade.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "rewards": { | ||
| "recipes": [ | ||
| "sophisticatedbackpacks:chipped/tinkerer_workbench_upgrade" | ||
| ] | ||
| }, | ||
| "criteria": { | ||
| "has_upgrade_base": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "sophisticatedbackpacks:upgrade_base" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "has_the_recipe": { | ||
| "trigger": "minecraft:recipe_unlocked", | ||
| "conditions": { | ||
| "recipe": "sophisticatedbackpacks:chipped/tinkerer_workbench_upgrade" | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_upgrade_base", | ||
| "has_the_recipe" | ||
| ] | ||
| ] | ||
| } |
35 changes: 35 additions & 0 deletions
35
...ted/resources/data/sophisticatedbackpacks/recipes/chipped/botanist_workbench_upgrade.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "conditions": [ | ||
| { | ||
| "modid": "chipped", | ||
| "type": "forge:mod_loaded" | ||
| }, | ||
| { | ||
| "itemRegistryName": "sophisticatedbackpacks:chipped/botanist_workbench_upgrade", | ||
| "type": "sophisticatedcore:item_enabled" | ||
| } | ||
| ], | ||
| "pattern": [ | ||
| " W ", | ||
| "IBI", | ||
| " R " | ||
| ], | ||
| "key": { | ||
| "B": { | ||
| "item": "sophisticatedbackpacks:upgrade_base" | ||
| }, | ||
| "R": { | ||
| "tag": "forge:dusts/redstone" | ||
| }, | ||
| "I": { | ||
| "tag": "forge:ingots/iron" | ||
| }, | ||
| "W": { | ||
| "item": "chipped:botanist_workbench" | ||
| } | ||
| }, | ||
| "result": { | ||
| "item": "sophisticatedbackpacks:chipped/botanist_workbench_upgrade" | ||
| } | ||
| } |
35 changes: 35 additions & 0 deletions
35
...ed/resources/data/sophisticatedbackpacks/recipes/chipped/carpenter_workbench_upgrade.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "conditions": [ | ||
| { | ||
| "modid": "chipped", | ||
| "type": "forge:mod_loaded" | ||
| }, | ||
| { | ||
| "itemRegistryName": "sophisticatedbackpacks:chipped/carpenter_workbench_upgrade", | ||
| "type": "sophisticatedcore:item_enabled" | ||
| } | ||
| ], | ||
| "pattern": [ | ||
| " W ", | ||
| "IBI", | ||
| " R " | ||
| ], | ||
| "key": { | ||
| "B": { | ||
| "item": "sophisticatedbackpacks:upgrade_base" | ||
| }, | ||
| "R": { | ||
| "tag": "forge:dusts/redstone" | ||
| }, | ||
| "I": { | ||
| "tag": "forge:ingots/iron" | ||
| }, | ||
| "W": { | ||
| "item": "chipped:carpenters_table" | ||
| } | ||
| }, | ||
| "result": { | ||
| "item": "sophisticatedbackpacks:chipped/carpenter_workbench_upgrade" | ||
| } | ||
| } |
35 changes: 35 additions & 0 deletions
35
.../resources/data/sophisticatedbackpacks/recipes/chipped/glassblower_workbench_upgrade.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "conditions": [ | ||
| { | ||
| "modid": "chipped", | ||
| "type": "forge:mod_loaded" | ||
| }, | ||
| { | ||
| "itemRegistryName": "sophisticatedbackpacks:chipped/glassblower_workbench_upgrade", | ||
| "type": "sophisticatedcore:item_enabled" | ||
| } | ||
| ], | ||
| "pattern": [ | ||
| " W ", | ||
| "IBI", | ||
| " R " | ||
| ], | ||
| "key": { | ||
| "B": { | ||
| "item": "sophisticatedbackpacks:upgrade_base" | ||
| }, | ||
| "R": { | ||
| "tag": "forge:dusts/redstone" | ||
| }, | ||
| "I": { | ||
| "tag": "forge:ingots/iron" | ||
| }, | ||
| "W": { | ||
| "item": "chipped:glassblower" | ||
| } | ||
| }, | ||
| "result": { | ||
| "item": "sophisticatedbackpacks:chipped/glassblower_workbench_upgrade" | ||
| } | ||
| } |
Oops, something went wrong.