github/RoughlyEnoughItems.git/forge, branch 14.x-1.20.4 Unnamed repository; edit this file 'description' to name the repository. Merge remote-tracking branch 'origin/12.x-1.20' into 14.x-1.20.4 2024-10-26T09:04:27+00:00 shedaniel daniel@shedaniel.me 2024-10-26T09:03:44+00:00 a8b69f3c95ebbf615c75b09871f09e976836a948 






Merge remote-tracking branch 'origin/9.x-1.19' into 12.x-1.20
2024-10-26T09:03:13+00:00

shedaniel
daniel@shedaniel.me

2024-10-26T09:03:13+00:00

d0acdeaf8e855627086ed1257c6c98a0dfd7f670












Fix #1740
2024-10-26T09:02:24+00:00

shedaniel
daniel@shedaniel.me

2024-10-26T09:02:24+00:00

659f87a0a131f080acc94a106b8f7d81a056982b












Merge branch '12.x-1.20' into 14.x-1.20.4
2024-09-24T03:59:18+00:00

shedaniel
daniel@shedaniel.me

2024-09-24T03:53:57+00:00

106896bce86f1984df7be0bda33aba93c8815c4a

# Conflicts:
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListWidget.java





# Conflicts:
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListWidget.java







Closes #1648
2024-09-24T03:46:39+00:00

shedaniel
daniel@shedaniel.me

2024-09-24T03:46:39+00:00

c97b1a424bcfb57347bb650457aaded33c77c2ae












Merge branch '9.x-1.19' into 12.x-1.20
2024-09-24T03:36:20+00:00

shedaniel
daniel@shedaniel.me

2024-09-24T03:36:20+00:00

0f3e25a5c940f88f2abfa1f860be113a8a3d0c3d

# 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





# 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







Fix dependencies in subproject -fabric & -forge maven publications
2024-09-24T03:34:29+00:00

shedaniel
daniel@shedaniel.me

2024-09-24T03:34:29+00:00

adf5fd11cb45fdcb5ffed90571d68bb406f36f19












Update Gradle
2024-09-23T08:00:12+00:00

shedaniel
daniel@shedaniel.me

2024-09-23T07:49:10+00:00

2a8a1f4a6491daf210bb0bc18abee4530dc9aa8a












Merge remote-tracking branch 'origin/13.x-1.20.2' into 14.x-1.20.4
2024-09-17T13:46:23+00:00

shedaniel
daniel@shedaniel.me

2024-09-17T13:46:23+00:00

ed0f9e051623b0a37b438a3df11c3e50a7d85ab5












Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2
2024-09-17T13:34:04+00:00

shedaniel
daniel@shedaniel.me

2024-09-17T13:34:04+00:00

3febdc4e1d6927f19d0de6fc8430765336d34d7e

# 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





# 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