github/RoughlyEnoughItems.git/neoforge, branch 14.x-1.20.4 Unnamed repository; edit this file 'description' to name the repository. Merge remote-tracking branch 'origin/12.x-1.20' into 14.x-1.20.4 2024-10-26T09:04:27+00:00 shedaniel daniel@shedaniel.me 2024-10-26T09:03:44+00:00 a8b69f3c95ebbf615c75b09871f09e976836a948 






Merge branch '12.x-1.20' into 14.x-1.20.4
2024-09-24T03:59:18+00:00

shedaniel
daniel@shedaniel.me

2024-09-24T03:53:57+00:00

106896bce86f1984df7be0bda33aba93c8815c4a

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





# 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/13.x-1.20.2' into 14.x-1.20.4
2024-09-17T13:53:53+00:00

shedaniel
daniel@shedaniel.me

2024-09-17T13:53:53+00:00

20317a973895ad237fb58adc2b2b1ece8a45cea4












Add ATs for NeoForge
2024-09-17T13:53:41+00:00

shedaniel
daniel@shedaniel.me

2024-09-17T13:53:41+00:00

465d3c1c3bba524bcd7922c9a4236551fd041d99












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:03:12+00:00

shedaniel
daniel@shedaniel.me

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

709c33c851c01bfbae3d529fb890dc1b1f6e6f35












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












Update NeoForge
2024-04-01T13:26:44+00:00

shedaniel
daniel@shedaniel.me

2024-04-01T13:26:44+00:00

bbd05ce9f72b87e91ebf3506375595fea0f21abe












Update NeoForge
2023-12-21T10:31:10+00:00

shedaniel
daniel@shedaniel.me

2023-12-21T10:31:10+00:00

e4cf4d7a272dbf5da9a8ca868d003f011f5b0fc9