github/RoughlyEnoughItems.git/default-plugin/src/main/java/me/shedaniel/rei/plugin/common, branch feature/calculator

Fix smithing recipe type conflict with serializer type

2025-04-12T08:43:55+00:00

Update to 1.21.5

2025-04-10T11:14:00+00:00

Merge remote-tracking branch 'origin/17.x-1.21.2' into 18.x-1.21.4

2025-04-03T12:04:03+00:00

Merge remote-tracking branch 'origin/16.x-1.21' into 17.x-1.21.2

2025-04-03T12:03:25+00:00

fix: register S2C packet type for TagNodes (#1827)

2025-02-16T11:50:31+00:00

Closes #1744, #1772, #1800

Update to 1.21.4

2024-12-13T11:39:24+00:00

Fix #1751

2024-11-10T12:08:06+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-17T14:15:52+00:00

# 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

# 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