aboutsummaryrefslogtreecommitdiff
path: root/runtime/src/main/java/me/shedaniel/rei/impl/common
AgeCommit message (Collapse)Author
2025-04-10Update to 1.21.5shedaniel
2025-04-10Fix compile errorshedaniel
2025-04-03Merge remote-tracking branch 'origin/16.x-1.21' into 17.x-1.21.2shedaniel
2025-02-12Fix shift click issue (#1821)Yusarnn
2024-11-10Fix #1751shedaniel
2024-10-26Update to 1.21.2 (Please read Primer)shedaniel
https://hackmd.io/@shedaniel/rei17_primer
2024-09-17Merge remote-tracking branch 'origin/15.x-1.20.5' into 16.x-1.21shedaniel
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java
2024-09-17Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.5shedaniel
# Conflicts: # api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java # api/src/main/java/me/shedaniel/rei/impl/Internals.java # default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java # fabric/src/main/resources/roughlyenoughitems.accessWidener # runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/PerformanceScreen.java
2024-09-17Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2shedaniel
# Conflicts: # default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java # fabric/src/main/resources/roughlyenoughitems.accessWidener # runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java # runtime/src/main/java/me/shedaniel/rei/impl/common/registry/RecipeManagerContextImpl.java
2024-09-17Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20shedaniel
# Conflicts: # default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java # fabric/src/main/resources/roughlyenoughitems.accessWidener # forge/src/main/resources/META-INF/accesstransformer.cfg
2024-09-17Merge remote-tracking branch 'origin/9.x-1.19' into 11.x-1.19.4shedaniel
# Conflicts: # fabric/src/main/resources/roughlyenoughitems.accessWidener # forge/src/main/resources/META-INF/accesstransformer.cfg
2024-09-06New plugin reload setupshedaniel
1. Plugin reloads will now interrupt existing reloading tasks if a new plugin reload has been requested 2. Plugin reloads will be automatically interrupted when the player leaves the level / the level is removed 3. More logging in DisplayRegistryImpl showing the stats of displays 4. Failure in filling recipes will now not stop the caching of display lookup 5. Slightly improve performance of checking display visibility on display lookup
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 '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-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-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-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 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-16Fix cherrypickshedaniel
2024-04-16Improve Widgets creationshedaniel
2024-04-16Fix rebase conflictsshedaniel
2024-04-16Fix merge conflictsshedaniel
2024-04-16Close #1249shedaniel
2024-04-16Implement Unified Ingredientsshedaniel
2024-04-10Update to 24w14ashedaniel
2024-03-02Update to 24w09ashedaniel
2023-11-02Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2shedaniel
# Conflicts: # fabric/src/main/resources/roughlyenoughitems.accessWidener
2023-10-24Rewrite how creative mode tab items are collectedshedaniel
2023-10-23Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2shedaniel
2023-10-23Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20shedaniel
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringScreen.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/ConfigReloadingScreen.java # runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/DefaultScreenOverlayRenderer.java
2023-10-23Merge remote-tracking branch 'origin/9.x-1.19' into 11.x-1.19.4shedaniel
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CraftableFilterButtonWidget.java # runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryListImpl.java
2023-10-23Ignore empty entry groupsshedaniel
2023-10-23Optimize collapsible group cachingshedaniel
2023-09-26Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2shedaniel
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
2023-09-01Merge remote-tracking branch 'shedaniel/11.x-1.19.4' into 12.x-1.20shedaniel
2023-09-01Merge remote-tracking branch 'shedaniel/9.x-1.19' into 11.x-1.19.4shedaniel
# Conflicts: # api/src/main/java/me/shedaniel/rei/api/common/transfer/RecipeFinder.java # default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java
2023-09-01Reworked the transfer apishedaniel
See https://www.craft.me/s/TVL01jO3OZarPE for the documentation of the new experimental simple transfer handle
2023-09-01Update to 23w35ashedaniel
2023-08-09Merge branch '11.x-1.19.4' into 12.x-1.20shedaniel
2023-08-09Merge remote-tracking branch 'shedaniel/9.x-1.19' into 11.x-1.19.4shedaniel
2023-08-09Fix concurrency issues with recipe lookupshedaniel
2023-05-31Merge branch '11.x-1.19.4' into 12.x-1.20shedaniel
2023-05-30Merge remote-tracking branch 'shedaniel/9.x-1.19' into 10.x-1.19.3shedaniel
2023-05-30Improve search againshedaniel
2023-05-29Merge remote-tracking branch 'shedaniel/9.x-1.19' into 10.x-1.19.3shedaniel
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListSearchManager.java