github/RoughlyEnoughItems.git/runtime/src, branch 15.x-1.20.5 Unnamed repository; edit this file 'description' to name the repository. Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.5 2024-09-28T08:42:43+00:00 shedaniel daniel@shedaniel.me 2024-09-28T08:42:43+00:00 0dd7d2b83c1b9217e7f48b4e7c07f338b00302dd # Conflicts: # gradle.properties # gradle/wrapper/gradle-wrapper.properties 
# Conflicts:
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.properties
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
Fix menu z-fighting in config screen 2024-09-24T03:50:41+00:00 shedaniel daniel@shedaniel.me 2024-09-24T03:50:41+00:00 91cc0c43de61b97b54477f90710a45bc71b744b9 






Fix inventory highlighter for 1.20
2024-09-24T03:46:21+00:00

shedaniel
daniel@shedaniel.me

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

b932bd3224cc66c5503b4d759bf1ae7bea70eb7c












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







Inventory Search Options
2024-09-23T08:00:15+00:00

shedaniel
daniel@shedaniel.me

2024-09-04T07:20:49+00:00

ab5e4c25b4938a00c87029b3b692bb78f5a14017












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

shedaniel
daniel@shedaniel.me

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

2a8a1f4a6491daf210bb0bc18abee4530dc9aa8a












Update localisation
2024-09-23T07:24:35+00:00

shedaniel
daniel@shedaniel.me

2024-09-23T06:30:21+00:00

50e024910e223f41e2e826c193c02ec85a9c256b












Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.5
2024-09-17T14:11:00+00:00

shedaniel
daniel@shedaniel.me

2024-09-17T13:54:19+00:00

ed9454b4d82fbfc4e7b80369cc0c9ba5b6bc23d6

# Conflicts:
#	neoforge/src/main/resources/META-INF/accesstransformer.cfg





# Conflicts:
#	neoforge/src/main/resources/META-INF/accesstransformer.cfg







Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.5
2024-09-17T13:52:18+00:00

shedaniel
daniel@shedaniel.me

2024-09-17T13:52:18+00:00

581543cb56b8a85d32d7237e0d37fb5ad24da9b5

# 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





# 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