github/RoughlyEnoughItems.git/api, branch 18.x-1.21.4 Unnamed repository; edit this file 'description' to name the repository. Merge branch '17.x-1.21.2' into 18.x-1.21.4 2025-06-29T14:43:00+00:00 shedaniel daniel@shedaniel.me 2025-06-29T14:43:00+00:00 d873e93c398183710fcdbc6aafbc7856c0787458 






Close #1732, Close #1826, Close #1842, Close #1877, Close #1870
2025-06-29T14:37:38+00:00

shedaniel
daniel@shedaniel.me

2025-06-29T14:37:38+00:00

90de9deee87c8c129963ebac36129fe375450318












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.4
2024-12-13T11:39:24+00:00

shedaniel
daniel@shedaniel.me

2024-12-13T11:21:00+00:00

d698ee2add0caacf484fbe8677aa7c6606623688












Use correct buffer source for rendering (#1768)
2024-12-06T20:47:40+00:00

RK_01
50594595+RaphiMC@users.noreply.github.com

2024-12-06T20:47:40+00:00

18baa61d7ed0a06c0b5ff94d86875ca9f88c2b0a












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-09-17T14:15:52+00:00

shedaniel
daniel@shedaniel.me

2024-09-17T14:15:52+00:00

3251f01cacfaf6dcdfd35ee3eaa5e5bee9d372b7

# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java





# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java







Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.5
2024-09-17T13:52:18+00:00

shedaniel
daniel@shedaniel.me

2024-09-17T13:52:18+00:00

581543cb56b8a85d32d7237e0d37fb5ad24da9b5

# Conflicts:
#	api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java
#	api/src/main/java/me/shedaniel/rei/impl/Internals.java
#	default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java
#	fabric/src/main/resources/roughlyenoughitems.accessWidener
#	runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/PerformanceScreen.java





# Conflicts:
#	api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java
#	api/src/main/java/me/shedaniel/rei/impl/Internals.java
#	default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java
#	fabric/src/main/resources/roughlyenoughitems.accessWidener
#	runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/PerformanceScreen.java







Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2
2024-09-17T13:41:20+00:00

shedaniel
daniel@shedaniel.me

2024-09-17T13:38:27+00:00

93c67936af006bbaad287a9e902a8b67a0d7fc7d












Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20
2024-09-17T13:37:11+00:00

shedaniel
daniel@shedaniel.me

2024-09-17T13:37:11+00:00

9856139ad309ab833defb92ccfedaf48b9bde64e

# Conflicts:
#	api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java





# Conflicts:
#	api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java