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












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

shedaniel
daniel@shedaniel.me

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

63cb335e2bf28df6fcbaa29cde3be33d8842ec03












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

shedaniel
daniel@shedaniel.me

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

879f3e09d9350dd37c5b7e1cf6a33393da501b8e












Rewrite how creative mode tab items are collected
2023-10-23T16:26:03+00:00

shedaniel
daniel@shedaniel.me

2023-10-23T16:26:03+00:00

3a6f6fc734603ce2b5540908bb23d87ee8a59913












Merge remote-tracking branch 'shedaniel/11.x-1.19.4' into 12.x-1.20
2023-06-08T06:58:29+00:00

shedaniel
daniel@shedaniel.me

2023-06-08T06:56:32+00:00

3b1e371aca065a69d4469e497917485ec096123c

# Conflicts:
#	fabric/src/main/resources/error_notifier.json





# Conflicts:
#	fabric/src/main/resources/error_notifier.json







Update to 1.20 and support Forge
2023-06-08T06:54:28+00:00

shedaniel
daniel@shedaniel.me

2023-06-08T06:54:28+00:00

a5c727c6f21d8c6dcedd51b0f66f209027580375












Merge remote-tracking branch 'shedaniel/11.x-1.19.4' into 12.x-1.20
2023-06-08T05:32:42+00:00

shedaniel
daniel@shedaniel.me

2023-06-08T05:32:42+00:00

3d0de007896f853e70f337fc421649104859099f

# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/CompositeDisplayViewingScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java





# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/CompositeDisplayViewingScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java







Merge remote-tracking branch 'shedaniel/9.x-1.19' into 10.x-1.19.3
2023-06-01T08:58:17+00:00

shedaniel
daniel@shedaniel.me

2023-06-01T08:58:17+00:00

a6e09ed07e4079cc1bfa10776b79d4a32bca941e