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
+3,471 −2,180
Open

More Mod Compat 7 #7321

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
Merge branch 'refs/heads/mc1.20.1/dev' into mc1.20.1/mmc-5 
# Conflicts:
#	src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034
  • Loading branch information
@Attack8
Attack8 committed Jan 28, 2025
commit 5ee0eca59e3b175859da5217812ee83bdbb79fdf
2 changes: 1 addition & 1 deletion 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 2024-09-06T15:13:15.0209174 Create's Processing Recipes
// 1.20.1 2024-12-15T23:26:23.3573034 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
You are viewing a condensed version of this merge commit. You can view the full changes here.