diff options
| author | shedaniel <daniel@shedaniel.me> | 2024-09-17 21:34:04 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-09-17 21:34:04 +0800 |
| commit | 3febdc4e1d6927f19d0de6fc8430765336d34d7e (patch) | |
| tree | e8cc88c46ce9b2ebf0954f94dcb56189f2fa5a1b /api/src/main/java/me/shedaniel/rei/impl/Internals.java | |
| parent | bc039e2d0a45409396c9156307d70529ccb28a3e (diff) | |
| parent | ccf3dcd60aa6c1d079dd57c59d9a89c2ca60b1e7 (diff) | |
| download | RoughlyEnoughItems-3febdc4e1d6927f19d0de6fc8430765336d34d7e.tar.gz RoughlyEnoughItems-3febdc4e1d6927f19d0de6fc8430765336d34d7e.tar.bz2 RoughlyEnoughItems-3febdc4e1d6927f19d0de6fc8430765336d34d7e.zip | |
Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2
# Conflicts:
# default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java
# fabric/src/main/resources/roughlyenoughitems.accessWidener
# runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java
# runtime/src/main/java/me/shedaniel/rei/impl/common/registry/RecipeManagerContextImpl.java
Diffstat (limited to 'api/src/main/java/me/shedaniel/rei/impl/Internals.java')
0 files changed, 0 insertions, 0 deletions