diff options
| author | shedaniel <daniel@shedaniel.me> | 2024-04-16 02:26:19 +0900 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-04-16 03:21:35 +0900 |
| commit | a377a5bf80f3f93ef788b9fcd4ceb5c529219cb7 (patch) | |
| tree | 62cd12da4a32ce1f9a727db983a36d7e460b3fce /runtime/src/main | |
| parent | fccc677951d7d5352ab7bf154951b7198d440e90 (diff) | |
| parent | f105040ca748544101f4fb829af8604d036447ed (diff) | |
| download | RoughlyEnoughItems-a377a5bf80f3f93ef788b9fcd4ceb5c529219cb7.tar.gz RoughlyEnoughItems-a377a5bf80f3f93ef788b9fcd4ceb5c529219cb7.tar.bz2 RoughlyEnoughItems-a377a5bf80f3f93ef788b9fcd4ceb5c529219cb7.zip | |
Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.5
# Conflicts:
# default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java
# default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java
# gradle.properties
# 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/FilteringRulesScreen.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/EntryWidget.java
Diffstat (limited to 'runtime/src/main')