github/RoughlyEnoughItems.git/fabric/src/main/java/me, branch 19.x-1.21.5 Unnamed repository; edit this file 'description' to name the repository. Fix custom ingredients 2025-02-25T11:20:09+00:00 shedaniel daniel@shedaniel.me 2025-02-25T11:20:09+00:00 f5408ce8c85dda2bccbe78d8d2a505acc69aa9a0 






Update to 1.21.2 (Please read Primer)
2024-10-26T08:55:57+00:00

shedaniel
daniel@shedaniel.me

2024-10-26T08:55:52+00:00

ddb48e2032d1986709cad973067693eec3118504

https://hackmd.io/@shedaniel/rei17_primer





https://hackmd.io/@shedaniel/rei17_primer







Merge remote-tracking branch 'origin/15.x-1.20.5' into 16.x-1.21
2024-08-14T10:34:44+00:00

shedaniel
daniel@shedaniel.me

2024-08-14T10:26:34+00:00

612dddf0b65be65a70783622c6406a966d935ebc

Fixes #1665
Fixes #1662
Fixes #1663





Fixes #1665
Fixes #1662
Fixes #1663







Fix #1666
2024-08-14T10:24:17+00:00

shedaniel
daniel@shedaniel.me

2024-08-14T10:24:17+00:00

90af6e03bcf45b0c13d5b7af51126bd2fc7389a5












Merge remote-tracking branch 'refs/remotes/origin/14.x-1.20.4' into 15.x-1.20.5
2024-08-14T08:06:59+00:00

shedaniel
daniel@shedaniel.me

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

a0e666f6656cdad355b3038f6696aef2dc943ab6

# Conflicts:
#	neoforge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java





# Conflicts:
#	neoforge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java







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