github/RoughlyEnoughItems.git, 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-10-26T09:05:08+00:00 shedaniel daniel@shedaniel.me 2024-10-26T09:05:08+00:00 f8bd895afcf87805c258ee543795391b1e361054 






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 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












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

shedaniel
daniel@shedaniel.me

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

c97b1a424bcfb57347bb650457aaded33c77c2ae












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