github/RoughlyEnoughItems.git/fabric/src/main/java, branch 13.x-1.20.2 Unnamed repository; edit this file 'description' to name the repository. Merge remote-tracking branch 'refs/remotes/origin/12.x-1.20' into 13.x-1.20.2 2024-08-14T08:02:12+00:00 shedaniel daniel@shedaniel.me 2024-08-14T08:02:12+00:00 842621bb26c466b3b0759405277dbc808812db03 






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

shedaniel
daniel@shedaniel.me

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

02502d5148c636f5f3daf22981ee1b03f0f9cc98












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












Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2
2023-11-02T08:05:35+00:00

shedaniel
daniel@shedaniel.me

2023-11-02T08:03:44+00:00

11b87fdd96f5542d646aa8f5136095917f207564

# Conflicts:
#	fabric/src/main/resources/roughlyenoughitems.accessWidener





# Conflicts:
#	fabric/src/main/resources/roughlyenoughitems.accessWidener







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












Fix #1496
2023-09-18T07:14:43+00:00

shedaniel
daniel@shedaniel.me

2023-09-18T07:14:43+00:00

afb450760b7cc80c7341ae67b5e969a48a0cda2b












Update to 23w31a
2023-08-08T14:04:05+00:00

shedaniel
daniel@shedaniel.me

2023-08-08T14:04:05+00:00

76ebe3362a41e15308e8221b802e8a2bd3b74f4e












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