forked from GL33P-0R4NG3/oreganized
-
-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
0bdb8d0
commit 977035a
Showing
8 changed files
with
167 additions
and
421 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
99 changes: 32 additions & 67 deletions
99
src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.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,167 +1,132 @@ | ||
| { | ||
| "values": [ | ||
| <<<<<<< HEAD | ||
| "oreganized:waxed_red_concrete_powder", | ||
| "oreganized:waxed_purple_concrete_powder", | ||
| "oreganized:waxed_light_blue_concrete_powder", | ||
| "oreganized:waxed_pink_concrete_powder", | ||
| "oreganized:waxed_maroon_concrete_powder", | ||
| "oreganized:waxed_lime_concrete_powder", | ||
| "oreganized:waxed_rose_concrete_powder", | ||
| "oreganized:waxed_mint_concrete_powder", | ||
| "oreganized:waxed_beige_concrete_powder", | ||
| "oreganized:waxed_gray_concrete_powder", | ||
| "oreganized:waxed_olive_concrete_powder", | ||
| "oreganized:waxed_navy_concrete_powder", | ||
| "oreganized:waxed_amber_concrete_powder", | ||
| "oreganized:waxed_verdant_concrete_powder", | ||
| "oreganized:waxed_blue_concrete_powder", | ||
| "oreganized:waxed_yellow_concrete_powder", | ||
| "oreganized:waxed_aqua_concrete_powder", | ||
| "oreganized:waxed_ginger_concrete_powder", | ||
| "oreganized:waxed_brown_concrete_powder", | ||
| "oreganized:waxed_cyan_concrete_powder", | ||
| "oreganized:waxed_green_concrete_powder", | ||
| "oreganized:waxed_light_gray_concrete_powder", | ||
| "oreganized:waxed_coral_concrete_powder", | ||
| "oreganized:waxed_tan_concrete_powder", | ||
| "oreganized:waxed_indigo_concrete_powder", | ||
| "oreganized:waxed_white_concrete_powder", | ||
| "oreganized:waxed_teal_concrete_powder", | ||
| "oreganized:waxed_forest_concrete_powder", | ||
| "oreganized:waxed_orange_concrete_powder", | ||
| "oreganized:waxed_magenta_concrete_powder", | ||
| "oreganized:waxed_black_concrete_powder", | ||
| "oreganized:waxed_slate_concrete_powder" | ||
| ======= | ||
| { | ||
| "id": "oreganized:waxed_mint_concrete_powder", | ||
| "id": "oreganized:waxed_olive_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_tan_concrete_powder", | ||
| "id": "oreganized:waxed_yellow_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_teal_concrete_powder", | ||
| "id": "oreganized:waxed_white_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_orange_concrete_powder", | ||
| "id": "oreganized:waxed_red_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_black_concrete_powder", | ||
| "id": "oreganized:waxed_navy_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_gray_concrete_powder", | ||
| "id": "oreganized:waxed_purple_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_aqua_concrete_powder", | ||
| "id": "oreganized:waxed_coral_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_olive_concrete_powder", | ||
| "id": "oreganized:waxed_blue_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_forest_concrete_powder", | ||
| "id": "oreganized:waxed_aqua_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_ginger_concrete_powder", | ||
| "id": "oreganized:waxed_tan_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_light_blue_concrete_powder", | ||
| "id": "oreganized:waxed_indigo_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_navy_concrete_powder", | ||
| "id": "oreganized:waxed_beige_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_light_gray_concrete_powder", | ||
| "id": "oreganized:waxed_lime_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_magenta_concrete_powder", | ||
| "id": "oreganized:waxed_gray_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_yellow_concrete_powder", | ||
| "id": "oreganized:waxed_light_gray_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_slate_concrete_powder", | ||
| "id": "oreganized:waxed_black_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_green_concrete_powder", | ||
| "id": "oreganized:waxed_teal_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_blue_concrete_powder", | ||
| "id": "oreganized:waxed_magenta_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_lime_concrete_powder", | ||
| "id": "oreganized:waxed_slate_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_white_concrete_powder", | ||
| "id": "oreganized:waxed_verdant_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_maroon_concrete_powder", | ||
| "id": "oreganized:waxed_forest_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_red_concrete_powder", | ||
| "id": "oreganized:waxed_ginger_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_verdant_concrete_powder", | ||
| "id": "oreganized:waxed_light_blue_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_amber_concrete_powder", | ||
| "id": "oreganized:waxed_cyan_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_pink_concrete_powder", | ||
| "id": "oreganized:waxed_maroon_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_purple_concrete_powder", | ||
| "id": "oreganized:waxed_orange_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_beige_concrete_powder", | ||
| "id": "oreganized:waxed_green_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_cyan_concrete_powder", | ||
| "id": "oreganized:waxed_pink_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_rose_concrete_powder", | ||
| "id": "oreganized:waxed_amber_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_coral_concrete_powder", | ||
| "id": "oreganized:waxed_rose_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_indigo_concrete_powder", | ||
| "id": "oreganized:waxed_brown_concrete_powder", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "oreganized:waxed_brown_concrete_powder", | ||
| "id": "oreganized:waxed_mint_concrete_powder", | ||
| "required": false | ||
| } | ||
| >>>>>>> b08426a (various fixes:) | ||
| ] | ||
| } |
Oops, something went wrong.