github/RoughlyEnoughItems.git/neoforge/src, 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-28T08:44:15+00:00 shedaniel daniel@shedaniel.me 2024-09-28T08:44:15+00:00 eaf9236e3da2adafcea204778ecc0072e70d0aa5 # Conflicts: # gradle.properties 
# 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 shedaniel daniel@shedaniel.me 2024-09-28T08:42:43+00:00 0dd7d2b83c1b9217e7f48b4e7c07f338b00302dd # Conflicts: # gradle.properties # gradle/wrapper/gradle-wrapper.properties 
# 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 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/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












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

shedaniel
daniel@shedaniel.me

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

a0e666f6656cdad355b3038f6696aef2dc943ab6

# Conflicts:
#	neoforge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java





# Conflicts:
#	neoforge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java