github/RoughlyEnoughItems.git/runtime/src/main/java/me/shedaniel/rei, branch 14.x-1.20.4 Unnamed repository; edit this file 'description' to name the repository. 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












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:41:20+00:00

shedaniel
daniel@shedaniel.me

2024-09-17T13:38:27+00:00

93c67936af006bbaad287a9e902a8b67a0d7fc7d












Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20
2024-09-17T13:37:11+00:00

shedaniel
daniel@shedaniel.me

2024-09-17T13:37:11+00:00

9856139ad309ab833defb92ccfedaf48b9bde64e

# Conflicts:
#	api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java





# Conflicts:
#	api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java







Use InstanceHelper to get registryAccess
2024-09-17T13:36:09+00:00

shedaniel
daniel@shedaniel.me

2024-09-17T13:36:09+00:00

644c3f591d42d91c8445b199202b37ba05b0bf93