aboutsummaryrefslogtreecommitdiff
path: root/forge/src/main/java
AgeCommit message (Collapse)Author
2024-09-24Merge branch '12.x-1.20' into 14.x-1.20.4shedaniel
# Conflicts: # build.gradle # gradle/wrapper/gradle-wrapper.properties # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListWidget.java
2024-09-24Closes #1648shedaniel
2024-09-24Merge branch '9.x-1.19' into 12.x-1.20shedaniel
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/configure/PanelBoundariesConfiguration.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/preview/TooltipPreviewer.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryHighlighter.java
2024-09-23Update Gradleshedaniel
2024-08-14Merge remote-tracking branch 'refs/remotes/origin/13.x-1.20.2' into 14.x-1.20.4shedaniel
2024-08-14Merge remote-tracking branch 'refs/remotes/origin/12.x-1.20' into 13.x-1.20.2shedaniel
2024-08-14Fix potential NPEshedaniel
2024-08-14Merge remote-tracking branch 'refs/remotes/origin/13.x-1.20.2' into 14.x-1.20.4shedaniel
2024-08-14Merge remote-tracking branch 'refs/remotes/origin/12.x-1.20' into 13.x-1.20.2shedaniel
2024-08-14Fix #1666shedaniel
2023-12-10Update to 1.20.4shedaniel
2023-11-19Fix compile errorsshedaniel
2023-11-19Fix compile errorsshedaniel
2023-11-19Support NeoForgeshedaniel
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-09-26Support MinecraftForge 1.20.2shedaniel
2023-06-08Merge remote-tracking branch 'shedaniel/11.x-1.19.4' into 12.x-1.20shedaniel
# Conflicts: # fabric/src/main/resources/error_notifier.json
2023-06-08Update to 1.20 and support Forgeshedaniel
2023-06-08Merge remote-tracking branch 'shedaniel/11.x-1.19.4' into 12.x-1.20shedaniel
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/CompositeDisplayViewingScreen.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java
2023-06-01Merge remote-tracking branch 'shedaniel/9.x-1.19' into 10.x-1.19.3shedaniel
2023-06-01Fix merge conflictsshedaniel
2023-06-01Fix #1398shedaniel
2023-05-28Update to 1.20-pre6shedaniel
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-22Add support for c:hidden_from_recipe_viewersshedaniel
2023-01-22Update license to 2023shedaniel
2022-12-09Update to 1.19.3shedaniel
2022-11-09Merge remote-tracking branch 'origin/9.x-1.19' into feature/1.19.3shedaniel
2022-11-09Fix #1199shedaniel
2022-10-22Remove useless classshedaniel
2022-09-28Changes to how plugins are located, should be smarter and easiershedaniel
2022-09-28Fix #1134shedaniel
2022-09-25Fix forge api and default plugin publishing and fix #1055shedaniel
2022-09-18Fix #1034shedaniel
2022-08-11Fix instant crash on forgeshedaniel
2022-08-11Update JEI integrationshedaniel
2022-07-31Support 1.19.1, Fix #1041shedaniel
2022-07-27Make Architectury Plugin compile onlyshedaniel
2022-07-27Add many more loggingshedaniel
2022-07-12Fix crash in dev due to mixin static shadow remappingshedaniel
2022-07-10Fix #983shedaniel
2022-07-06Fix #970shedaniel
2022-06-28Fix compile issues, release REI 9.1shedaniel
2022-06-28Fix #962shedaniel
2022-06-28Fix #853shedaniel
2022-06-28Fix #918shedaniel
2022-06-15Add REIPluginLoader and resolve dists properlyshedaniel
2022-06-09Add accepted stacks to the tooltipshedaniel
2022-06-08Update to 1.19shedaniel
generated by cgit (git 2.34.1) at 2026-06-21 23:43:38 +0000