Skip to content

Commit

Permalink
Merge branch '72-make-hammering-recipes-support-count-' into 1.16-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
NovaMachina committed Dec 30, 2020
2 parents 504d668 + 67cd20f commit 5b1b071
Show file tree
Hide file tree
Showing 57 changed files with 515 additions and 220 deletions.
43 changes: 22 additions & 21 deletions generated/resources/.cache/cache
Expand Up @@ -256,7 +256,7 @@ f1cd4670ef02497f25429479818e0606d7aeef29 data/exnihilosequentia/recipes/compost/
108ca1cae2dd4c7cd31c6ef8eb8d55b55d0c9e92 data/exnihilosequentia/recipes/compost/vine.json
2fd34b65ecab679d6cb7d459359c80df89fc822a data/exnihilosequentia/recipes/compost/wheat.json
337ceb6493fbd76ff699c97248e0bb8b251e31d6 data/exnihilosequentia/recipes/cooked_silkworm.json
398ce28a05994cbe9dc700246fdca3919825804d data/exnihilosequentia/recipes/crook/leaves.json
d457298c752c66ccf103da1a1ac016619817a87b data/exnihilosequentia/recipes/crook/leaves.json
aff3112553d6f477a17e7b04fb96b4ff4ccdfdc1 data/exnihilosequentia/recipes/crook_andesite.json
b68758958cd2622859ab0f4647611636bbd0371e data/exnihilosequentia/recipes/crook_bone.json
322447895c3d302f12ea78dbc143ebb5f82c3c59 data/exnihilosequentia/recipes/crook_diamond.json
Expand Down Expand Up @@ -308,27 +308,28 @@ fbeb0f1f685e7e8ed93b5344155b67e5df7528e7 data/exnihilosequentia/recipes/fluid_it
f05e75cbf662d9bc1c57cdce69da118b60b58370 data/exnihilosequentia/recipes/fluid_item/tube_coral.json
ac03e4d8c4e455227ae6db12045ab23e6ca9a3d9 data/exnihilosequentia/recipes/fluid_on_top/cobblestone.json
e9876a96006eb91b6d829252c3c12253a387f2b2 data/exnihilosequentia/recipes/fluid_on_top/obsidian.json
61d502a2379e5298ae2ccc046d28a4064f3d8ee6 data/exnihilosequentia/recipes/fluid_transform/sea_water.json
983d5a14be1da063695dc58c08633a1e166c6f0f data/exnihilosequentia/recipes/fluid_transform/sea_water.json
88fc9b4ca53b03adc78bed1e4b85bbd08b58e2cd data/exnihilosequentia/recipes/fluid_transform/witch_water.json
1bbaceb9185383a8b2a80ee82de15c73d3a43323 data/exnihilosequentia/recipes/hammer/andesite.json
1c27154f3785e9a993b261ae94d3622248d91330 data/exnihilosequentia/recipes/hammer/brain_coral.json
09765d87437ab3d617859ea83d052362b24307c7 data/exnihilosequentia/recipes/hammer/brain_coral_fan.json
9323ced70cd24c6c63819de0936d6c77dda124e7 data/exnihilosequentia/recipes/hammer/bubble_coral.json
6f5ae4db3a22e4778c975c5192bb451a2cb711c6 data/exnihilosequentia/recipes/hammer/bubble_coral_fan.json
cba425b3121c58c8d7f6f58a39459ac44bd5a26c data/exnihilosequentia/recipes/hammer/cobblestone.json
7f77869973a3342025303632fcdf356ec453232d data/exnihilosequentia/recipes/hammer/diorite.json
b0f1344f4ee03a984898ae8bb82c023cbbdcc2aa data/exnihilosequentia/recipes/hammer/dust.json
691852bb148c510d17fbd715ccd99964134bf72f data/exnihilosequentia/recipes/hammer/end_stone.json
a11b612af66b34822a110a84747672b959ddaf92 data/exnihilosequentia/recipes/hammer/fire_coral.json
f7c17899931c54b3ac7dff6e5097de4731677e3c data/exnihilosequentia/recipes/hammer/fire_coral_fan.json
487330e5ec5b0bc373ceb5d3360044b834515706 data/exnihilosequentia/recipes/hammer/granite.json
beba1ad06d52e150005c674ab9d681b9688bf09a data/exnihilosequentia/recipes/hammer/gravel.json
fa9e7cb25b59589ad176558b6af7afc511f602d3 data/exnihilosequentia/recipes/hammer/horn_coral.json
39d4a2f44c89e08b50ac8b60dc829bdc7575cb9e data/exnihilosequentia/recipes/hammer/horn_coral_fan.json
8547a1a08330dabf16254625d0de9661d9c4742f data/exnihilosequentia/recipes/hammer/netherrack.json
cb65ae7b287b74213ef4145e5a9b83333528e99d data/exnihilosequentia/recipes/hammer/sand.json
57d69c1739ed382274f34125c1f68a3bd2097062 data/exnihilosequentia/recipes/hammer/tube_coral.json
334b1e2c912164bd9c976def3ad26e194749a2aa data/exnihilosequentia/recipes/hammer/tube_coral_fan.json
62de241babfd83804378a95e54ba9cc2c4e284f5 data/exnihilosequentia/recipes/hammer/andesite.json
9ac79c8f37a3685c786e1f9c4fbbe7f19ecc76d4 data/exnihilosequentia/recipes/hammer/brain_coral.json
8a4e653611a75e79d04029abd4ea5ab6d74cee33 data/exnihilosequentia/recipes/hammer/brain_coral_fan.json
2cc32d11fdae6d07ce1f980070c3408783f31cd3 data/exnihilosequentia/recipes/hammer/bubble_coral.json
b3a2aa1f50a8816cd1c80a0cc9d5c3e304f006cc data/exnihilosequentia/recipes/hammer/bubble_coral_fan.json
cfc7e4ec742333fed3085e1dc37f3250316b6a39 data/exnihilosequentia/recipes/hammer/cobblestone.json
fdfd2bb9c215294156804dcc1fc751e7f26471b7 data/exnihilosequentia/recipes/hammer/diorite.json
b8b41d24c22ade2087db154afbb864ec06f0582f data/exnihilosequentia/recipes/hammer/dust.json
7a042f7d6634725139ad13629371e5ea14254e86 data/exnihilosequentia/recipes/hammer/end_stone.json
b5c7cdb7cb578e8e427781c0d1bcf966126a4300 data/exnihilosequentia/recipes/hammer/fire_coral.json
8be6e52116e6936ef49b7857dba220cee5dea963 data/exnihilosequentia/recipes/hammer/fire_coral_fan.json
276eb95f1d8f31d7576950d49138cf27c2cc6f53 data/exnihilosequentia/recipes/hammer/granite.json
138069961934b8497429cc31a842a678d32d2c14 data/exnihilosequentia/recipes/hammer/gravel.json
d06056683a06474e78b0d95efaaa3a22b0bebce9 data/exnihilosequentia/recipes/hammer/horn_coral.json
4a1c42313213fb83b6c34d1d5f2fdc91d476c583 data/exnihilosequentia/recipes/hammer/horn_coral_fan.json
0324b0cda7e645f955f3ba5d77b230636348d89f data/exnihilosequentia/recipes/hammer/netherrack.json
0e711ddbc97d5c849ac58764797950a7059f7855 data/exnihilosequentia/recipes/hammer/sand.json
511db61e1c264fea56867240dfd2a7b52355c475 data/exnihilosequentia/recipes/hammer/test.json
3faa3bd752d103f4a5fac14eb16ab60401a713e9 data/exnihilosequentia/recipes/hammer/tube_coral.json
cd0b51bac4e9aabb6a6f34de37513de335604f30 data/exnihilosequentia/recipes/hammer/tube_coral_fan.json
659046259056718eba1edb7490901642405d3c67 data/exnihilosequentia/recipes/hammer_diamond.json
0c9a6a5f6158250f79a31872b180e835a0af2427 data/exnihilosequentia/recipes/hammer_gold.json
41839e8b0c6c8c8cd5bad9c1d4958e88c00ad688 data/exnihilosequentia/recipes/hammer_iron.json
Expand Down
Expand Up @@ -3,7 +3,8 @@
"results": [
{
"chance": 0.1,
"item": "exnihilosequentia:silkworm"
"item": "exnihilosequentia:silkworm",
"count": 1
}
],
"input": {
Expand Down
Expand Up @@ -4,7 +4,7 @@
"fluid": "minecraft:water"
},
"blockBelow": {
"item": "minecraft:sand"
"tag": "forge:sand"
},
"result": {
"fluid": "exnihilosequentia:sea_water"
Expand Down
@@ -1,9 +1,13 @@
{
"type": "exnihilosequentia:hammer",
"results": [
{
"chance": 1.0,
"item": "exnihilosequentia:crushed_andesite",
"count": 1
}
],
"input": {
"item": "minecraft:andesite"
},
"result": {
"item": "exnihilosequentia:crushed_andesite"
}
}
@@ -1,9 +1,13 @@
{
"type": "exnihilosequentia:hammer",
"results": [
{
"chance": 1.0,
"item": "minecraft:brain_coral",
"count": 1
}
],
"input": {
"item": "minecraft:brain_coral_block"
},
"result": {
"item": "minecraft:brain_coral"
}
}
@@ -1,9 +1,13 @@
{
"type": "exnihilosequentia:hammer",
"results": [
{
"chance": 1.0,
"item": "minecraft:brain_coral_fan",
"count": 1
}
],
"input": {
"item": "minecraft:brain_coral"
},
"result": {
"item": "minecraft:brain_coral_fan"
}
}
@@ -1,9 +1,13 @@
{
"type": "exnihilosequentia:hammer",
"results": [
{
"chance": 1.0,
"item": "minecraft:bubble_coral",
"count": 1
}
],
"input": {
"item": "minecraft:bubble_coral_block"
},
"result": {
"item": "minecraft:bubble_coral"
}
}
@@ -1,9 +1,13 @@
{
"type": "exnihilosequentia:hammer",
"results": [
{
"chance": 1.0,
"item": "minecraft:bubble_coral_fan",
"count": 1
}
],
"input": {
"item": "minecraft:bubble_coral"
},
"result": {
"item": "minecraft:bubble_coral_fan"
}
}
@@ -1,9 +1,13 @@
{
"type": "exnihilosequentia:hammer",
"results": [
{
"chance": 1.0,
"item": "minecraft:cobblestone",
"count": 1
}
],
"input": {
"item": "minecraft:stone"
},
"result": {
"item": "minecraft:cobblestone"
}
}
@@ -1,9 +1,13 @@
{
"type": "exnihilosequentia:hammer",
"results": [
{
"chance": 1.0,
"item": "exnihilosequentia:crushed_diorite",
"count": 1
}
],
"input": {
"item": "minecraft:diorite"
},
"result": {
"item": "exnihilosequentia:crushed_diorite"
}
}
@@ -1,9 +1,13 @@
{
"type": "exnihilosequentia:hammer",
"results": [
{
"chance": 1.0,
"item": "exnihilosequentia:dust",
"count": 1
}
],
"input": {
"item": "minecraft:sand"
},
"result": {
"item": "exnihilosequentia:dust"
}
}
@@ -1,9 +1,13 @@
{
"type": "exnihilosequentia:hammer",
"results": [
{
"chance": 1.0,
"item": "exnihilosequentia:crushed_end_stone",
"count": 1
}
],
"input": {
"item": "minecraft:end_stone"
},
"result": {
"item": "exnihilosequentia:crushed_end_stone"
}
}
@@ -1,9 +1,13 @@
{
"type": "exnihilosequentia:hammer",
"results": [
{
"chance": 1.0,
"item": "minecraft:fire_coral",
"count": 1
}
],
"input": {
"item": "minecraft:fire_coral_block"
},
"result": {
"item": "minecraft:fire_coral"
}
}
@@ -1,9 +1,13 @@
{
"type": "exnihilosequentia:hammer",
"results": [
{
"chance": 1.0,
"item": "minecraft:fire_coral_fan",
"count": 1
}
],
"input": {
"item": "minecraft:fire_coral"
},
"result": {
"item": "minecraft:fire_coral_fan"
}
}
@@ -1,9 +1,13 @@
{
"type": "exnihilosequentia:hammer",
"results": [
{
"chance": 1.0,
"item": "exnihilosequentia:crushed_granite",
"count": 1
}
],
"input": {
"item": "minecraft:granite"
},
"result": {
"item": "exnihilosequentia:crushed_granite"
}
}
@@ -1,9 +1,13 @@
{
"type": "exnihilosequentia:hammer",
"results": [
{
"chance": 1.0,
"item": "minecraft:gravel",
"count": 1
}
],
"input": {
"item": "minecraft:cobblestone"
},
"result": {
"item": "minecraft:gravel"
}
}
@@ -1,9 +1,13 @@
{
"type": "exnihilosequentia:hammer",
"results": [
{
"chance": 1.0,
"item": "minecraft:horn_coral",
"count": 1
}
],
"input": {
"item": "minecraft:horn_coral_block"
},
"result": {
"item": "minecraft:horn_coral"
}
}
@@ -1,9 +1,13 @@
{
"type": "exnihilosequentia:hammer",
"results": [
{
"chance": 1.0,
"item": "minecraft:horn_coral_fan",
"count": 1
}
],
"input": {
"item": "minecraft:horn_coral"
},
"result": {
"item": "minecraft:horn_coral_fan"
}
}
@@ -1,9 +1,13 @@
{
"type": "exnihilosequentia:hammer",
"results": [
{
"chance": 1.0,
"item": "exnihilosequentia:crushed_netherrack",
"count": 1
}
],
"input": {
"item": "minecraft:netherrack"
},
"result": {
"item": "exnihilosequentia:crushed_netherrack"
}
}
@@ -1,9 +1,13 @@
{
"type": "exnihilosequentia:hammer",
"results": [
{
"chance": 1.0,
"item": "minecraft:sand",
"count": 1
}
],
"input": {
"item": "minecraft:gravel"
},
"result": {
"item": "minecraft:sand"
}
}

0 comments on commit 5b1b071

Please sign in to comment.