| Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
# Conflicts:
# runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigObjectImpl.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/DelegateScreen.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/TransformingScreen.java
# settings.gradle
|
|
|
|
|
|
IngredientFilter and Focus to their api counterparts
|
|
|
|
|
|
# Conflicts:
# build.gradle
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/TabWidget.java
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ContainerScreenOverlay.java
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
# Conflicts:
# api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/SimplePlayerInventoryMenuInfo.java
# runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
# Conflicts:
# api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java
# runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java
# runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/ItemEntryDefinition.java
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
# Conflicts:
# api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/EntryRenderer.java
# api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java
# gradle.properties
# runtime/src/main/java/me/shedaniel/rei/impl/client/search/IntRange.java
# runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java
# runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/ItemEntryDefinition.java
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
system, remove @NotNull
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|
|
Signed-off-by: shedaniel <daniel@shedaniel.me>
|