-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add mekanism, applied mekanistics, ae2things, + fix some bugs
Fix mis copy for kb in a storage cell + fix drops
- Loading branch information
Showing
67 changed files
with
2,695 additions
and
362 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
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
45 changes: 45 additions & 0 deletions
45
src/generated/resources/data/ae2additions/recipes/cells/chemical/1024k.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,45 @@ | ||
| { | ||
| "type": "forge:conditional", | ||
| "recipes": [ | ||
| { | ||
| "conditions": [ | ||
| { | ||
| "type": "forge:and", | ||
| "values": [ | ||
| { | ||
| "type": "forge:mod_loaded", | ||
| "modid": "appmek" | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "recipe": { | ||
| "type": "minecraft:crafting_shaped", | ||
| "category": "misc", | ||
| "key": { | ||
| "a": { | ||
| "item": "ae2:quartz_glass" | ||
| }, | ||
| "b": { | ||
| "item": "ae2:fluix_dust" | ||
| }, | ||
| "c": { | ||
| "item": "ae2additions:cell_component_1024" | ||
| }, | ||
| "d": { | ||
| "tag": "forge:ingots/osmium" | ||
| } | ||
| }, | ||
| "pattern": [ | ||
| "aba", | ||
| "bcb", | ||
| "ddd" | ||
| ], | ||
| "result": { | ||
| "item": "ae2additions:chemical_storage_cell_1024" | ||
| }, | ||
| "show_notification": true | ||
| } | ||
| } | ||
| ] | ||
| } |
45 changes: 45 additions & 0 deletions
45
src/generated/resources/data/ae2additions/recipes/cells/chemical/16384k.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,45 @@ | ||
| { | ||
| "type": "forge:conditional", | ||
| "recipes": [ | ||
| { | ||
| "conditions": [ | ||
| { | ||
| "type": "forge:and", | ||
| "values": [ | ||
| { | ||
| "type": "forge:mod_loaded", | ||
| "modid": "appmek" | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "recipe": { | ||
| "type": "minecraft:crafting_shaped", | ||
| "category": "misc", | ||
| "key": { | ||
| "a": { | ||
| "item": "ae2:quartz_glass" | ||
| }, | ||
| "b": { | ||
| "item": "ae2:fluix_dust" | ||
| }, | ||
| "c": { | ||
| "item": "ae2additions:cell_component_16384" | ||
| }, | ||
| "d": { | ||
| "tag": "forge:ingots/osmium" | ||
| } | ||
| }, | ||
| "pattern": [ | ||
| "aba", | ||
| "bcb", | ||
| "ddd" | ||
| ], | ||
| "result": { | ||
| "item": "ae2additions:chemical_storage_cell_16384" | ||
| }, | ||
| "show_notification": true | ||
| } | ||
| } | ||
| ] | ||
| } |
45 changes: 45 additions & 0 deletions
45
src/generated/resources/data/ae2additions/recipes/cells/chemical/4096k.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,45 @@ | ||
| { | ||
| "type": "forge:conditional", | ||
| "recipes": [ | ||
| { | ||
| "conditions": [ | ||
| { | ||
| "type": "forge:and", | ||
| "values": [ | ||
| { | ||
| "type": "forge:mod_loaded", | ||
| "modid": "appmek" | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "recipe": { | ||
| "type": "minecraft:crafting_shaped", | ||
| "category": "misc", | ||
| "key": { | ||
| "a": { | ||
| "item": "ae2:quartz_glass" | ||
| }, | ||
| "b": { | ||
| "item": "ae2:fluix_dust" | ||
| }, | ||
| "c": { | ||
| "item": "ae2additions:cell_component_4096" | ||
| }, | ||
| "d": { | ||
| "tag": "forge:ingots/osmium" | ||
| } | ||
| }, | ||
| "pattern": [ | ||
| "aba", | ||
| "bcb", | ||
| "ddd" | ||
| ], | ||
| "result": { | ||
| "item": "ae2additions:chemical_storage_cell_4096" | ||
| }, | ||
| "show_notification": true | ||
| } | ||
| } | ||
| ] | ||
| } |
33 changes: 33 additions & 0 deletions
33
src/generated/resources/data/ae2additions/recipes/cells/chemical/casing-1024k.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,33 @@ | ||
| { | ||
| "type": "forge:conditional", | ||
| "recipes": [ | ||
| { | ||
| "conditions": [ | ||
| { | ||
| "type": "forge:and", | ||
| "values": [ | ||
| { | ||
| "type": "forge:mod_loaded", | ||
| "modid": "appmek" | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "recipe": { | ||
| "type": "minecraft:crafting_shapeless", | ||
| "category": "misc", | ||
| "ingredients": [ | ||
| { | ||
| "item": "appmek:chemical_cell_housing" | ||
| }, | ||
| { | ||
| "item": "ae2additions:cell_component_1024" | ||
| } | ||
| ], | ||
| "result": { | ||
| "item": "ae2additions:chemical_storage_cell_1024" | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } |
33 changes: 33 additions & 0 deletions
33
src/generated/resources/data/ae2additions/recipes/cells/chemical/casing-16384k.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,33 @@ | ||
| { | ||
| "type": "forge:conditional", | ||
| "recipes": [ | ||
| { | ||
| "conditions": [ | ||
| { | ||
| "type": "forge:and", | ||
| "values": [ | ||
| { | ||
| "type": "forge:mod_loaded", | ||
| "modid": "appmek" | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "recipe": { | ||
| "type": "minecraft:crafting_shapeless", | ||
| "category": "misc", | ||
| "ingredients": [ | ||
| { | ||
| "item": "appmek:chemical_cell_housing" | ||
| }, | ||
| { | ||
| "item": "ae2additions:cell_component_16384" | ||
| } | ||
| ], | ||
| "result": { | ||
| "item": "ae2additions:chemical_storage_cell_16384" | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } |
33 changes: 33 additions & 0 deletions
33
src/generated/resources/data/ae2additions/recipes/cells/chemical/casing-4096k.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,33 @@ | ||
| { | ||
| "type": "forge:conditional", | ||
| "recipes": [ | ||
| { | ||
| "conditions": [ | ||
| { | ||
| "type": "forge:and", | ||
| "values": [ | ||
| { | ||
| "type": "forge:mod_loaded", | ||
| "modid": "appmek" | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "recipe": { | ||
| "type": "minecraft:crafting_shapeless", | ||
| "category": "misc", | ||
| "ingredients": [ | ||
| { | ||
| "item": "appmek:chemical_cell_housing" | ||
| }, | ||
| { | ||
| "item": "ae2additions:cell_component_4096" | ||
| } | ||
| ], | ||
| "result": { | ||
| "item": "ae2additions:chemical_storage_cell_4096" | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } |
40 changes: 40 additions & 0 deletions
40
src/generated/resources/data/ae2additions/recipes/cells/chemical/disk-1-casing.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,40 @@ | ||
| { | ||
| "type": "forge:conditional", | ||
| "recipes": [ | ||
| { | ||
| "conditions": [ | ||
| { | ||
| "type": "forge:and", | ||
| "values": [ | ||
| { | ||
| "type": "forge:mod_loaded", | ||
| "modid": "ae2things" | ||
| }, | ||
| { | ||
| "type": "forge:mod_loaded", | ||
| "modid": "appmek" | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "recipe": { | ||
| "type": "minecraft:crafting_shapeless", | ||
| "category": "misc", | ||
| "ingredients": [ | ||
| { | ||
| "item": "ae2additions:disk_chemical_housing" | ||
| }, | ||
| { | ||
| "item": "ae2:cell_component_1k" | ||
| }, | ||
| { | ||
| "tag": "mekanism:alloys/infused" | ||
| } | ||
| ], | ||
| "result": { | ||
| "item": "ae2additions:disk_chemical_1k" | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.