-
Notifications
You must be signed in to change notification settings - Fork 0
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 #21 from MeepishRealms/dev
Merge v1.0.1 from Dev to Main
- Loading branch information
Showing
8 changed files
with
109 additions
and
32 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
20 changes: 20 additions & 0 deletions
20
overrides/config/paxi/datapacks/coordinator/data/core/recipes/propeller.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,20 @@ | ||
| { | ||
| "type": "crafting_shaped", | ||
| "pattern": [ | ||
| " Z ", | ||
| "ZAZ", | ||
| " Z " | ||
| ], | ||
| "key": { | ||
| "A": { | ||
| "item": "create:andesite_alloy" | ||
| }, | ||
| "Z": { | ||
| "item": "create:zinc_ingot" | ||
| } | ||
| }, | ||
| "result": { | ||
| "item": "create:propeller", | ||
| "count": 1 | ||
| } | ||
| } |
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
56 changes: 54 additions & 2 deletions
56
...rides/config/paxi/datapacks/coordinator/data/minecraft/tags/blocks/needs_stone_tools.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 |
|---|---|---|
| @@ -1,6 +1,58 @@ | ||
| { | ||
| "replace": false, | ||
| "replace": true, | ||
| "values": [ | ||
| "create:zinc_ore" | ||
| "create:zinc_ore", | ||
| "create:deepslate_zinc_ore", | ||
| "create:raw_zinc_block", | ||
| "create:zinc_block", | ||
| "create:brass_block", | ||
| "create:copper_shingles", | ||
| "create:exposed_copper_shingles", | ||
| "create:weathered_copper_shingles", | ||
| "create:oxidized_copper_shingles", | ||
| "create:copper_shingle_slab", | ||
| "create:exposed_copper_shingle_slab", | ||
| "create:weathered_copper_shingle_slab", | ||
| "create:oxidized_copper_shingle_slab", | ||
| "create:copper_shingle_stairs", | ||
| "create:exposed_copper_shingle_stairs", | ||
| "create:weathered_copper_shingle_stairs", | ||
| "create:oxidized_copper_shingle_stairs", | ||
| "create:waxed_copper_shingles", | ||
| "create:waxed_exposed_copper_shingles", | ||
| "create:waxed_weathered_copper_shingles", | ||
| "create:waxed_oxidized_copper_shingles", | ||
| "create:waxed_copper_shingle_slab", | ||
| "create:waxed_exposed_copper_shingle_slab", | ||
| "create:waxed_weathered_copper_shingle_slab", | ||
| "create:waxed_oxidized_copper_shingle_slab", | ||
| "create:waxed_copper_shingle_stairs", | ||
| "create:waxed_exposed_copper_shingle_stairs", | ||
| "create:waxed_weathered_copper_shingle_stairs", | ||
| "create:waxed_oxidized_copper_shingle_stairs", | ||
| "create:copper_tiles", | ||
| "create:exposed_copper_tiles", | ||
| "create:weathered_copper_tiles", | ||
| "create:oxidized_copper_tiles", | ||
| "create:copper_tile_slab", | ||
| "create:exposed_copper_tile_slab", | ||
| "create:weathered_copper_tile_slab", | ||
| "create:oxidized_copper_tile_slab", | ||
| "create:copper_tile_stairs", | ||
| "create:exposed_copper_tile_stairs", | ||
| "create:weathered_copper_tile_stairs", | ||
| "create:oxidized_copper_tile_stairs", | ||
| "create:waxed_copper_tiles", | ||
| "create:waxed_exposed_copper_tiles", | ||
| "create:waxed_weathered_copper_tiles", | ||
| "create:waxed_oxidized_copper_tiles", | ||
| "create:waxed_copper_tile_slab", | ||
| "create:waxed_exposed_copper_tile_slab", | ||
| "create:waxed_weathered_copper_tile_slab", | ||
| "create:waxed_oxidized_copper_tile_slab", | ||
| "create:waxed_copper_tile_stairs", | ||
| "create:waxed_exposed_copper_tile_stairs", | ||
| "create:waxed_weathered_copper_tile_stairs", | ||
| "create:waxed_oxidized_copper_tile_stairs" | ||
| ] | ||
| } |
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,8 +1,8 @@ | ||
| { | ||
| "version": "v3.0.0-alpha_1", | ||
| "version": "v3.1.0", | ||
| "branch": "v3", | ||
| "tags": [ | ||
| "live" | ||
| "release" | ||
| ], | ||
| "cooresponds": "pcog-alpha" | ||
| "cooresponds": "project_cog" | ||
| } |
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,6 +1,8 @@ | ||
| { | ||
| "version": "v1.0.0", | ||
| "build": "1", | ||
| "branch": "dev", | ||
| "branch": "v1", | ||
| "tags": [ | ||
| "release" | ||
| ], | ||
| "cooresponds": "project_cog" | ||
| } |