github/RoughlyEnoughItems.git/forge/src/main/java/me/shedaniel, branch 19.x-1.21.5 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
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







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 'refs/remotes/origin/13.x-1.20.2' into 14.x-1.20.4
2024-08-14T08:03:28+00:00

shedaniel
daniel@shedaniel.me

2024-08-14T08:03:28+00:00

e00c81335f57d60bac5034c1b05c6c94dbf5f8d0












Merge remote-tracking branch 'refs/remotes/origin/12.x-1.20' into 13.x-1.20.2
2024-08-14T08:03:12+00:00

shedaniel
daniel@shedaniel.me

2024-08-14T08:02:59+00:00

709c33c851c01bfbae3d529fb890dc1b1f6e6f35












Fix potential NPE
2024-08-14T08:02:50+00:00

shedaniel
daniel@shedaniel.me

2024-08-14T08:02:50+00:00

63cb335e2bf28df6fcbaa29cde3be33d8842ec03












Merge remote-tracking branch 'refs/remotes/origin/13.x-1.20.2' into 14.x-1.20.4
2024-08-14T07:54:04+00:00

shedaniel
daniel@shedaniel.me

2024-08-14T07:54:04+00:00

31cff9b7e8b74f0821f8591c19e289185ae91b5d












Merge remote-tracking branch 'refs/remotes/origin/12.x-1.20' into 13.x-1.20.2
2024-08-14T07:53:20+00:00

shedaniel
daniel@shedaniel.me

2024-08-14T06:16:02+00:00

10810a2a602059c8b91a3efd0dadc1f5a967372e












Fix #1666
2024-08-14T06:15:47+00:00

shedaniel
daniel@shedaniel.me

2024-08-14T06:15:47+00:00

879f3e09d9350dd37c5b7e1cf6a33393da501b8e