| Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/history/DisplayEntry.java
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This reverts commit e11f3e6de3d0d3708061b765fb77dee0746aaf83.
|
|
# Conflicts:
# fabric/src/main/resources/error_notifier.json
|
|
# Conflicts:
# fabric/src/main/resources/error_notifier.json
|
|
# Conflicts:
# fabric/src/main/resources/error_notifier.json
|
|
|
|
|
|
|
|
# Conflicts:
# runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/CompositeDisplayViewingScreen.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListSearchManager.java
|
|
|
|
|