diff options
| author | shedaniel <daniel@shedaniel.me> | 2024-04-16 01:12:21 +0900 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-04-16 01:12:21 +0900 |
| commit | 6788d2b65edfd1b24f84bd92fbf66ec4098537d6 (patch) | |
| tree | 1d09b18e7a3fe20c6526d125c6e65cff7f594ece /runtime | |
| parent | e26d21c36b425389e5ff1078a7017f23c7159d1b (diff) | |
| parent | 7717b20cd2f41731bf94ce4c8ee44d3ed63e86f7 (diff) | |
| download | RoughlyEnoughItems-6788d2b65edfd1b24f84bd92fbf66ec4098537d6.tar.gz RoughlyEnoughItems-6788d2b65edfd1b24f84bd92fbf66ec4098537d6.tar.bz2 RoughlyEnoughItems-6788d2b65edfd1b24f84bd92fbf66ec4098537d6.zip | |
Merge remote-tracking branch 'origin/feature/11.1' into feature/12.1
# Conflicts:
# api/src/main/java/me/shedaniel/rei/api/client/favorites/CompoundFavoriteRenderer.java
# api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/WidgetWithBounds.java
# gradle.properties
# runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ConfigureCategoriesScreen.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringAddRuleScreen.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringCategoriesEntry.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringEntry.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/NoFilteringCategoriesEntry.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/NoFilteringEntry.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/RecipeScreenTypeEntry.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ReloadPluginsEntry.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/SearchFilterSyntaxHighlightingEntry.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/TitleTextEntry.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/dragging/CurrentDraggingStack.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/Menu.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/entry/PerformanceEntry.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/UncertainDisplayViewingScreen.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/generic/OptionEntriesScreen.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/DisplayCompositeWidget.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/DisplayTooltipComponent.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/DynamicErrorFreeEntryListWidget.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/TabContainerWidget.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/basewidgets/PanelWidget.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/PaginatedEntryListWidget.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/trash/TrashWidget.java
# runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java
Diffstat (limited to 'runtime')