github/RoughlyEnoughItems.git/forge/src/main/resources, branch modularity Unnamed repository; edit this file 'description' to name the repository. Merge remote-tracking branch 'origin/8.x-1.18.2' into modularity 2022-10-21T15:48:30+00:00 shedaniel daniel@shedaniel.me 2022-10-21T15:48:30+00:00 22e1bf58aeb4204bed30200b28da60284f384f88 # Conflicts: # api/build.gradle # default-plugin/build.gradle # forge/src/main/java/me/shedaniel/rei/forge/PluginDetectorImpl.java # runtime-frontend/overlay-entries/src/main/java/me/shedaniel/rei/impl/client/gui/overlay/entries/EntryListStackEntry.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/CompositeDisplayViewingScreen.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/DefaultDisplayViewingScreen.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/InternalWidgets.java 
# Conflicts:
#	api/build.gradle
#	default-plugin/build.gradle
#	forge/src/main/java/me/shedaniel/rei/forge/PluginDetectorImpl.java
#	runtime-frontend/overlay-entries/src/main/java/me/shedaniel/rei/impl/client/gui/overlay/entries/EntryListStackEntry.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/CompositeDisplayViewingScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/DefaultDisplayViewingScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/InternalWidgets.java
I am not JEI 2022-09-24T11:49:20+00:00 shedaniel daniel@shedaniel.me 2022-09-24T11:49:20+00:00 53b35a385d744a5f2da0b333ea52099fb9cb9cda 






Fix #1034
2022-09-17T18:20:25+00:00

shedaniel
daniel@shedaniel.me

2022-09-17T18:20:25+00:00

95ea1663038362efb2bdb61d521ee6e4274a34f7












Separate EntryListWidget and FavoritesListWidget more
2022-08-28T09:50:24+00:00

shedaniel
daniel@shedaniel.me

2022-08-28T09:50:24+00:00

94e323f75c17e297c33fba1d3afb5c47ae66a8ad












Fix crash without architectury api
2022-08-10T19:03:00+00:00

shedaniel
daniel@shedaniel.me

2022-08-10T19:03:00+00:00

4dcb3d97e092fc576ef892fbb7100c114a054b49












Make Architectury Plugin compile only
2022-07-26T19:06:07+00:00

shedaniel
daniel@shedaniel.me

2022-07-26T18:13:43+00:00

ea614e1b9f1960354432f1d991b050a9113d86c6












Fix #962
2022-06-28T09:37:28+00:00

shedaniel
daniel@shedaniel.me

2022-06-28T09:37:28+00:00

b4c07bf6a4d793d296fc7dc9e963cf7d67c1e0e9












Use release version of architectury api
2022-06-25T19:56:30+00:00

shedaniel
daniel@shedaniel.me

2022-06-25T19:56:30+00:00

a46750de1a836217b9af2144916d7ab985a6405e












Fix #853
2022-06-18T18:59:00+00:00

shedaniel
daniel@shedaniel.me

2022-06-18T18:59:00+00:00

a3bc9909f1f78e7872094b7a415fb6c1af51a3dc












Fix #918
2022-06-18T18:44:47+00:00

shedaniel
daniel@shedaniel.me

2022-06-18T18:44:47+00:00

9576bb6aa54e91f3a11decd69e6aa7a613dab37f