diff options
| author | shedaniel <daniel@shedaniel.me> | 2024-04-16 00:43:25 +0900 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-04-16 00:43:25 +0900 |
| commit | 5b03bcea21701b4dd7b0ae40aec7f448fd3513f3 (patch) | |
| tree | b2082db7c8a52f6c1a77197a7b6fe4bb43914407 /runtime/src | |
| parent | a01b505ffcdb3ab1c4cf8fcc3aeaaef06c517f82 (diff) | |
| parent | 2af03ce523320bab4b4086f0661f80e466c14477 (diff) | |
| download | RoughlyEnoughItems-5b03bcea21701b4dd7b0ae40aec7f448fd3513f3.tar.gz RoughlyEnoughItems-5b03bcea21701b4dd7b0ae40aec7f448fd3513f3.tar.bz2 RoughlyEnoughItems-5b03bcea21701b4dd7b0ae40aec7f448fd3513f3.zip | |
Merge remote-tracking branch 'origin/feature/9.2' into feature/11.1
# Conflicts:
# default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.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/FilteringScreen.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/gui/performance/PerformanceScreen.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/basewidgets/PanelWidget.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/PaginatedEntryListWidget.java
Diffstat (limited to 'runtime/src')