github/RoughlyEnoughItems.git/neoforge/src/main/java/me/shedaniel, branch feature/calculator

Fix custom ingredients

2025-02-25T11:20:09+00:00

Update to 1.21.2 (Please read Primer)

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

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

Merge remote-tracking branch 'origin/15.x-1.20.5' into 16.x-1.21

2024-09-28T08:44:15+00:00

# Conflicts:
#	gradle.properties

Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.5

2024-09-28T08:42:43+00:00

# Conflicts:
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.properties

Merge branch '12.x-1.20' into 14.x-1.20.4

2024-09-24T03:59:18+00:00

# Conflicts:
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListWidget.java

Merge remote-tracking branch 'origin/15.x-1.20.5' into 16.x-1.21

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

Fixes #1665
Fixes #1662
Fixes #1663

Fix #1666

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

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

# 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

Merge remote-tracking branch 'refs/remotes/origin/12.x-1.20' into 13.x-1.20.2

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