Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-10 20:11:35 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'pr/5254' into mc1.18/dev

Browse source
This commit is contained in:
simibubi 2023-09-20 10:11:40 +02:00
commit b6e8f0128c
5 changed files with 137 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/generated/resources/.cache/cache
View file

@ -5354,8 +5354,8 @@ a1d4f4243cc2c700488fbfa292b483a7f43d4d58 data/create/tags/items/contraption_cont
c98ffdc2780c2a7690c590f46f014aeee7b0b504 data/create/tags/items/create_ingots.json c98ffdc2780c2a7690c590f46f014aeee7b0b504 data/create/tags/items/create_ingots.json
8699ff3a635e20ddfcda237feec30b48277c417f data/create/tags/items/crushed_raw_materials.json 8699ff3a635e20ddfcda237feec30b48277c417f data/create/tags/items/crushed_raw_materials.json
49847bfbea11808b5101c972023a7f5833fe5a14 data/create/tags/items/deployable_drink.json 49847bfbea11808b5101c972023a7f5833fe5a14 data/create/tags/items/deployable_drink.json
67385d5198d0796ec8f0d2c6ae144c672f4317a1 data/create/tags/items/modded_stripped_logs.json bc8248a29717ad7426329616ad360139b170c695 data/create/tags/items/modded_stripped_logs.json
27a1074a88a7b939c811341086afece325ed724c data/create/tags/items/modded_stripped_wood.json bb1de990ae480c6741d09b0677b2559c76788638 data/create/tags/items/modded_stripped_wood.json
8c8f6658ee72bdea2fcef77bade7bfa48de784c8 data/create/tags/items/pressurized_air_sources.json 8c8f6658ee72bdea2fcef77bade7bfa48de784c8 data/create/tags/items/pressurized_air_sources.json
bce28787b0271382842823d04a977912a88b01c2 data/create/tags/items/sandpaper.json bce28787b0271382842823d04a977912a88b01c2 data/create/tags/items/sandpaper.json
6cdeeac1689f7b5bfd9bc40b462143d8eaf3ad0b data/create/tags/items/seats.json 6cdeeac1689f7b5bfd9bc40b462143d8eaf3ad0b data/create/tags/items/seats.json

64
src/generated/resources/data/create/tags/items/modded_stripped_logs.json
View file

@ -289,6 +289,70 @@
"id": "blue_skies:stripped_cherry_log", "id": "blue_skies:stripped_cherry_log",
"required": false "required": false
}, },
{
"id": "environmental:stripped_cherry_log",
"required": false
},
{
"id": "environmental:stripped_willow_log",
"required": false
},
{
"id": "environmental:stripped_wisteria_log",
"required": false
},
{
"id": "atmospheric:stripped_aspen_log",
"required": false
},
{
"id": "atmospheric:stripped_kousa_log",
"required": false
},
{
"id": "atmospheric:stripped_yucca_log",
"required": false
},
{
"id": "atmospheric:stripped_morado_log",
"required": false
},
{
"id": "atmospheric:stripped_rosewood_log",
"required": false
},
{
"id": "atmospheric:stripped_grimwood_log",
"required": false
},
{
"id": "goodending:stripped_muddy_oak_log",
"required": false
},
{
"id": "goodending:stripped_cypress_log",
"required": false
},
{
"id": "biomemakeover:stripped_blighted_balsa_log",
"required": false
},
{
"id": "biomemakeover:stripped_willow_log",
"required": false
},
{
"id": "biomemakeover:stripped_swamp_cypress_log",
"required": false
},
{
"id": "biomemakeover:stripped_ancient_oak_log",
"required": false
},
{
"id": "infernalexp:stripped_luminous_stem",
"required": false
},
{ {
"id": "byg:stripped_bulbis_stem", "id": "byg:stripped_bulbis_stem",
"required": false "required": false

64
src/generated/resources/data/create/tags/items/modded_stripped_wood.json
View file

@ -289,6 +289,70 @@
"id": "blue_skies:stripped_cherry_wood", "id": "blue_skies:stripped_cherry_wood",
"required": false "required": false
}, },
{
"id": "environmental:stripped_cherry_wood",
"required": false
},
{
"id": "environmental:stripped_willow_wood",
"required": false
},
{
"id": "environmental:stripped_wisteria_wood",
"required": false
},
{
"id": "atmospheric:stripped_aspen_wood",
"required": false
},
{
"id": "atmospheric:stripped_kousa_wood",
"required": false
},
{
"id": "atmospheric:stripped_yucca_wood",
"required": false
},
{
"id": "atmospheric:stripped_morado_wood",
"required": false
},
{
"id": "atmospheric:stripped_rosewood",
"required": false
},
{
"id": "atmospheric:stripped_grimwood",
"required": false
},
{
"id": "goodending:stripped_muddy_oak_wood",
"required": false
},
{
"id": "goodending:stripped_cypress_wood",
"required": false
},
{
"id": "biomemakeover:stripped_blighted_balsa_wood",
"required": false
},
{
"id": "biomemakeover:stripped_willow_wood",
"required": false
},
{
"id": "biomemakeover:stripped_swamp_cypress_wood",
"required": false
},
{
"id": "biomemakeover:stripped_ancient_oak_wood",
"required": false
},
{
"id": "infernalexp:stripped_luminous_hyphae",
"required": false
},
{ {
"id": "byg:stripped_bulbis_wood", "id": "byg:stripped_bulbis_wood",
"required": false "required": false

1
src/main/java/com/simibubi/create/foundation/data/TagGen.java
View file

@ -48,4 +48,5 @@ public class TagGen {
} }
return appender; return appender;
} }
} }

6
src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java
View file

@ -26,6 +26,12 @@ public enum Mods {
TF("twilightforest"), TF("twilightforest"),
ECO("ecologics"), ECO("ecologics"),
ENV("environmental"),
ATM("atmospheric"),
ATM_2("atmospheric", b -> b.omitWoodSuffix()),
IX("infernalexp"),
GOOD("goodending"),
BMK("biomemakeover")
; ;
private final String id; private final String id;