diff options
| author | shedaniel <daniel@shedaniel.me> | 2023-06-01 17:36:27 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-04-16 00:38:18 +0900 |
| commit | 50a7877d065532d2a082fbc9e51d99587c59d2a9 (patch) | |
| tree | 98435fb6ace404128f2ca757833381f2b63e0a28 | |
| parent | 8c941dd229712cee6f7d2fefb0bc5ca2e0d10d19 (diff) | |
| download | RoughlyEnoughItems-50a7877d065532d2a082fbc9e51d99587c59d2a9.tar.gz RoughlyEnoughItems-50a7877d065532d2a082fbc9e51d99587c59d2a9.tar.bz2 RoughlyEnoughItems-50a7877d065532d2a082fbc9e51d99587c59d2a9.zip | |
Fix rebase conflicts
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/collapsed/CollapsibleEntryRegistryImpl.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/collapsed/CollapsibleEntryRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/collapsed/CollapsibleEntryRegistryImpl.java index 7069511ab..f16d8d390 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/collapsed/CollapsibleEntryRegistryImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/collapsed/CollapsibleEntryRegistryImpl.java @@ -124,10 +124,6 @@ public class CollapsibleEntryRegistryImpl implements CollapsibleEntryRegistry { return id; } - public ResourceLocation getId() { - return id; - } - public String getModId() { return id.getNamespace(); } |