github/RoughlyEnoughItems.git/neoforge/src/main, branch 17.x-1.21.2 Unnamed repository; edit this file 'description' to name the repository. Fix sub-menus not showing 2024-12-13T11:32:10+00:00 shedaniel daniel@shedaniel.me 2024-12-13T11:31:20+00:00 2eaaf02a116102cbc53e5707d5443d0c137055ff 






Use correct buffer source for rendering (#1768)
2024-12-06T20:47:40+00:00

RK_01
50594595+RaphiMC@users.noreply.github.com

2024-12-06T20:47:40+00:00

18baa61d7ed0a06c0b5ff94d86875ca9f88c2b0a












Update to 1.21.2 (Please read Primer)
2024-10-26T08:55:57+00:00

shedaniel
daniel@shedaniel.me

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

ddb48e2032d1986709cad973067693eec3118504

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





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

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