aboutsummaryrefslogtreecommitdiff
path: root/default-plugin/src/main/java/me/shedaniel/rei/plugin/common
AgeCommit message (Collapse)Author
2025-04-12Fix smithing recipe type conflict with serializer typeshedaniel
2025-04-10Update to 1.21.5shedaniel
2025-04-03Merge remote-tracking branch 'origin/17.x-1.21.2' into 18.x-1.21.4shedaniel
2025-04-03Merge remote-tracking branch 'origin/16.x-1.21' into 17.x-1.21.2shedaniel
2025-02-16fix: register S2C packet type for TagNodes (#1827)16.x-1.21ellellie
Closes #1744, #1772, #1800
2024-12-13Update to 1.21.4shedaniel
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
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-17Compute the output of smithing displays on the flyshedaniel
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-06-17Update to 1.21shedaniel
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/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-17Add anvil recipes, Close #1381shedaniel
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 remote-tracking branch 'origin/12.x-1.20' into feature/13.1shedaniel
# Conflicts: # default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java # default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java
2024-04-16Merge remote-tracking branch 'origin/feature/11.1' into feature/12.1shedaniel
# Conflicts: # default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java
2024-04-16Properly display smithing trim recipesshedaniel
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 #333 and implement some of #509 (Dye Armor, Clone Banner, Clone Book, ↵shedaniel
Firework Rocket, Clone Map, Extend Map, Decorate Shield, Dye Shulker Box, Suspicious Stew)
2024-04-10Update to 24w14ashedaniel
2024-03-02Update to 24w09ashedaniel
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-04-02Update to 23w13a_or_bshedaniel
2023-03-16Port to 1.19.4shedaniel
2023-03-04Initial Port to 1.19.4-pre3shedaniel
2023-01-22Merge remote-tracking branch 'origin/9.x-1.19' into 10.x-1.19.3shedaniel
# Conflicts: # default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/CommandSender.java # fabric/src/main/java/me/shedaniel/rei/impl/client/fabric/CommandSenderImpl.java # forge/src/main/java/me/shedaniel/rei/impl/client/forge/CommandSenderImpl.java
2023-01-22Update license to 2023shedaniel
2022-12-09Update to 1.19.3shedaniel
2022-10-28Update to 22w43ashedaniel
2022-10-22Support 22w42ashedaniel
2022-07-27Make Architectury Plugin compile onlyshedaniel
2022-07-27Add InputMethods, Close #574shedaniel
2022-07-14Improvements to Composting category (#975)Shnupbups
* improvements to composting category 1. Fixed the chance tooltip not showing up 2. `DefaultCompostingDisplay.of` is no longer used and has been deprecated 3. Page count is kept track of internally and used to avoid having to specify the page number manually in a constructor, as a result the constructors that do specify it have been marked as internal as they should only be used by the serializer, but remain public for backwards compatibility with anything that may use them * am i have stupid * forRemoval
2022-07-12Fix #977shedaniel
2022-07-06Fix #970shedaniel