forked from Creators-of-Create/Create
-
Notifications
You must be signed in to change notification settings - Fork 203
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/mc1.19/fabric/dev' into mc1.20.1…
…/fabric/dev # Conflicts: # src/generated/resources/.cache/35806e87dccf1c56c630455071f2d6dfd38015f6 # src/generated/resources/.cache/3f8e2bfad643b52631e6eb80098aea304497f9a9 # src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba # src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9 # src/generated/resources/.cache/8374d11e7b3d6ea1837e31911da1439b12da9432 # src/generated/resources/.cache/899d321c4524b581eebda1c204a82d1a56a5eaa0 # src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139 # src/generated/resources/.cache/e0a39a97205b7149114f15de91b614248d05fd95 # src/generated/resources/assets/create/lang/en_ud.json # src/generated/resources/assets/create/lang/en_us.json # src/generated/resources/data/create/advancements/diving_suit_lava.json
- Loading branch information
Showing
10 changed files
with
10 additions
and
0 deletions.
There are no files selected for viewing
1 change: 1 addition & 0 deletions
1
src/generated/resources/data/create/tags/blocks/fan_processing_catalysts/blasting.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,4 +1,5 @@ | ||
| { | ||
| "replace": false, | ||
| "values": [ | ||
| "create:blaze_burner" | ||
| ] | ||
|
|
||
1 change: 1 addition & 0 deletions
1
src/generated/resources/data/create/tags/blocks/fan_processing_catalysts/haunting.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,4 +1,5 @@ | ||
| { | ||
| "replace": false, | ||
| "values": [ | ||
| "create:lit_blaze_burner", | ||
| "minecraft:soul_fire", | ||
|
|
||
1 change: 1 addition & 0 deletions
1
src/generated/resources/data/create/tags/blocks/fan_processing_catalysts/smoking.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,4 +1,5 @@ | ||
| { | ||
| "replace": false, | ||
| "values": [ | ||
| "create:blaze_burner", | ||
| "create:lit_blaze_burner", | ||
|
|
||
1 change: 1 addition & 0 deletions
1
src/generated/resources/data/create/tags/blocks/fan_processing_catalysts/splashing.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,3 +1,4 @@ | ||
| { | ||
| "replace": false, | ||
| "values": [] | ||
| } |
1 change: 1 addition & 0 deletions
1
src/generated/resources/data/create/tags/entity_types/blaze_burner_capturable.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,4 +1,5 @@ | ||
| { | ||
| "replace": false, | ||
| "values": [ | ||
| "minecraft:blaze" | ||
| ] | ||
|
|
||
1 change: 1 addition & 0 deletions
1
src/generated/resources/data/create/tags/fluids/fan_processing_catalysts/blasting.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,4 +1,5 @@ | ||
| { | ||
| "replace": false, | ||
| "values": [ | ||
| "minecraft:lava", | ||
| "minecraft:flowing_lava" | ||
|
|
||
1 change: 1 addition & 0 deletions
1
src/generated/resources/data/create/tags/fluids/fan_processing_catalysts/haunting.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,3 +1,4 @@ | ||
| { | ||
| "replace": false, | ||
| "values": [] | ||
| } |
1 change: 1 addition & 0 deletions
1
src/generated/resources/data/create/tags/fluids/fan_processing_catalysts/smoking.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,3 +1,4 @@ | ||
| { | ||
| "replace": false, | ||
| "values": [] | ||
| } |
1 change: 1 addition & 0 deletions
1
src/generated/resources/data/create/tags/fluids/fan_processing_catalysts/splashing.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,4 +1,5 @@ | ||
| { | ||
| "replace": false, | ||
| "values": [ | ||
| "minecraft:water", | ||
| "minecraft:flowing_water" | ||
|
|
||
1 change: 1 addition & 0 deletions
1
src/generated/resources/data/create/tags/recipe_serializer/automation_ignore.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,4 +1,5 @@ | ||
| { | ||
| "replace": false, | ||
| "values": [ | ||
| { | ||
| "id": "occultism:spirit_trade", | ||
|
|
||