aboutsummaryrefslogtreecommitdiff
path: root/forge
AgeCommit message (Collapse)Author
2025-11-25Update to 1.21.9shedaniel
2025-07-23Port to 1.21.6 (#1907)shedaniel
* Port to 1.21.6 * Fix tooltip Z-rendering * Fix config screen * Add workflow
2024-12-07Use correct buffer source for rendering (#1768)RK_01
2024-10-26Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.515.x-1.20.5shedaniel
2024-10-26Merge remote-tracking branch 'origin/12.x-1.20' into 14.x-1.20.414.x-1.20.4shedaniel
2024-10-26Merge remote-tracking branch 'origin/9.x-1.19' into 12.x-1.2012.x-1.20shedaniel
2024-10-26Fix #17409.x-1.19shedaniel
2024-09-28Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.5shedaniel
# Conflicts: # gradle.properties # gradle/wrapper/gradle-wrapper.properties
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-24Fix dependencies in subproject -fabric & -forge maven publicationsshedaniel
2024-09-23Update Gradleshedaniel
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/13.x-1.20.2' into 14.x-1.20.4shedaniel
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-08-14Merge remote-tracking branch 'refs/remotes/origin/14.x-1.20.4' into 15.x-1.20.5shedaniel
# Conflicts: # neoforge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java
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
2024-04-25Update to 1.20.5shedaniel
2023-12-12Merge remote-tracking branch 'origin/13.x-1.20.2' into 14.x-1.20.4shedaniel
2023-12-12Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2shedaniel
# Conflicts: # fabric/build.gradle
2023-12-12Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20shedaniel
2023-12-12Merge remote-tracking branch 'origin/9.x-1.19' into 11.x-1.19.4shedaniel
2023-12-12Rename jars for publicationshedaniel
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-26Build compileshedaniel
2023-09-26Support MinecraftForge 1.20.2shedaniel
2023-09-18Fix #1496shedaniel
2023-07-03Support 1.20.1shedaniel
2023-06-12Fix Forge crashshedaniel
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/10.x-1.19.3' into 11.x-1.19.4shedaniel
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