github/RoughlyEnoughItems.git/fabric/src/main/java, branch 12.x-1.20 Unnamed repository; edit this file 'description' to name the repository. Fix potential NPE 2024-08-14T08:02:03+00:00 shedaniel daniel@shedaniel.me 2024-08-14T08:02:03+00:00 02502d5148c636f5f3daf22981ee1b03f0f9cc98 






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












Fix merge conflicts
2023-06-01T08:57:01+00:00

shedaniel
daniel@shedaniel.me

2023-06-01T08:56:31+00:00

31d1e1935eae254ba2ff18df57dcd8ad9d9b0fa5












Fix #1398
2023-06-01T08:55:08+00:00

shedaniel
daniel@shedaniel.me

2023-05-30T04:32:54+00:00

6acbfba77bce42994f462fdcc06ffd985d8642af












Fix tooltip crash
2023-05-27T20:19:51+00:00

shedaniel
daniel@shedaniel.me

2023-05-27T20:19:51+00:00

d9a1988ccf426c0e76a7377bab7c7ef85e2ef957












Update to 1.20-pre6
2023-05-27T20:09:32+00:00

shedaniel
daniel@shedaniel.me

2023-05-27T20:09:32+00:00

a35425108d9813f64779b519fedd4744a7eb6072












Merge remote-tracking branch 'origin/9.x-1.19' into 10.x-1.19.3
2023-01-21T16:20:20+00:00

shedaniel
daniel@shedaniel.me

2023-01-21T16:14:52+00:00

140e9148743dbe2469c2c6783f83057aaa2d3565

# Conflicts:
#	default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/CommandSender.java
#	fabric/src/main/java/me/shedaniel/rei/impl/client/fabric/CommandSenderImpl.java
#	forge/src/main/java/me/shedaniel/rei/impl/client/forge/CommandSenderImpl.java





# Conflicts:
#	default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/CommandSender.java
#	fabric/src/main/java/me/shedaniel/rei/impl/client/fabric/CommandSenderImpl.java
#	forge/src/main/java/me/shedaniel/rei/impl/client/forge/CommandSenderImpl.java