aboutsummaryrefslogtreecommitdiff
path: root/default-plugin/src/main/java/me/shedaniel/rei/plugin/common
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2024-04-16 01:51:34 +0900
committershedaniel <daniel@shedaniel.me>2024-04-16 01:51:34 +0900
commit9358912411e2566cd00def93930ae94da5da6df0 (patch)
treecb6d9f0c28eac5728b27e6b5a4f87e0c0565337d /default-plugin/src/main/java/me/shedaniel/rei/plugin/common
parent9034bf05f32fda2164190eacc7c6814503fbf611 (diff)
parent5f61d89501a4eadd99c805c973b1ef49a3a3aaee (diff)
downloadRoughlyEnoughItems-9358912411e2566cd00def93930ae94da5da6df0.tar.gz
RoughlyEnoughItems-9358912411e2566cd00def93930ae94da5da6df0.tar.bz2
RoughlyEnoughItems-9358912411e2566cd00def93930ae94da5da6df0.zip
Merge remote-tracking branch 'origin/feature/13.1' into feature/14.1
# Conflicts: # gradle.properties # runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/RecipeScreenTypeEntry.java # runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ReloadPluginsEntry.java # runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/SearchFilterSyntaxHighlightingEntry.java
Diffstat (limited to 'default-plugin/src/main/java/me/shedaniel/rei/plugin/common')
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java
index e6a3e33ce..71259b466 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java
@@ -82,6 +82,7 @@ public class DefaultPlugin implements BuiltinPlugin, REIServerPlugin {
registry.registerNbt(Items.SPLASH_POTION);
registry.registerNbt(Items.LINGERING_POTION);
registry.registerNbt(Items.TIPPED_ARROW);
+ registry.register((context, stack) -> 0, Items.FIREWORK_ROCKET, Items.FILLED_MAP);
}
@Override