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:42:49 +0900
committershedaniel <daniel@shedaniel.me>2024-04-16 01:42:49 +0900
commit9bdb9cb7c0a03accb6f86bcedff4b22f38f1346f (patch)
treebc7557eeebd32609fc8b26db28f613e5fd576366 /default-plugin/src/main/java/me/shedaniel/rei/plugin/common
parentf59653ff2a7c3641624928478a3622e6ffd32889 (diff)
parent8981a2f730942e169ba5efa2f25ad3066dc0f797 (diff)
downloadRoughlyEnoughItems-9bdb9cb7c0a03accb6f86bcedff4b22f38f1346f.tar.gz
RoughlyEnoughItems-9bdb9cb7c0a03accb6f86bcedff4b22f38f1346f.tar.bz2
RoughlyEnoughItems-9bdb9cb7c0a03accb6f86bcedff4b22f38f1346f.zip
Merge branch 'feature/12.1' into feature/13.1
# Conflicts: # gradle.properties # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/changelog/ChangelogLoader.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/UncertainDisplayViewingScreen.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/OverflowWidget.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