github/RoughlyEnoughItems.git/forge/src/main/java/me/shedaniel, 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
Changes to how plugins are located, should be smarter and easier 2022-09-28T10:23:40+00:00 shedaniel daniel@shedaniel.me 2022-09-28T10:23:40+00:00 6c1d40eb5c0c167f530d0393476f02424955ae81 






Fix #1134
2022-09-28T09:27:18+00:00

shedaniel
daniel@shedaniel.me

2022-09-28T09:27:18+00:00

eede518a231cfe2ec36c49b41fe7cb98008e9663












Fix forge api and default plugin publishing and fix #1055
2022-09-25T10:46:22+00:00

shedaniel
daniel@shedaniel.me

2022-09-25T10:46:22+00:00

ec5840a5adadb7e1af905348aae3f11c7c439df7












I am not JEI
2022-09-24T11:49:20+00:00

shedaniel
daniel@shedaniel.me

2022-09-24T11:49:20+00:00

53b35a385d744a5f2da0b333ea52099fb9cb9cda












Add REIPluginLoader and resolve dists properly
2022-09-22T14:45:24+00:00

shedaniel
daniel@shedaniel.me

2022-09-22T14:45:24+00:00

445c8d99a69a43e441a0d9fb42874309f176d73c












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

shedaniel
daniel@shedaniel.me

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

95ea1663038362efb2bdb61d521ee6e4274a34f7












Obfuscate REI Internals
2022-09-17T18:09:37+00:00

shedaniel
daniel@shedaniel.me

2022-09-12T15:05:35+00:00

d70b8353a6db5fc5d835af5d662372952703d2fd












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

shedaniel
daniel@shedaniel.me

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

94e323f75c17e297c33fba1d3afb5c47ae66a8ad












It compiles now
2022-08-26T12:17:48+00:00

shedaniel
daniel@shedaniel.me

2022-08-26T07:48:42+00:00

a6900532610247cae49f1c782442d07d8f7b1d2d