Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More Mod Compat 7 #7321

Open
wants to merge 10 commits into
base: mc1.20.1/dev
Choose a base branch
from
Open

More Mod Compat 7 #7321

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
446cebc
More Mod Compat 5
Attack8 Sep 3, 2024
df5b6b1
Replace arl with zeta
Attack8 Sep 3, 2024
b6274a3
Change to blamejared maven
Attack8 Sep 3, 2024
8db1c02
Fix Silent Gems compat
Attack8 Sep 6, 2024
c485cb7
Add deepslate ores too
Attack8 Sep 6, 2024
769e41d
Merge branch 'mc1.20.1/dev' into mc1.20.1/mmc-5
Attack8 Jan 13, 2025
5ee0eca
Merge branch 'refs/heads/mc1.20.1/dev' into mc1.20.1/mmc-5
Attack8 Jan 28, 2025
199e88c
More Mod Compat 6
Attack8 Jan 30, 2025
93a6432
Fix a couple flowers
Attack8 Jan 30, 2025
70b6e83
More Mod Compat 7
Attack8 Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix a couple flowers
  • Loading branch information
@Attack8
Attack8 committed Jan 30, 2025
commit 93a6432a04116f544ac9a318891d317dab0d9dac
6 changes: 3 additions & 3 deletions src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2025-01-29T21:01:33.4085073 Create's Processing Recipes
// 1.20.1 2025-01-29T21:27:44.4421898 Create's Processing Recipes
3c94326fb730f68c1e44fe1e2ef09c9db6ffd92b data/create/recipes/compacting/andesite_from_flint.json
8d3d5b31f3601b9f681ff710e0545a483a1494c6 data/create/recipes/compacting/blaze_cake.json
8bd7f4e3a686ab520b2d55594d2018d0e9a50c91 data/create/recipes/compacting/chocolate.json
Expand Down Expand Up @@ -837,8 +837,6 @@ f556c021a6946a4e68af269d0eda26f8e0da53a4 data/create/recipes/milling/compat/biom
65d1d8848a38ced6f374cef7f0ec1b5ef89b9124 data/create/recipes/milling/compat/biomeswevegone/blue_rose_bush.json
5c5a25eff83c940fa06479d655a632ca503c34ac data/create/recipes/milling/compat/biomeswevegone/blue_sage.json
874b220d7ed6e255ede01bee6a125e1062b90b20 data/create/recipes/milling/compat/biomeswevegone/california_poppy.json
e329d95a63e33812fdd2498270375d510c2c6bf3 data/create/recipes/milling/compat/biomeswevegone/compat/biomeswevegone/white_sage.json
ec600bdc03ccc0707d03cbca12d8ba64d1ec7226 data/create/recipes/milling/compat/biomeswevegone/compat/biomeswevegone/winter_cyclamen.json
92372fc35eb824edb4cd03551c831b9e6d70ebd4 data/create/recipes/milling/compat/biomeswevegone/crocus.json
7a964502607216f1bdad70391b886d4beea8f9a2 data/create/recipes/milling/compat/biomeswevegone/cyan_amaranth.json
7e2a25ec601d6b5a0b80d903b0c4e608c0e5fcc4 data/create/recipes/milling/compat/biomeswevegone/cyan_rose.json
Expand Down Expand Up @@ -884,6 +882,8 @@ c769e53b9144a06b1cf132b8a640d5c75532423f data/create/recipes/milling/compat/biom
921b1995ef545ee66f2b755b9f5d52201c498555 data/create/recipes/milling/compat/biomeswevegone/white_allium_flower_bush.json
7b4ad96c5d5bf3fa5ca6c975f5046ba2fb6a6356 data/create/recipes/milling/compat/biomeswevegone/white_anemone.json
e1d063e3b362458ed9849a2328ee1ddb88c76dc8 data/create/recipes/milling/compat/biomeswevegone/white_puffball_cap.json
88f1a4fc5f87b517c5d2743d14ac1ba99ed2400b data/create/recipes/milling/compat/biomeswevegone/white_sage.json
218a0fb100ba4eeb9d640ea8ea5f2f563175f76e data/create/recipes/milling/compat/biomeswevegone/winter_cyclamen.json
c3840e423a60f1c0aff07df22d6a41df9edb566d data/create/recipes/milling/compat/biomeswevegone/winter_rose.json
c2f6848052be40aa9f6a37b51c987bbd202db161 data/create/recipes/milling/compat/biomeswevegone/winter_scilla.json
98fe97cd7de888b43ac64ea0293ed16127ae9c84 data/create/recipes/milling/compat/biomeswevegone/yellow_daffodil.json
Expand Down
2 changes: 1 addition & 1 deletion ...one/compat/biomeswevegone/white_sage.json → ...ing/compat/biomeswevegone/white_sage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"ingredients": [
{
"item": "biomeswevegone:compat/biomeswevegone/white_sage"
"item": "biomeswevegone:white_sage"
}
],
"processingTime": 50,
Expand Down
2 changes: 1 addition & 1 deletion ...ompat/biomeswevegone/winter_cyclamen.json → ...ompat/biomeswevegone/winter_cyclamen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"ingredients": [
{
"item": "biomeswevegone:compat/biomeswevegone/winter_cyclamen"
"item": "biomeswevegone:winter_cyclamen"
}
],
"processingTime": 50,
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/simibubi/create/foundation/data/recipe/MillingRecipeGen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,10 +484,10 @@ public class MillingRecipeGen extends ProcessingRecipeGen {
BWG_WHITE_ALLIUM_BUSH = bwgFlower("white_allium_flower_bush", List.of(1f,.05f,.25f),
List.of(Items.WHITE_DYE, Items.GREEN_DYE, Items.WHITE_DYE), List.of(3,2,2)),

BWG_WHITE_SAGE = bwgFlower(Mods.BWG.recipeId("white_sage"), List.of(1f, .1f),
BWG_WHITE_SAGE = bwgFlower("white_sage", List.of(1f, .1f),
List.of(Items.WHITE_DYE, Items.GRAY_DYE), List.of(2,1)),

BWG_WINTER_CYCLAMEN = bwgFlower(Mods.BWG.recipeId("winter_cyclamen"), List.of(1f, .1f),
BWG_WINTER_CYCLAMEN = bwgFlower("winter_cyclamen", List.of(1f, .1f),
List.of(Items.CYAN_DYE, Items.GREEN_DYE), List.of(2,1)),

BWG_WINTER_ROSE = bwgFlower("winter_rose", List.of(1f,.1f),
Expand Down