github/RoughlyEnoughItems.git/neoforge/src/main/resources, branch 16.x-1.21 Unnamed repository; edit this file 'description' to name the repository. 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-17T14:11:00+00:00 shedaniel daniel@shedaniel.me 2024-09-17T13:54:19+00:00 ed9454b4d82fbfc4e7b80369cc0c9ba5b6bc23d6 # Conflicts: # neoforge/src/main/resources/META-INF/accesstransformer.cfg 
# Conflicts:
#	neoforge/src/main/resources/META-INF/accesstransformer.cfg
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 '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












Update to 1.21
2024-06-16T15:07:02+00:00

shedaniel
daniel@shedaniel.me

2024-06-16T15:07:02+00:00

667c7993dcea8b09bdffcad9956b353f054ad6e2












Update to 1.20.5
2024-04-25T13:29:22+00:00

shedaniel
daniel@shedaniel.me

2024-04-25T13:29:22+00:00

d372f03dbec88fedb9e0e3cffb766c2bb3b0f8a4












Update to 24w14a
2024-04-10T11:37:13+00:00

shedaniel
daniel@shedaniel.me

2024-04-09T17:50:13+00:00

fccc677951d7d5352ab7bf154951b7198d440e90












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

shedaniel
daniel@shedaniel.me

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

e4cf4d7a272dbf5da9a8ca868d003f011f5b0fc9