diff --git a/build.gradle b/build.gradle index be8c17dd2..028ee78e2 100755 --- a/build.gradle +++ b/build.gradle @@ -59,6 +59,20 @@ minecraft { } } +processResources { + inputs.property 'version', project.version + + from(sourceSets.main.resources.srcDirs) { + include 'META-INF/mods.toml' + + expand 'version':project.version + } + + from(sourceSets.main.resources.srcDirs) { + exclude 'META-INF/mods.toml' + } +} + dependencies { minecraft 'net.minecraftforge:forge:1.14.4-28.0.73' } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RS.java b/src/main/java/com/raoulvdberge/refinedstorage/RS.java index 03ec817af..32e03541f 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/RS.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RS.java @@ -1,36 +1,38 @@ package com.raoulvdberge.refinedstorage; -import com.raoulvdberge.refinedstorage.proxy.ProxyCommon; +import com.raoulvdberge.refinedstorage.item.ItemCore; +import com.raoulvdberge.refinedstorage.item.group.MainItemGroup; +import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; @Mod(RS.ID) public final class RS { public static final String ID = "refinedstorage"; - public static final String VERSION = "1.7"; // TODO keep in sync with build.gradle - - public static ProxyCommon PROXY; public static RS INSTANCE; - public RSConfig config; - public final ItemGroup tab = new ItemGroup(ID) { - @Override - public ItemStack createIcon() { - return new ItemStack(RSItems.STORAGE_HOUSING); - } - }; - public final ItemGroup coversTab = new ItemGroup(ID + ".covers") { - @Override - public ItemStack createIcon() { - ItemStack stack = new ItemStack(RSItems.COVER); - // TODO ItemCover.setItem(stack, new ItemStack(Blocks.STONE)); + public static final ItemGroup MAIN_GROUP = new MainItemGroup(); - return stack; - } - }; + public RS() { + FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(Item.class, this::onRegisterItems); + } + + @SubscribeEvent + public void onRegisterBlocks(RegistryEvent.Register e) { + + } + + @SubscribeEvent + public void onRegisterItems(RegistryEvent.Register e) { + e.getRegistry().register(new ItemCore(ItemCore.Type.CONSTRUCTION)); + e.getRegistry().register(new ItemCore(ItemCore.Type.DESTRUCTION)); + } /* TODO @EventHandler diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSItems.java b/src/main/java/com/raoulvdberge/refinedstorage/RSItems.java index 7d68030e4..c8d7b30c4 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/RSItems.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RSItems.java @@ -1,6 +1,7 @@ package com.raoulvdberge.refinedstorage; import com.raoulvdberge.refinedstorage.item.*; +import net.minecraftforge.registries.ObjectHolder; public final class RSItems { public static final ItemStorageDisk STORAGE_DISK = new ItemStorageDisk(); @@ -8,7 +9,8 @@ public final class RSItems { public static final ItemWirelessFluidGrid WIRELESS_FLUID_GRID = new ItemWirelessFluidGrid(); public static final ItemWirelessCraftingMonitor WIRELESS_CRAFTING_MONITOR = new ItemWirelessCraftingMonitor(); public static final ItemQuartzEnrichedIron QUARTZ_ENRICHED_IRON = new ItemQuartzEnrichedIron(); - public static final ItemCore CORE = new ItemCore(); + @ObjectHolder(RS.ID + ":core") + public static final ItemCore CORE = null; public static final ItemSilicon SILICON = new ItemSilicon(); public static final ItemProcessor PROCESSOR = new ItemProcessor(); public static final ItemStoragePart STORAGE_PART = new ItemStoragePart(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java index 9d89aee32..3d7d79c53 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java @@ -1,6 +1,5 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.node; -import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.network.INetwork; import com.raoulvdberge.refinedstorage.api.network.INetworkNodeVisitor; import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; @@ -27,6 +26,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { private static final String NBT_OWNER = "Owner"; private static final String NBT_DIRECTION = "Direction"; private static final String NBT_VERSION = "Version"; + private static final int VERSION = 1; @Nullable protected INetwork network; @@ -165,8 +165,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { tag.putUniqueId(NBT_OWNER, owner); } - tag.putString(NBT_VERSION, RS.VERSION); - + tag.putInt(NBT_VERSION, VERSION); tag.putInt(NBT_DIRECTION, direction.ordinal()); writeConfiguration(tag); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFluid.java index 503484dba..16c629f63 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFluid.java @@ -2,7 +2,6 @@ package com.raoulvdberge.refinedstorage.apiimpl.storage.disk; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; -import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.storage.AccessType; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerContext; @@ -24,6 +23,7 @@ public class StorageDiskFluid implements IStorageDisk { static final String NBT_VERSION = "Version"; static final String NBT_CAPACITY = "Capacity"; static final String NBT_FLUIDS = "Fluids"; + static final int VERSION = 1; private World world; private int capacity; @@ -52,7 +52,7 @@ public class StorageDiskFluid implements IStorageDisk { list.add(stack.writeToNBT(new CompoundNBT())); } - tag.putString(NBT_VERSION, RS.VERSION); + tag.putInt(NBT_VERSION, VERSION); tag.put(NBT_FLUIDS, list); tag.putInt(NBT_CAPACITY, capacity); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskItem.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskItem.java index fe9e3e683..276b12550 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskItem.java @@ -2,7 +2,6 @@ package com.raoulvdberge.refinedstorage.apiimpl.storage.disk; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; -import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.storage.AccessType; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerContext; @@ -25,6 +24,7 @@ public class StorageDiskItem implements IStorageDisk { static final String NBT_VERSION = "Version"; static final String NBT_CAPACITY = "Capacity"; static final String NBT_ITEMS = "Items"; + static final int VERSION = 1; private World world; private int capacity; @@ -53,7 +53,7 @@ public class StorageDiskItem implements IStorageDisk { list.add(StackUtils.serializeStackToNbt(stack)); } - tag.putString(NBT_VERSION, RS.VERSION); + tag.putInt(NBT_VERSION, VERSION); tag.put(NBT_ITEMS, list); tag.putInt(NBT_CAPACITY, capacity); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBase.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBase.java index def551adb..951abc1fd 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBase.java @@ -1,13 +1,14 @@ package com.raoulvdberge.refinedstorage.item; import com.raoulvdberge.refinedstorage.item.info.IItemInfo; -import com.raoulvdberge.refinedstorage.render.IModelRegistration; import net.minecraft.item.Item; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; public abstract class ItemBase extends Item { - protected final IItemInfo info; + protected IItemInfo info; + + public ItemBase(Item.Properties props) { + super(props); + } public ItemBase(IItemInfo info) { super(new Item.Properties()); @@ -16,13 +17,4 @@ public abstract class ItemBase extends Item { setRegistryName(info.getId()); // TODO setCreativeTab(RS.INSTANCE.tab); } - - @OnlyIn(Dist.CLIENT) - public void registerModels(IModelRegistration modelRegistration) { - } - - @Override - public String getTranslationKey() { - return "item." + info.getId().toString(); - } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemCore.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemCore.java index 99de32361..7d1ca31de 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemCore.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemCore.java @@ -1,36 +1,17 @@ package com.raoulvdberge.refinedstorage.item; import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.item.info.ItemInfo; +import net.minecraft.item.Item; -public class ItemCore extends ItemBase { - private static final int TYPE_CONSTRUCTION = 0; - private static final int TYPE_DESTRUCTION = 1; - - public ItemCore() { - super(new ItemInfo(RS.ID, "core")); - - /*setHasSubtypes(true); - setMaxDamage(0);*/ - } -/* - @Override - @SideOnly(Side.CLIENT) - public void registerModels(IModelRegistration modelRegistration) { - modelRegistration.setModelVariants(this, new ResourceLocation(RS.ID, "construction_core"), new ResourceLocation(RS.ID, "destruction_core")); - - modelRegistration.setModel(this, TYPE_CONSTRUCTION, new ModelResourceLocation(RS.ID + ":construction_core", "inventory")); - modelRegistration.setModel(this, TYPE_DESTRUCTION, new ModelResourceLocation(RS.ID + ":destruction_core", "inventory")); +public class ItemCore extends Item { + public enum Type { + CONSTRUCTION, + DESTRUCTION } - @Override - public void getSubItems(CreativeTabs tab, NonNullList items) { - if (!isInCreativeTab(tab)) { - return; - } + public ItemCore(Type type) { + super(new Item.Properties().group(RS.MAIN_GROUP)); - for (int i = 0; i < 2; ++i) { - items.add(new ItemStack(this, 1, i)); - } - }*/ + this.setRegistryName(RS.ID, type == Type.CONSTRUCTION ? "construction_core" : "destruction_core"); + } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/group/MainItemGroup.java b/src/main/java/com/raoulvdberge/refinedstorage/item/group/MainItemGroup.java new file mode 100644 index 000000000..37bf3576a --- /dev/null +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/group/MainItemGroup.java @@ -0,0 +1,17 @@ +package com.raoulvdberge.refinedstorage.item.group; + +import com.raoulvdberge.refinedstorage.RS; +import net.minecraft.block.Blocks; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; + +public class MainItemGroup extends ItemGroup { + public MainItemGroup() { + super(RS.ID); + } + + @Override + public ItemStack createIcon() { + return new ItemStack(Blocks.DIRT); + } +} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/IModelRegistration.java b/src/main/java/com/raoulvdberge/refinedstorage/render/IModelRegistration.java index d521db2e1..e427dd8ce 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/IModelRegistration.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/IModelRegistration.java @@ -16,11 +16,11 @@ import java.util.function.Supplier; public interface IModelRegistration { void addBakedModelOverride(ResourceLocation resource, Function override); - void setModel(Block block, int meta, ModelResourceLocation resource); + void setModel(Block block, int meta, ModelResourceLocation resource); // ModelLoader.setCustomModelResourceLocation -> no longer needed due to flattening, for custom, use custom baked model - void setModel(Item item, int meta, ModelResourceLocation resource); + void setModel(Item item, int meta, ModelResourceLocation resource); // same as above - void setModelVariants(Item item, ResourceLocation... variants); + void setModelVariants(Item item, ResourceLocation... variants); // no longer needed // Supplier needed to avoid server crash. void addModelLoader(Supplier modelLoader); diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 8bc92c842..58b9b1523 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -3,11 +3,11 @@ loaderVersion="[28,)" issueTrackerURL="https://github.com/raoulvdberge/refinedstorage" [[mods]] modId="refinedstorage" -version="${file.jarVersion}" +version="${version}" displayName="Refined Storage" updateJSONURL="https://refinedstorage.raoulvdberge.com/update" displayURL="https://refinedstorage.raoulvdberge.com" -logoFile="assets/refinedstorage/textures/logo.png" +logoFile="logo.png" authors="Refined Storage authors" description=''' An elegant solution to your hoarding problem diff --git a/src/main/resources/assets/refinedstorage/lang/en_us.json b/src/main/resources/assets/refinedstorage/lang/en_us.json new file mode 100644 index 000000000..ec3a5458a --- /dev/null +++ b/src/main/resources/assets/refinedstorage/lang/en_us.json @@ -0,0 +1,353 @@ +{ + "itemGroup.refinedstorage": "Refined Storage", + "itemGroup.refinedstorage.covers": "Refined Storage Covers", + "key.refinedstorage.focusSearchBar": "Focus Grid Search Bar", + "key.refinedstorage.clearGridCraftingMatrix": "Clear Grid Crafting Matrix", + "key.refinedstorage.openWirelessGrid": "Open Wireless Grid", + "key.refinedstorage.openWirelessFluidGrid": "Open Wireless Fluid Grid", + "key.refinedstorage.openPortableGrid": "Open Portable Grid", + "key.refinedstorage.openWirelessCraftingMonitor": "Open Wireless Crafting Monitor", + "gui.refinedstorage:controller.0": "Controller", + "gui.refinedstorage:controller.1": "Creative Controller", + "gui.refinedstorage:grid": "Grid", + "gui.refinedstorage:grid.craft": "Craft", + "gui.refinedstorage:crafting_grid": "Crafting Grid", + "gui.refinedstorage:pattern_grid": "Pattern Grid", + "gui.refinedstorage:grid.pattern_create": "Create", + "gui.refinedstorage:fluid_grid": "Fluid Grid", + "gui.refinedstorage:item_amount": "Item amount", + "gui.refinedstorage:fluid_amount": "Fluid amount in mB", + "gui.refinedstorage:disk_drive": "Drive", + "gui.refinedstorage:disk_drive.disks": "Disks", + "gui.refinedstorage:external_storage": "External Storage", + "gui.refinedstorage:importer": "Importer", + "gui.refinedstorage:exporter": "Exporter", + "gui.refinedstorage:detector": "Detector", + "gui.refinedstorage:destructor": "Destructor", + "gui.refinedstorage:constructor": "Constructor", + "gui.refinedstorage:relay": "Relay", + "gui.refinedstorage:interface.import": "Interface Import", + "gui.refinedstorage:interface.export": "Interface Export", + "gui.refinedstorage:crafting_monitor": "Crafting Monitor", + "gui.refinedstorage:wireless_crafting_monitor": "Wireless Crafting Monitor", + "gui.refinedstorage:crafting_monitor.tooltip.requested": "%d requested", + "gui.refinedstorage:crafting_monitor.stored": "Stored: %d", + "gui.refinedstorage:crafting_monitor.missing": "Missing: %d", + "gui.refinedstorage:crafting_monitor.processing": "Processing: %d", + "gui.refinedstorage:crafting_monitor.scheduled": "Scheduled: %d", + "gui.refinedstorage:crafting_monitor.crafting": "Crafting: %d", + "gui.refinedstorage:crafting_monitor.machine_does_not_accept_item": "Machine doesn't accept item", + "gui.refinedstorage:crafting_monitor.machine_does_not_accept_fluid": "Machine doesn't accept fluid", + "gui.refinedstorage:crafting_monitor.machine_none": "No machine found", + "gui.refinedstorage:crafting_monitor.crafter_is_locked": "Crafter is locked", + "gui.refinedstorage:wireless_transmitter": "Wireless Transmitter", + "gui.refinedstorage:wireless_transmitter.distance": "%d block(s)", + "gui.refinedstorage:crafter": "Crafter", + "gui.refinedstorage:filter": "Filter", + "gui.refinedstorage:filter.compare_damage": "Damage", + "gui.refinedstorage:filter.compare_nbt": "NBT", + "gui.refinedstorage:filter.mod_filter": "Mod filter", + "gui.refinedstorage:network_transmitter": "Network Transmitter", + "gui.refinedstorage:network_transmitter.distance": "%d block(s)", + "gui.refinedstorage:network_transmitter.dimension": "Dimension %d", + "gui.refinedstorage:network_transmitter.missing_card": "Missing Network Card", + "gui.refinedstorage:fluid_interface": "Fluid Interface", + "gui.refinedstorage:fluid_interface.in": "In", + "gui.refinedstorage:fluid_interface.out": "Out", + "gui.refinedstorage:crafting_preview": "Crafting Preview", + "gui.refinedstorage:crafting_preview.to_craft": "To craft: %d", + "gui.refinedstorage:crafting_preview.available": "Available: %d", + "gui.refinedstorage:crafting_preview.missing": "Missing: %d", + "gui.refinedstorage:crafting_preview.error": "Request failed", + "gui.refinedstorage:crafting_preview.error.recursive.0": "One of the crafting ingredients ended up needing", + "gui.refinedstorage:crafting_preview.error.recursive.1": "itself.", + "gui.refinedstorage:crafting_preview.error.recursive.2": "You need to remove the pattern or make sure", + "gui.refinedstorage:crafting_preview.error.recursive.3": "the pattern is not used during crafting.", + "gui.refinedstorage:crafting_preview.error.recursive.4": "Offending pattern:", + "gui.refinedstorage:crafting_preview.error.too_complex.0": "The crafting task calculation was too complex", + "gui.refinedstorage:crafting_preview.error.too_complex.1": "and was stopped to avoid server strain.", + "gui.refinedstorage:reader": "Reader", + "gui.refinedstorage:writer": "Writer", + "gui.refinedstorage:security_manager": "Security Manager", + "gui.refinedstorage:security_manager.configure": "Configure", + "gui.refinedstorage:security_manager.permission.0": "Insert", + "gui.refinedstorage:security_manager.permission.0.tooltip": "Inserting items to the network", + "gui.refinedstorage:security_manager.permission.1": "Extract", + "gui.refinedstorage:security_manager.permission.1.tooltip": "Extracting items from the network", + "gui.refinedstorage:security_manager.permission.2": "Autocrafting", + "gui.refinedstorage:security_manager.permission.2.tooltip": "Starting, cancelling and viewing crafting tasks", + "gui.refinedstorage:security_manager.permission.3": "Modify", + "gui.refinedstorage:security_manager.permission.3.tooltip": "Opening block GUIs", + "gui.refinedstorage:security_manager.permission.4": "Build", + "gui.refinedstorage:security_manager.permission.4.tooltip": "Adding or removing devices to or from the network", + "gui.refinedstorage:security_manager.permission.5": "Security", + "gui.refinedstorage:security_manager.permission.5.tooltip": "Ability to change security options", + "gui.refinedstorage:storage_monitor": "Storage Monitor", + "gui.refinedstorage:portable_grid": "Portable Grid", + "gui.refinedstorage:crafter_manager": "Crafter Manager", + "misc.refinedstorage:energy_stored": "%d / %d FE", + "misc.refinedstorage:energy_usage": "Usage: %d FE/t", + "misc.refinedstorage:energy_usage_minimal": "%d FE/t", + "misc.refinedstorage:storage.stored": "Stored: %s", + "misc.refinedstorage:storage.stored_capacity": "Stored: %s / %s", + "misc.refinedstorage:storage.stored_minimal": "%s", + "misc.refinedstorage:storage.stored_capacity_minimal": "%s / %s", + "misc.refinedstorage:storage.full": "%d%% full", + "misc.refinedstorage:network_item.tooltip": "Linked to %d, %d, %d.", + "misc.refinedstorage:network_item.out_of_range": "There is no Wireless Transmitter in range.", + "misc.refinedstorage:network_item.not_found": "Controller not found.", + "misc.refinedstorage:network_card.tooltip": "Linked to %d, %d, %d.", + "misc.refinedstorage:pattern.inputs": "Inputs", + "misc.refinedstorage:pattern.outputs": "Outputs", + "misc.refinedstorage:pattern.invalid": "Invalid pattern", + "misc.refinedstorage:pattern.oredict": "Uses ore dictionary", + "misc.refinedstorage:security.no_permission": "You have no permission to perform that action.", + "misc.refinedstorage:start": "Start", + "misc.refinedstorage:clear": "Clear", + "misc.refinedstorage:set": "Set", + "misc.refinedstorage:cancel_all": "Cancel All", + "misc.refinedstorage:priority": "Priority", + "misc.refinedstorage:oredict": "Oredict", + "misc.refinedstorage:processing": "Processing", + "misc.refinedstorage:reader_writer.redstone": "Redstone strength: %d", + "misc.refinedstorage:total": "%s total", + "misc.refinedstorage:last_modified.just_now": "Last modified just now by %s", + "misc.refinedstorage:last_modified.second": "Last modified %d second ago by %s", + "misc.refinedstorage:last_modified.seconds": "Last modified %d seconds ago by %s", + "misc.refinedstorage:last_modified.minute": "Last modified %d minute ago by %s", + "misc.refinedstorage:last_modified.minutes": "Last modified %d minutes ago by %s", + "misc.refinedstorage:last_modified.hour": "Last modified %d hour ago by %s", + "misc.refinedstorage:last_modified.hours": "Last modified %d hours ago by %s", + "misc.refinedstorage:last_modified.day": "Last modified %d day ago by %s", + "misc.refinedstorage:last_modified.days": "Last modified %d days ago by %s", + "misc.refinedstorage:last_modified.week": "Last modified %d week ago by %s", + "misc.refinedstorage:last_modified.weeks": "Last modified %d weeks ago by %s", + "misc.refinedstorage:last_modified.year": "Last modified %d year ago by %s", + "misc.refinedstorage:last_modified.years": "Last modified %d years ago by %s", + "sidebutton.refinedstorage:compare.1": "Use damage", + "sidebutton.refinedstorage:compare.2": "Use NBT", + "sidebutton.refinedstorage:redstone_mode": "Redstone mode", + "sidebutton.refinedstorage:redstone_mode.0": "Ignore redstone signal", + "sidebutton.refinedstorage:redstone_mode.1": "Only work with redstone signal", + "sidebutton.refinedstorage:redstone_mode.2": "Only work without redstone signal", + "sidebutton.refinedstorage:crafter_mode": "Crafter mode", + "sidebutton.refinedstorage:crafter_mode.0": "Ignore redstone signal", + "sidebutton.refinedstorage:crafter_mode.1": "Redstone signal unlocks autocrafting", + "sidebutton.refinedstorage:crafter_mode.2": "Redstone signal locks autocrafting", + "sidebutton.refinedstorage:crafter_mode.3": "Redstone pulse inserts next set", + "sidebutton.refinedstorage:grid.view_type": "Display", + "sidebutton.refinedstorage:grid.view_type.0": "Normal", + "sidebutton.refinedstorage:grid.view_type.1": "No craftables", + "sidebutton.refinedstorage:grid.view_type.2": "Only craftables", + "sidebutton.refinedstorage:grid.sorting.direction": "Sorting direction", + "sidebutton.refinedstorage:grid.sorting.direction.0": "Ascending", + "sidebutton.refinedstorage:grid.sorting.direction.1": "Descending", + "sidebutton.refinedstorage:grid.sorting.type": "Sorting type", + "sidebutton.refinedstorage:grid.sorting.type.0": "Quantity", + "sidebutton.refinedstorage:grid.sorting.type.1": "Name", + "sidebutton.refinedstorage:grid.sorting.type.2": "ID", + "sidebutton.refinedstorage:grid.sorting.type.3": "InventoryTweaks", + "sidebutton.refinedstorage:grid.sorting.type.4": "Last modified", + "sidebutton.refinedstorage:grid.search_box_mode": "Search box mode", + "sidebutton.refinedstorage:grid.search_box_mode.0": "Normal", + "sidebutton.refinedstorage:grid.search_box_mode.1": "Normal (autoselected)", + "sidebutton.refinedstorage:grid.search_box_mode.2": "JEI synchronized", + "sidebutton.refinedstorage:grid.search_box_mode.3": "JEI synchronized (autoselected)", + "sidebutton.refinedstorage:grid.size": "Size", + "sidebutton.refinedstorage:grid.size.0": "Stretch", + "sidebutton.refinedstorage:grid.size.1": "Small", + "sidebutton.refinedstorage:grid.size.2": "Medium", + "sidebutton.refinedstorage:grid.size.3": "Large", + "sidebutton.refinedstorage:mode": "Mode", + "sidebutton.refinedstorage:mode.whitelist": "Whitelist", + "sidebutton.refinedstorage:mode.blacklist": "Blacklist", + "sidebutton.refinedstorage:iomode": "IO mode", + "sidebutton.refinedstorage:iomode.insert": "Insert into network", + "sidebutton.refinedstorage:iomode.extract": "Extract from network", + "sidebutton.refinedstorage:type": "Type", + "sidebutton.refinedstorage:type.0": "Items", + "sidebutton.refinedstorage:type.1": "Fluids", + "sidebutton.refinedstorage:detector.mode": "Mode", + "sidebutton.refinedstorage:detector.mode.0": "Emit signal when under the amount", + "sidebutton.refinedstorage:detector.mode.1": "Emit signal when on the amount", + "sidebutton.refinedstorage:detector.mode.2": "Emit signal when above the amount", + "sidebutton.refinedstorage:constructor.drop": "Drop blocks instead of placing", + "sidebutton.refinedstorage:destructor.pickup": "Pickup items instead of breaking", + "sidebutton.refinedstorage:access_type": "Access type", + "sidebutton.refinedstorage:access_type.0": "Insert and extract", + "sidebutton.refinedstorage:access_type.1": "Insert only", + "sidebutton.refinedstorage:access_type.2": "Extract only", + "block.refinedstorage:controller.0": "Controller", + "block.refinedstorage:controller.1": "Creative Controller", + "block.refinedstorage:cable": "Cable", + "block.refinedstorage:grid.0": "Grid", + "block.refinedstorage:grid.1": "Crafting Grid", + "block.refinedstorage:grid.2": "Pattern Grid", + "block.refinedstorage:grid.3": "Fluid Grid", + "block.refinedstorage:disk_drive": "Disk Drive", + "block.refinedstorage:disk_manipulator": "Disk Manipulator", + "block.refinedstorage:external_storage": "External Storage", + "block.refinedstorage:importer": "Importer", + "block.refinedstorage:exporter": "Exporter", + "block.refinedstorage:detector": "Detector", + "block.refinedstorage:machine_casing": "Machine Casing", + "block.refinedstorage:destructor": "Destructor", + "block.refinedstorage:constructor": "Constructor", + "block.refinedstorage:storage.0": "1k Storage Block", + "block.refinedstorage:storage.1": "4k Storage Block", + "block.refinedstorage:storage.2": "16k Storage Block", + "block.refinedstorage:storage.3": "64k Storage Block", + "block.refinedstorage:storage.4": "Creative Storage Block", + "block.refinedstorage:relay": "Relay", + "block.refinedstorage:interface": "Interface", + "block.refinedstorage:crafting_monitor": "Crafting Monitor", + "block.refinedstorage:wireless_transmitter": "Wireless Transmitter", + "block.refinedstorage:wireless_transmitter.tooltip": "Must be placed on %s.", + "block.refinedstorage:crafter": "Crafter", + "block.refinedstorage:network_receiver": "Network Receiver", + "block.refinedstorage:network_transmitter": "Network Transmitter", + "block.refinedstorage:fluid_interface": "Fluid Interface", + "block.refinedstorage:fluid_storage.0": "64k Fluid Storage Block", + "block.refinedstorage:fluid_storage.1": "256k Fluid Storage Block", + "block.refinedstorage:fluid_storage.2": "1024k Fluid Storage Block", + "block.refinedstorage:fluid_storage.3": "4096k Fluid Storage Block", + "block.refinedstorage:fluid_storage.4": "Creative Fluid Storage Block", + "block.refinedstorage:reader": "Reader", + "block.refinedstorage:writer": "Writer", + "block.refinedstorage:security_manager": "Security Manager", + "block.refinedstorage:quartz_enriched_iron_block": "Block of Quartz Enriched Iron", + "block.refinedstorage:storage_monitor": "Storage Monitor", + "block.refinedstorage:portable_grid.0": "Portable Grid", + "block.refinedstorage:portable_grid.1": "Creative Portable Grid", + "block.refinedstorage:portable_grid.tooltip": "Sneak to place in the world.", + "block.refinedstorage:crafter_manager": "Crafter Manager", + "item.refinedstorage:storage_disk.0": "1k Storage Disk", + "item.refinedstorage:storage_disk.1": "4k Storage Disk", + "item.refinedstorage:storage_disk.2": "16k Storage Disk", + "item.refinedstorage:storage_disk.3": "64k Storage Disk", + "item.refinedstorage:storage_disk.4": "Creative Storage Disk", + "item.refinedstorage:storage_disk.5": "Debug Storage Disk", + "item.refinedstorage:fluid_storage_disk.0": "64k Fluid Storage Disk", + "item.refinedstorage:fluid_storage_disk.1": "256k Fluid Storage Disk", + "item.refinedstorage:fluid_storage_disk.2": "1024k Fluid Storage Disk", + "item.refinedstorage:fluid_storage_disk.3": "4096k Fluid Storage Disk", + "item.refinedstorage:fluid_storage_disk.4": "Creative Fluid Storage Disk", + "item.refinedstorage:fluid_storage_disk.5": "Debug Fluid Storage Disk", + "item.refinedstorage:wireless_grid.0": "Wireless Grid", + "item.refinedstorage:wireless_grid.1": "Creative Wireless Grid", + "item.refinedstorage:wireless_fluid_grid.0": "Wireless Fluid Grid", + "item.refinedstorage:wireless_fluid_grid.1": "Creative Wireless Fluid Grid", + "item.refinedstorage:wireless_crafting_monitor.0": "Wireless Crafting Monitor", + "item.refinedstorage:wireless_crafting_monitor.1": "Creative Wireless Crafting Monitor", + "item.refinedstorage:quartz_enriched_iron": "Quartz Enriched Iron", + "item.refinedstorage.construction_core": "Construction Core", + "item.refinedstorage.destruction_core": "Destruction Core", + "item.refinedstorage:silicon": "Silicon", + "item.refinedstorage:processor.0": "Raw Basic Processor", + "item.refinedstorage:processor.1": "Raw Improved Processor", + "item.refinedstorage:processor.2": "Raw Advanced Processor", + "item.refinedstorage:processor.3": "Basic Processor", + "item.refinedstorage:processor.4": "Improved Processor", + "item.refinedstorage:processor.5": "Advanced Processor", + "item.refinedstorage:storage_part.0": "1k Storage Part", + "item.refinedstorage:storage_part.1": "4k Storage Part", + "item.refinedstorage:storage_part.2": "16k Storage Part", + "item.refinedstorage:storage_part.3": "64k Storage Part", + "item.refinedstorage:fluid_storage_part.0": "64k Fluid Storage Part", + "item.refinedstorage:fluid_storage_part.1": "256k Fluid Storage Part", + "item.refinedstorage:fluid_storage_part.2": "1024k Fluid Storage Part", + "item.refinedstorage:fluid_storage_part.3": "4096k Fluid Storage Part", + "item.refinedstorage:pattern": "Pattern", + "item.refinedstorage:upgrade.0": "Upgrade", + "item.refinedstorage:upgrade.1": "Range Upgrade", + "item.refinedstorage:upgrade.2": "Speed Upgrade", + "item.refinedstorage:upgrade.3": "Crafting Upgrade", + "item.refinedstorage:upgrade.4": "Stack Upgrade", + "item.refinedstorage:upgrade.6": "Silk Touch Upgrade", + "item.refinedstorage:upgrade.7": "Fortune Upgrade", + "item.refinedstorage:upgrade.8": "Fortune Upgrade", + "item.refinedstorage:upgrade.9": "Fortune Upgrade", + "item.refinedstorage:storage_housing": "Storage Housing", + "item.refinedstorage:filter": "Filter", + "item.refinedstorage:network_card": "Network Card", + "item.refinedstorage:wrench": "Wrench", + "item.refinedstorage:security_card": "Security Card", + "item.refinedstorage:security_card.owner": "Bound to: %s", + "item.refinedstorage:cutting_tool": "Cutting Tool", + "item.refinedstorage:cover": "Cover", + "item.refinedstorage:hollow_cover": "Hollow Cover", + "item.refinedstorage:processor_binding": "Processor Binding", + "commands.refinedstorage.createdisk.usage": "/createdisk ", + "commands.refinedstorage.createdisk.error.notADisk": "The given disk item is not a disk.", + "commands.refinedstorage.createdisk.error.diskNotFound": "Disk %s was not found.", + "commands.refinedstorage.createdisk.success": "Successfully gave disk %s to %s.", + "advancements.refinedstorage:controlling.description": "Craft a Controller", + "advancements.refinedstorage:connecting": "Connecting", + "advancements.refinedstorage:connecting.description": "You can place all the devices next to each other to connect them up, or, use Cable", + "advancements.refinedstorage:conditional_connecting": "Conditional connecting", + "advancements.refinedstorage:conditional_connecting.description": "Craft a Relay to control if a network signal can pass with redstone", + "advancements.refinedstorage:drives": "Drives", + "advancements.refinedstorage:drives.description": "Craft a Disk Drive to be able to store your disks", + "advancements.refinedstorage:manipulating_disks": "Manipulating disks", + "advancements.refinedstorage:manipulating_disks.description": "Use a Disk Manipulator to easily modify contents of disks", + "advancements.refinedstorage:storing_items": "Storing items", + "advancements.refinedstorage:storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage:viewing_items": "Viewing items", + "advancements.refinedstorage:viewing_items.description": "Craft a Grid to interact with your item storage", + "advancements.refinedstorage:portable_storage": "Portable storage", + "advancements.refinedstorage:portable_storage.description": "Craft a Portable Grid to access items and fluids in disks without being in a network", + "advancements.refinedstorage:upgrading_your_grid": "Upgrading your Grid", + "advancements.refinedstorage:upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities in your Grid", + "advancements.refinedstorage:storing_fluids": "Storing fluids", + "advancements.refinedstorage:storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage:viewing_fluids": "Viewing fluids", + "advancements.refinedstorage:viewing_fluids.description": "Craft a Fluid Grid to interact with your fluid storage", + "advancements.refinedstorage:better_than_a_barrel": "Better than a barrel", + "advancements.refinedstorage:better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract items of a network", + "advancements.refinedstorage:autocrafting": "Autocrafting", + "advancements.refinedstorage:autocrafting.description": "Craft a Crafter", + "advancements.refinedstorage:pattern_creation": "Pattern creation", + "advancements.refinedstorage:pattern_creation.description": "Create patterns with a Pattern Grid and a Pattern", + "advancements.refinedstorage:monitoring": "Monitoring", + "advancements.refinedstorage:monitoring.description": "Check the status of your crafting tasks with a Crafting Monitor", + "advancements.refinedstorage:managing_patterns": "Managing patterns", + "advancements.refinedstorage:managing_patterns.description": "Craft a Crafter Manager to manage your patterns in a better way", + "advancements.refinedstorage:importing": "Importing", + "advancements.refinedstorage:importing.description": "Get items or fluids into the storage network with an Importer", + "advancements.refinedstorage:destruction": "Destruction", + "advancements.refinedstorage:destruction.description": "Get blocks or fluids into the storage network with a Destructor", + "advancements.refinedstorage:exporting": "Exporting", + "advancements.refinedstorage:exporting.description": "Get items or fluids out of the storage network with an Exporter", + "advancements.refinedstorage:construction": "Construction", + "advancements.refinedstorage:construction.description": "Get blocks or fluids out of the storage network with a Constructor", + "advancements.refinedstorage:security": "Security", + "advancements.refinedstorage:security.description": "Secure your network with a Security Manager and a Security Card", + "advancements.refinedstorage:wireless": "Wireless", + "advancements.refinedstorage:wireless.description": "Transmit a network signal with a Wireless Transmitter", + "advancements.refinedstorage:wireless_items": "Wireless items", + "advancements.refinedstorage:wireless_items.description": "Interact with your item storage wirelessly with a Wireless Grid", + "advancements.refinedstorage:wireless_fluids": "Wireless fluids", + "advancements.refinedstorage:wireless_fluids.description": "Interact with your fluid storage wirelessly with a Wireless Fluid Grid", + "advancements.refinedstorage:wireless_monitoring": "Wireless monitoring", + "advancements.refinedstorage:wireless_monitoring.description": "Check the status of your crafting tasks wirelessly with a Wireless Crafting Monitor", + "advancements.refinedstorage:no_cables_required": "No cables required", + "advancements.refinedstorage:no_cables_required.description": "Add extra components to your network without using cables by using a Network Transmitter, Network Receiver and Network Card", + "advancements.refinedstorage:upgrading": "Upgrading", + "advancements.refinedstorage:upgrading.description": "Craft an Upgrade to improve various devices", + "advancements.refinedstorage:crafting_on_demand": "Crafting on demand", + "advancements.refinedstorage:crafting_on_demand.description": "Use a Crafting Upgrade in a Interface, Exporter or Constructor to craft items and blocks on demand", + "advancements.refinedstorage:more_than_just_storage": "More than just storage", + "advancements.refinedstorage:more_than_just_storage.description": "Transfer items, fluids, energy and redstone from a Reader to a Writer", + "advancements.refinedstorage:detecting": "Detecting", + "advancements.refinedstorage:detecting.description": "Detect items or fluids in the network with the Detector", + "advancements.refinedstorage:interface_to_the_world": "Interface to the world", + "advancements.refinedstorage:interface_to_the_world.description": "Export and import items at the same time with an Interface", + "advancements.refinedstorage:storing_externally": "Storing externally", + "advancements.refinedstorage:storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", + "advancements.refinedstorage:covering": "Covering", + "advancements.refinedstorage:covering.description": "Craft a Cover to hide cables", + "advancements.refinedstorage:hollow_covering": "Hollow covering", + "advancements.refinedstorage:hollow_covering.description": "Craft a Hollow Cover to hide cables, but still let cable through", + "advancements.refinedstorage:binding": "Binding", + "advancements.refinedstorage:binding.description": "Craft Processor Binding to craft the various processors" +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/lang/en_us.lang b/src/main/resources/assets/refinedstorage/lang/en_us.lang deleted file mode 100644 index 453744a5d..000000000 --- a/src/main/resources/assets/refinedstorage/lang/en_us.lang +++ /dev/null @@ -1,378 +0,0 @@ -itemGroup.refinedstorage=Refined Storage -itemGroup.refinedstorage.covers=Refined Storage Covers - -key.refinedstorage.focusSearchBar=Focus Grid Search Bar -key.refinedstorage.clearGridCraftingMatrix=Clear Grid Crafting Matrix -key.refinedstorage.openWirelessGrid=Open Wireless Grid -key.refinedstorage.openWirelessFluidGrid=Open Wireless Fluid Grid -key.refinedstorage.openPortableGrid=Open Portable Grid -key.refinedstorage.openWirelessCraftingMonitor=Open Wireless Crafting Monitor - -gui.refinedstorage:controller.0=Controller -gui.refinedstorage:controller.1=Creative Controller -gui.refinedstorage:grid=Grid -gui.refinedstorage:grid.craft=Craft -gui.refinedstorage:crafting_grid=Crafting Grid -gui.refinedstorage:pattern_grid=Pattern Grid -gui.refinedstorage:grid.pattern_create=Create -gui.refinedstorage:fluid_grid=Fluid Grid -gui.refinedstorage:item_amount=Item amount -gui.refinedstorage:fluid_amount=Fluid amount in mB -gui.refinedstorage:disk_drive=Drive -gui.refinedstorage:disk_drive.disks=Disks -gui.refinedstorage:external_storage=External Storage -gui.refinedstorage:importer=Importer -gui.refinedstorage:exporter=Exporter -gui.refinedstorage:detector=Detector -gui.refinedstorage:destructor=Destructor -gui.refinedstorage:constructor=Constructor -gui.refinedstorage:relay=Relay -gui.refinedstorage:interface.import=Interface Import -gui.refinedstorage:interface.export=Interface Export -gui.refinedstorage:crafting_monitor=Crafting Monitor -gui.refinedstorage:wireless_crafting_monitor=Wireless Crafting Monitor -gui.refinedstorage:crafting_monitor.tooltip.requested=%d requested -gui.refinedstorage:crafting_monitor.stored=Stored: %d -gui.refinedstorage:crafting_monitor.missing=Missing: %d -gui.refinedstorage:crafting_monitor.processing=Processing: %d -gui.refinedstorage:crafting_monitor.scheduled=Scheduled: %d -gui.refinedstorage:crafting_monitor.crafting=Crafting: %d -gui.refinedstorage:crafting_monitor.machine_does_not_accept_item=Machine doesn't accept item -gui.refinedstorage:crafting_monitor.machine_does_not_accept_fluid=Machine doesn't accept fluid -gui.refinedstorage:crafting_monitor.machine_none=No machine found -gui.refinedstorage:crafting_monitor.crafter_is_locked=Crafter is locked -gui.refinedstorage:wireless_transmitter=Wireless Transmitter -gui.refinedstorage:wireless_transmitter.distance=%d block(s) -gui.refinedstorage:crafter=Crafter -gui.refinedstorage:filter=Filter -gui.refinedstorage:filter.compare_damage=Damage -gui.refinedstorage:filter.compare_nbt=NBT -gui.refinedstorage:filter.mod_filter=Mod filter -gui.refinedstorage:network_transmitter=Network Transmitter -gui.refinedstorage:network_transmitter.distance=%d block(s) -gui.refinedstorage:network_transmitter.dimension=Dimension %d -gui.refinedstorage:network_transmitter.missing_card=Missing Network Card -gui.refinedstorage:fluid_interface=Fluid Interface -gui.refinedstorage:fluid_interface.in=In -gui.refinedstorage:fluid_interface.out=Out -gui.refinedstorage:crafting_preview=Crafting Preview -gui.refinedstorage:crafting_preview.to_craft=To craft: %d -gui.refinedstorage:crafting_preview.available=Available: %d -gui.refinedstorage:crafting_preview.missing=Missing: %d -gui.refinedstorage:crafting_preview.error=Request failed -gui.refinedstorage:crafting_preview.error.recursive.0=One of the crafting ingredients ended up needing -gui.refinedstorage:crafting_preview.error.recursive.1=itself. -gui.refinedstorage:crafting_preview.error.recursive.2=You need to remove the pattern or make sure -gui.refinedstorage:crafting_preview.error.recursive.3=the pattern is not used during crafting. -gui.refinedstorage:crafting_preview.error.recursive.4=Offending pattern: -gui.refinedstorage:crafting_preview.error.too_complex.0=The crafting task calculation was too complex -gui.refinedstorage:crafting_preview.error.too_complex.1=and was stopped to avoid server strain. -gui.refinedstorage:reader=Reader -gui.refinedstorage:writer=Writer -gui.refinedstorage:security_manager=Security Manager -gui.refinedstorage:security_manager.configure=Configure -gui.refinedstorage:security_manager.permission.0=Insert -gui.refinedstorage:security_manager.permission.0.tooltip=Inserting items to the network -gui.refinedstorage:security_manager.permission.1=Extract -gui.refinedstorage:security_manager.permission.1.tooltip=Extracting items from the network -gui.refinedstorage:security_manager.permission.2=Autocrafting -gui.refinedstorage:security_manager.permission.2.tooltip=Starting, cancelling and viewing crafting tasks -gui.refinedstorage:security_manager.permission.3=Modify -gui.refinedstorage:security_manager.permission.3.tooltip=Opening block GUIs -gui.refinedstorage:security_manager.permission.4=Build -gui.refinedstorage:security_manager.permission.4.tooltip=Adding or removing devices to or from the network -gui.refinedstorage:security_manager.permission.5=Security -gui.refinedstorage:security_manager.permission.5.tooltip=Ability to change security options -gui.refinedstorage:storage_monitor=Storage Monitor -gui.refinedstorage:portable_grid=Portable Grid -gui.refinedstorage:crafter_manager=Crafter Manager - -misc.refinedstorage:energy_stored=%d / %d FE -misc.refinedstorage:energy_usage=Usage: %d FE/t -misc.refinedstorage:energy_usage_minimal=%d FE/t - -misc.refinedstorage:storage.stored=Stored: %s -misc.refinedstorage:storage.stored_capacity=Stored: %s / %s -misc.refinedstorage:storage.stored_minimal=%s -misc.refinedstorage:storage.stored_capacity_minimal=%s / %s -misc.refinedstorage:storage.full=%d%% full - -misc.refinedstorage:network_item.tooltip=Linked to %d, %d, %d. -misc.refinedstorage:network_item.out_of_range=There is no Wireless Transmitter in range. -misc.refinedstorage:network_item.not_found=Controller not found. - -misc.refinedstorage:network_card.tooltip=Linked to %d, %d, %d. - -misc.refinedstorage:pattern.inputs=Inputs -misc.refinedstorage:pattern.outputs=Outputs -misc.refinedstorage:pattern.invalid=Invalid pattern -misc.refinedstorage:pattern.oredict=Uses ore dictionary - -misc.refinedstorage:security.no_permission=You have no permission to perform that action. - -misc.refinedstorage:start=Start -misc.refinedstorage:clear=Clear -misc.refinedstorage:set=Set -misc.refinedstorage:cancel_all=Cancel All -misc.refinedstorage:priority=Priority -misc.refinedstorage:oredict=Oredict -misc.refinedstorage:processing=Processing - -misc.refinedstorage:reader_writer.redstone=Redstone strength: %d - -misc.refinedstorage:total=%s total - -misc.refinedstorage:last_modified.just_now=Last modified just now by %s -misc.refinedstorage:last_modified.second=Last modified %d second ago by %s -misc.refinedstorage:last_modified.seconds=Last modified %d seconds ago by %s -misc.refinedstorage:last_modified.minute=Last modified %d minute ago by %s -misc.refinedstorage:last_modified.minutes=Last modified %d minutes ago by %s -misc.refinedstorage:last_modified.hour=Last modified %d hour ago by %s -misc.refinedstorage:last_modified.hours=Last modified %d hours ago by %s -misc.refinedstorage:last_modified.day=Last modified %d day ago by %s -misc.refinedstorage:last_modified.days=Last modified %d days ago by %s -misc.refinedstorage:last_modified.week=Last modified %d week ago by %s -misc.refinedstorage:last_modified.weeks=Last modified %d weeks ago by %s -misc.refinedstorage:last_modified.year=Last modified %d year ago by %s -misc.refinedstorage:last_modified.years=Last modified %d years ago by %s - -sidebutton.refinedstorage:compare.1=Use damage -sidebutton.refinedstorage:compare.2=Use NBT - -sidebutton.refinedstorage:redstone_mode=Redstone mode -sidebutton.refinedstorage:redstone_mode.0=Ignore redstone signal -sidebutton.refinedstorage:redstone_mode.1=Only work with redstone signal -sidebutton.refinedstorage:redstone_mode.2=Only work without redstone signal - -sidebutton.refinedstorage:crafter_mode=Crafter mode -sidebutton.refinedstorage:crafter_mode.0=Ignore redstone signal -sidebutton.refinedstorage:crafter_mode.1=Redstone signal unlocks autocrafting -sidebutton.refinedstorage:crafter_mode.2=Redstone signal locks autocrafting -sidebutton.refinedstorage:crafter_mode.3=Redstone pulse inserts next set - -sidebutton.refinedstorage:grid.view_type=Display -sidebutton.refinedstorage:grid.view_type.0=Normal -sidebutton.refinedstorage:grid.view_type.1=No craftables -sidebutton.refinedstorage:grid.view_type.2=Only craftables -sidebutton.refinedstorage:grid.sorting.direction=Sorting direction -sidebutton.refinedstorage:grid.sorting.direction.0=Ascending -sidebutton.refinedstorage:grid.sorting.direction.1=Descending -sidebutton.refinedstorage:grid.sorting.type=Sorting type -sidebutton.refinedstorage:grid.sorting.type.0=Quantity -sidebutton.refinedstorage:grid.sorting.type.1=Name -sidebutton.refinedstorage:grid.sorting.type.2=ID -sidebutton.refinedstorage:grid.sorting.type.3=InventoryTweaks -sidebutton.refinedstorage:grid.sorting.type.4=Last modified -sidebutton.refinedstorage:grid.search_box_mode=Search box mode -sidebutton.refinedstorage:grid.search_box_mode.0=Normal -sidebutton.refinedstorage:grid.search_box_mode.1=Normal (autoselected) -sidebutton.refinedstorage:grid.search_box_mode.2=JEI synchronized -sidebutton.refinedstorage:grid.search_box_mode.3=JEI synchronized (autoselected) -sidebutton.refinedstorage:grid.size=Size -sidebutton.refinedstorage:grid.size.0=Stretch -sidebutton.refinedstorage:grid.size.1=Small -sidebutton.refinedstorage:grid.size.2=Medium -sidebutton.refinedstorage:grid.size.3=Large - -sidebutton.refinedstorage:mode=Mode -sidebutton.refinedstorage:mode.whitelist=Whitelist -sidebutton.refinedstorage:mode.blacklist=Blacklist - -sidebutton.refinedstorage:iomode=IO mode -sidebutton.refinedstorage:iomode.insert=Insert into network -sidebutton.refinedstorage:iomode.extract=Extract from network - -sidebutton.refinedstorage:type=Type -sidebutton.refinedstorage:type.0=Items -sidebutton.refinedstorage:type.1=Fluids - -sidebutton.refinedstorage:detector.mode=Mode -sidebutton.refinedstorage:detector.mode.0=Emit signal when under the amount -sidebutton.refinedstorage:detector.mode.1=Emit signal when on the amount -sidebutton.refinedstorage:detector.mode.2=Emit signal when above the amount - -sidebutton.refinedstorage:constructor.drop=Drop blocks instead of placing - -sidebutton.refinedstorage:destructor.pickup=Pickup items instead of breaking - -sidebutton.refinedstorage:access_type=Access type -sidebutton.refinedstorage:access_type.0=Insert and extract -sidebutton.refinedstorage:access_type.1=Insert only -sidebutton.refinedstorage:access_type.2=Extract only - -block.refinedstorage:controller.0.name=Controller -block.refinedstorage:controller.1.name=Creative Controller -block.refinedstorage:cable.name=Cable -block.refinedstorage:grid.0.name=Grid -block.refinedstorage:grid.1.name=Crafting Grid -block.refinedstorage:grid.2.name=Pattern Grid -block.refinedstorage:grid.3.name=Fluid Grid -block.refinedstorage:disk_drive.name=Disk Drive -block.refinedstorage:disk_manipulator.name=Disk Manipulator -block.refinedstorage:external_storage.name=External Storage -block.refinedstorage:importer.name=Importer -block.refinedstorage:exporter.name=Exporter -block.refinedstorage:detector.name=Detector -block.refinedstorage:machine_casing.name=Machine Casing -block.refinedstorage:destructor.name=Destructor -block.refinedstorage:constructor.name=Constructor -block.refinedstorage:storage.0.name=1k Storage Block -block.refinedstorage:storage.1.name=4k Storage Block -block.refinedstorage:storage.2.name=16k Storage Block -block.refinedstorage:storage.3.name=64k Storage Block -block.refinedstorage:storage.4.name=Creative Storage Block -block.refinedstorage:relay.name=Relay -block.refinedstorage:interface.name=Interface -block.refinedstorage:crafting_monitor.name=Crafting Monitor -block.refinedstorage:wireless_transmitter.name=Wireless Transmitter -block.refinedstorage:wireless_transmitter.tooltip=Must be placed on %s. -block.refinedstorage:crafter.name=Crafter -block.refinedstorage:network_receiver.name=Network Receiver -block.refinedstorage:network_transmitter.name=Network Transmitter -block.refinedstorage:fluid_interface.name=Fluid Interface -block.refinedstorage:fluid_storage.0.name=64k Fluid Storage Block -block.refinedstorage:fluid_storage.1.name=256k Fluid Storage Block -block.refinedstorage:fluid_storage.2.name=1024k Fluid Storage Block -block.refinedstorage:fluid_storage.3.name=4096k Fluid Storage Block -block.refinedstorage:fluid_storage.4.name=Creative Fluid Storage Block -block.refinedstorage:reader.name=Reader -block.refinedstorage:writer.name=Writer -block.refinedstorage:security_manager.name=Security Manager -block.refinedstorage:quartz_enriched_iron_block.name=Block of Quartz Enriched Iron -block.refinedstorage:storage_monitor.name=Storage Monitor -block.refinedstorage:portable_grid.0.name=Portable Grid -block.refinedstorage:portable_grid.1.name=Creative Portable Grid -block.refinedstorage:portable_grid.tooltip=Sneak to place in the world. -block.refinedstorage:crafter_manager.name=Crafter Manager - -item.refinedstorage:storage_disk.0.name=1k Storage Disk -item.refinedstorage:storage_disk.1.name=4k Storage Disk -item.refinedstorage:storage_disk.2.name=16k Storage Disk -item.refinedstorage:storage_disk.3.name=64k Storage Disk -item.refinedstorage:storage_disk.4.name=Creative Storage Disk -item.refinedstorage:storage_disk.5.name=Debug Storage Disk -item.refinedstorage:fluid_storage_disk.0.name=64k Fluid Storage Disk -item.refinedstorage:fluid_storage_disk.1.name=256k Fluid Storage Disk -item.refinedstorage:fluid_storage_disk.2.name=1024k Fluid Storage Disk -item.refinedstorage:fluid_storage_disk.3.name=4096k Fluid Storage Disk -item.refinedstorage:fluid_storage_disk.4.name=Creative Fluid Storage Disk -item.refinedstorage:fluid_storage_disk.5.name=Debug Fluid Storage Disk -item.refinedstorage:wireless_grid.0.name=Wireless Grid -item.refinedstorage:wireless_grid.1.name=Creative Wireless Grid -item.refinedstorage:wireless_fluid_grid.0.name=Wireless Fluid Grid -item.refinedstorage:wireless_fluid_grid.1.name=Creative Wireless Fluid Grid -item.refinedstorage:wireless_crafting_monitor.0.name=Wireless Crafting Monitor -item.refinedstorage:wireless_crafting_monitor.1.name=Creative Wireless Crafting Monitor -item.refinedstorage:quartz_enriched_iron.name=Quartz Enriched Iron -item.refinedstorage:core.0.name=Construction Core -item.refinedstorage:core.1.name=Destruction Core -item.refinedstorage:silicon.name=Silicon -item.refinedstorage:processor.0.name=Raw Basic Processor -item.refinedstorage:processor.1.name=Raw Improved Processor -item.refinedstorage:processor.2.name=Raw Advanced Processor -item.refinedstorage:processor.3.name=Basic Processor -item.refinedstorage:processor.4.name=Improved Processor -item.refinedstorage:processor.5.name=Advanced Processor -item.refinedstorage:storage_part.0.name=1k Storage Part -item.refinedstorage:storage_part.1.name=4k Storage Part -item.refinedstorage:storage_part.2.name=16k Storage Part -item.refinedstorage:storage_part.3.name=64k Storage Part -item.refinedstorage:fluid_storage_part.0.name=64k Fluid Storage Part -item.refinedstorage:fluid_storage_part.1.name=256k Fluid Storage Part -item.refinedstorage:fluid_storage_part.2.name=1024k Fluid Storage Part -item.refinedstorage:fluid_storage_part.3.name=4096k Fluid Storage Part -item.refinedstorage:pattern.name=Pattern -item.refinedstorage:upgrade.0.name=Upgrade -item.refinedstorage:upgrade.1.name=Range Upgrade -item.refinedstorage:upgrade.2.name=Speed Upgrade -item.refinedstorage:upgrade.3.name=Crafting Upgrade -item.refinedstorage:upgrade.4.name=Stack Upgrade -item.refinedstorage:upgrade.6.name=Silk Touch Upgrade -item.refinedstorage:upgrade.7.name=Fortune Upgrade -item.refinedstorage:upgrade.8.name=Fortune Upgrade -item.refinedstorage:upgrade.9.name=Fortune Upgrade -item.refinedstorage:storage_housing.name=Storage Housing -item.refinedstorage:filter.name=Filter -item.refinedstorage:network_card.name=Network Card -item.refinedstorage:wrench.name=Wrench -item.refinedstorage:security_card.name=Security Card -item.refinedstorage:security_card.owner=Bound to: %s -item.refinedstorage:cutting_tool.name=Cutting Tool -item.refinedstorage:cover.name=Cover -item.refinedstorage:hollow_cover.name=Hollow Cover -item.refinedstorage:processor_binding.name=Processor Binding - -commands.refinedstorage.createdisk.usage=/createdisk -commands.refinedstorage.createdisk.error.notADisk=The given disk item is not a disk. -commands.refinedstorage.createdisk.error.diskNotFound=Disk %s was not found. -commands.refinedstorage.createdisk.success=Successfully gave disk %s to %s. - -advancements.refinedstorage:controlling.description=Craft a Controller -advancements.refinedstorage:connecting=Connecting -advancements.refinedstorage:connecting.description=You can place all the devices next to each other to connect them up, or, use Cable -advancements.refinedstorage:conditional_connecting=Conditional connecting -advancements.refinedstorage:conditional_connecting.description=Craft a Relay to control if a network signal can pass with redstone -advancements.refinedstorage:drives=Drives -advancements.refinedstorage:drives.description=Craft a Disk Drive to be able to store your disks -advancements.refinedstorage:manipulating_disks=Manipulating disks -advancements.refinedstorage:manipulating_disks.description=Use a Disk Manipulator to easily modify contents of disks -advancements.refinedstorage:storing_items=Storing items -advancements.refinedstorage:storing_items.description=Craft a Storage Disk and put it in your Disk Drive -advancements.refinedstorage:viewing_items=Viewing items -advancements.refinedstorage:viewing_items.description=Craft a Grid to interact with your item storage -advancements.refinedstorage:portable_storage=Portable storage -advancements.refinedstorage:portable_storage.description=Craft a Portable Grid to access items and fluids in disks without being in a network -advancements.refinedstorage:upgrading_your_grid=Upgrading your Grid -advancements.refinedstorage:upgrading_your_grid.description=Upgrade your Grid to a Crafting Grid to get crafting abilities in your Grid -advancements.refinedstorage:storing_fluids=Storing fluids -advancements.refinedstorage:storing_fluids.description=Craft a Fluid Storage Disk and put it in your Disk Drive -advancements.refinedstorage:viewing_fluids=Viewing fluids -advancements.refinedstorage:viewing_fluids.description=Craft a Fluid Grid to interact with your fluid storage -advancements.refinedstorage:better_than_a_barrel=Better than a barrel -advancements.refinedstorage:better_than_a_barrel.description=Craft a Storage Monitor to view, insert or extract items of a network -advancements.refinedstorage:autocrafting=Autocrafting -advancements.refinedstorage:autocrafting.description=Craft a Crafter -advancements.refinedstorage:pattern_creation=Pattern creation -advancements.refinedstorage:pattern_creation.description=Create patterns with a Pattern Grid and a Pattern -advancements.refinedstorage:monitoring=Monitoring -advancements.refinedstorage:monitoring.description=Check the status of your crafting tasks with a Crafting Monitor -advancements.refinedstorage:managing_patterns=Managing patterns -advancements.refinedstorage:managing_patterns.description=Craft a Crafter Manager to manage your patterns in a better way -advancements.refinedstorage:importing=Importing -advancements.refinedstorage:importing.description=Get items or fluids into the storage network with an Importer -advancements.refinedstorage:destruction=Destruction -advancements.refinedstorage:destruction.description=Get blocks or fluids into the storage network with a Destructor -advancements.refinedstorage:exporting=Exporting -advancements.refinedstorage:exporting.description=Get items or fluids out of the storage network with an Exporter -advancements.refinedstorage:construction=Construction -advancements.refinedstorage:construction.description=Get blocks or fluids out of the storage network with a Constructor -advancements.refinedstorage:security=Security -advancements.refinedstorage:security.description=Secure your network with a Security Manager and a Security Card -advancements.refinedstorage:wireless=Wireless -advancements.refinedstorage:wireless.description=Transmit a network signal with a Wireless Transmitter -advancements.refinedstorage:wireless_items=Wireless items -advancements.refinedstorage:wireless_items.description=Interact with your item storage wirelessly with a Wireless Grid -advancements.refinedstorage:wireless_fluids=Wireless fluids -advancements.refinedstorage:wireless_fluids.description=Interact with your fluid storage wirelessly with a Wireless Fluid Grid -advancements.refinedstorage:wireless_monitoring=Wireless monitoring -advancements.refinedstorage:wireless_monitoring.description=Check the status of your crafting tasks wirelessly with a Wireless Crafting Monitor -advancements.refinedstorage:no_cables_required=No cables required -advancements.refinedstorage:no_cables_required.description=Add extra components to your network without using cables by using a Network Transmitter, Network Receiver and Network Card -advancements.refinedstorage:upgrading=Upgrading -advancements.refinedstorage:upgrading.description=Craft an Upgrade to improve various devices -advancements.refinedstorage:crafting_on_demand=Crafting on demand -advancements.refinedstorage:crafting_on_demand.description=Use a Crafting Upgrade in a Interface, Exporter or Constructor to craft items and blocks on demand -advancements.refinedstorage:more_than_just_storage=More than just storage -advancements.refinedstorage:more_than_just_storage.description=Transfer items, fluids, energy and redstone from a Reader to a Writer -advancements.refinedstorage:detecting=Detecting -advancements.refinedstorage:detecting.description=Detect items or fluids in the network with the Detector -advancements.refinedstorage:interface_to_the_world=Interface to the world -advancements.refinedstorage:interface_to_the_world.description=Export and import items at the same time with an Interface -advancements.refinedstorage:storing_externally=Storing externally -advancements.refinedstorage:storing_externally.description=Use an External Storage to provide the network with storage from an external block like a chest -advancements.refinedstorage:covering=Covering -advancements.refinedstorage:covering.description=Craft a Cover to hide cables -advancements.refinedstorage:hollow_covering=Hollow covering -advancements.refinedstorage:hollow_covering.description=Craft a Hollow Cover to hide cables, but still let cable through -advancements.refinedstorage:binding=Binding -advancements.refinedstorage:binding.description=Craft Processor Binding to craft the various processors \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/logo.png b/src/main/resources/logo.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/logo.png rename to src/main/resources/logo.png