aboutsummaryrefslogtreecommitdiff
path: root/runtime/src
AgeCommit message (Collapse)Author
2024-08-14Merge remote-tracking branch 'origin/15.x-1.20.5' into 16.x-1.21shedaniel
Fixes #1665 Fixes #1662 Fixes #1663
2024-08-14Fix #1666shedaniel
2024-07-22Merge remote-tracking branch 'refs/remotes/origin/15.x-1.20.5' into 16.x-1.21shedaniel
# Conflicts: # gradle.properties
2024-07-22Merge remote-tracking branch 'refs/remotes/origin/14.x-1.20.4' into 15.x-1.20.5shedaniel
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/impl/common/transfer/InputSlotCrafter.java
2024-07-22Merge remote-tracking branch 'refs/remotes/origin/13.x-1.20.2' into 14.x-1.20.4shedaniel
2024-07-22Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2shedaniel
2024-07-22Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20shedaniel
2024-07-22Merge remote-tracking branch 'refs/remotes/origin/9.x-1.19' into 11.x-1.19.4shedaniel
2024-07-22Check slots before modificationshedaniel
2024-06-17Update to 1.21shedaniel
2024-04-30Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.5shedaniel
2024-04-30Merge remote-tracking branch 'origin/13.x-1.20.2' into 14.x-1.20.4shedaniel
2024-04-30Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2shedaniel
2024-04-30Merge remote-tracking branch 'origin/9.x-1.19' into 12.x-1.20shedaniel
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/components/ConfigGroupWidget.java
2024-04-30Fix #1614shedaniel
2024-04-30Fix #1620shedaniel
2024-04-25Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.5shedaniel
2024-04-25Merge remote-tracking branch 'origin/13.x-1.20.2' into 14.x-1.20.4shedaniel
2024-04-25Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2shedaniel
2024-04-25Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20shedaniel
2024-04-25Merge remote-tracking branch 'origin/9.x-1.19' into 11.x-1.19.4shedaniel
2024-04-25Fix #1611shedaniel
2024-04-25Add option for rainbowshedaniel
2024-04-25Update to 1.20.5shedaniel
2024-04-25Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.5shedaniel
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/CollapsibleEntryWidget.java
2024-04-17Merge remote-tracking branch 'origin/13.x-1.20.2' into 14.x-1.20.4shedaniel
2024-04-17Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2shedaniel
2024-04-17Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20shedaniel
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/CollapsibleEntryWidget.java
2024-04-17Merge remote-tracking branch 'origin/9.x-1.19' into 11.x-1.19.4shedaniel
# Conflicts: # default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java
2024-04-17Retain displays ordershedaniel
2024-04-17Add display validator, Fix #1610shedaniel
2024-04-16Fix collapsible entry configure button not rendering the icon at the correct ↵shedaniel
location
2024-04-16Fix boundaries screenshedaniel
2024-04-16Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.5shedaniel
# 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
2024-04-16Fix merge conflictsshedaniel
2024-04-16Merge remote-tracking branch 'origin/feature/13.1' into feature/14.1shedaniel
# Conflicts: # gradle.properties # 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
2024-04-16Fix merge conflictsshedaniel
2024-04-16Merge branch 'feature/12.1' into feature/13.1shedaniel
# Conflicts: # gradle.properties # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/changelog/ChangelogLoader.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/UncertainDisplayViewingScreen.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/OverflowWidget.java
2024-04-16Fix merge conflictsshedaniel
2024-04-16Merge remote-tracking branch 'origin/feature/11.1' into feature/12.1shedaniel
# 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
2024-04-16Merge branch 'feature/9.2' into feature/11.1shedaniel
2024-04-16Fix crash searching illegal charactersshedaniel
2024-04-16Fix merge conflictsshedaniel
2024-04-16Merge remote-tracking branch 'origin/feature/9.2' into feature/11.1shedaniel
# 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
2024-04-16Improve searching configsshedaniel
2024-04-16Fix cherrypick conflictsshedaniel
2024-04-16Update localisationshedaniel
2024-04-16Add back previews to config groupsshedaniel
2024-04-16Add async search optionshedaniel
2024-04-16Return to the first page of the collapsed groupshedaniel
generated by cgit (git 2.34.1) at 2026-06-21 23:49:13 +0000