From 32eccdec9c3dfc5317a5436c339c0aa5fd3b7776 Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Wed, 3 Apr 2019 10:50:13 -0700 Subject: [PATCH] Rename all Mekanica -> Mekanism --- .github/ISSUE_TEMPLATE/general-issue.md | 2 +- etc/core/mcmod.info | 2 +- etc/generators/mcmod.info | 4 ++-- etc/tools/mcmod.info | 4 ++-- src/main/java/mekanism/client/ClientProxy.java | 2 +- src/main/java/mekanism/common/CommonProxy.java | 10 +++++----- src/main/java/mekanism/common/Mekanism.java | 2 +- .../common/item/ItemNetworkReader.java | 2 +- .../tile/TileEntityAdvancedBoundingBlock.java | 2 +- .../mekanism/tools/common/MekanismTools.java | 2 +- .../tools/common/ToolsCommonProxy.java | 2 +- .../resources/assets/mekanism/lang/cs_cz.lang | 2 +- .../resources/assets/mekanism/lang/da_dk.lang | 12 ++++++------ .../resources/assets/mekanism/lang/de_de.lang | 12 ++++++------ .../resources/assets/mekanism/lang/en_us.lang | 18 +++++++++--------- .../resources/assets/mekanism/lang/es_ES.lang | 18 +++++++++--------- .../resources/assets/mekanism/lang/fr_fr.lang | 10 +++++----- .../resources/assets/mekanism/lang/it_it.lang | 10 +++++----- .../resources/assets/mekanism/lang/ja_jp.lang | 2 +- .../resources/assets/mekanism/lang/ko_kr.lang | 2 +- .../resources/assets/mekanism/lang/no_no.lang | 6 +++--- .../resources/assets/mekanism/lang/pl_pl.lang | 2 +- .../resources/assets/mekanism/lang/pt_br.lang | 12 ++++++------ .../resources/assets/mekanism/lang/pt_pt.lang | 12 ++++++------ .../resources/assets/mekanism/lang/ru_ru.lang | 10 +++++----- src/main/resources/mcmod.info | 10 +++++----- 26 files changed, 86 insertions(+), 86 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/general-issue.md b/.github/ISSUE_TEMPLATE/general-issue.md index 58e6fad4d..0838bec99 100644 --- a/.github/ISSUE_TEMPLATE/general-issue.md +++ b/.github/ISSUE_TEMPLATE/general-issue.md @@ -19,7 +19,7 @@ assignees: '' #### Version (make sure you are on the latest version before reporting): **Forge:** -**Mekanica:** +**Mekanism:** **Other relevant version:** #### If a (crash)log is relevant for this issue, link it here: (_It's almost always relevant_) diff --git a/etc/core/mcmod.info b/etc/core/mcmod.info index f6abb94a1..aaa458408 100755 --- a/etc/core/mcmod.info +++ b/etc/core/mcmod.info @@ -1,7 +1,7 @@ [ { "modid": "mekanism", - "name": "Mekanica", + "name": "Mekanism", "description": "Tools and Machines; an active fork of Mekanism", "version": "${version}", "mcversion": "${mc_version}", diff --git a/etc/generators/mcmod.info b/etc/generators/mcmod.info index 6ea2711cb..96271a48c 100755 --- a/etc/generators/mcmod.info +++ b/etc/generators/mcmod.info @@ -1,8 +1,8 @@ [ { "modid": "mekanismgenerators", - "name": "Mekanica: Generators", - "description": "Generators module for Mekanica", + "name": "Mekanism: Generators", + "description": "Generators module for Mekanism", "version": "${version}", "mcversion": "${mc_version}", "authorList": [ diff --git a/etc/tools/mcmod.info b/etc/tools/mcmod.info index e8786376a..84e2a6527 100755 --- a/etc/tools/mcmod.info +++ b/etc/tools/mcmod.info @@ -1,8 +1,8 @@ [ { "modid": "mekanismtools", - "name": "Mekanica: Tools", - "description": "Tools module for Mekanica", + "name": "Mekanism: Tools", + "description": "Tools module for Mekanism", "version": "${version}", "mcversion": "${mc_version}", "authorList": [ diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index c704b7813..fdbc2c4f7 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -279,7 +279,7 @@ public class ClientProxy extends CommonProxy { .getBoolean(); client.baseSoundVolume = (float) Mekanism.configuration .get(Configuration.CATEGORY_CLIENT, "SoundVolume", 1D, - "Adjust Mekanica sounds' base volume. < 1 is softer, higher is louder.").getDouble(); + "Adjust Mekanism sounds' base volume. < 1 is softer, higher is louder.").getDouble(); client.machineEffects = Mekanism.configuration .get(Configuration.CATEGORY_CLIENT, "MachineEffects", true, "Show particles when machines active.") .getBoolean(); diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 15927a123..be8ed6666 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -167,7 +167,7 @@ public class CommonProxy implements IGuiProvider { "Enables recipes using Control Circuits to use OreDict'd Control Circuits from other mods.") .getBoolean(); general.logPackets = Mekanism.configuration - .get(Configuration.CATEGORY_GENERAL, "LogPackets", false, "Log Mekanica packet names. Debug setting.") + .get(Configuration.CATEGORY_GENERAL, "LogPackets", false, "Log Mekanism packet names. Debug setting.") .getBoolean(); general.dynamicTankEasterEgg = Mekanism.configuration .get(Configuration.CATEGORY_GENERAL, "DynamicTankEasterEgg", false, "Audible sparkles.").getBoolean(); @@ -176,7 +176,7 @@ public class CommonProxy implements IGuiProvider { "Allows vanilla spawners to be moved with a Cardboard Box.").getBoolean(); general.enableWorldRegeneration = Mekanism.configuration .get(Configuration.CATEGORY_GENERAL, "EnableWorldRegeneration", false, - "Allows chunks to retrogen Mekanica ore blocks.").getBoolean(); + "Allows chunks to retrogen Mekanism ore blocks.").getBoolean(); general.spawnBabySkeletons = Mekanism.configuration .get(Configuration.CATEGORY_GENERAL, "SpawnBabySkeletons", true, "Enable the spawning of baby skeletons. Think baby zombies but skeletons.") @@ -218,7 +218,7 @@ public class CommonProxy implements IGuiProvider { .get(Configuration.CATEGORY_GENERAL, "SaltVeinSize", 6, "Max number of blocks in a salt vein.", 1, Integer.MAX_VALUE).getInt(); general.userWorldGenVersion = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "WorldRegenVersion", 0, - "Change this value to cause Mekanica to regen its ore in all loaded chunks.") + "Change this value to cause Mekanism to regen its ore in all loaded chunks.") .getInt(); general.FROM_IC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "JoulesToEU", 10D, "Conversion multiplier from EU to Joules (EU * JoulesToEU = Joules)").getDouble(); @@ -347,7 +347,7 @@ public class CommonProxy implements IGuiProvider { .getBoolean(); String s = Mekanism.configuration - .get(Configuration.CATEGORY_GENERAL, "EnergyType", "RF", "Displayed energy type in Mekanica GUIs.", + .get(Configuration.CATEGORY_GENERAL, "EnergyType", "RF", "Displayed energy type in Mekanism GUIs.", new String[]{"J", "RF", "EU", "T"}) .getString().trim().toLowerCase(); @@ -368,7 +368,7 @@ public class CommonProxy implements IGuiProvider { s = Mekanism.configuration .get(Configuration.CATEGORY_GENERAL, "Temperature Units", "K", - "Displayed temperature unit in Mekanica GUIs.", new String[]{"K", "C", "R", "F"}) + "Displayed temperature unit in Mekanism GUIs.", new String[]{"K", "C", "R", "F"}) .getString(); if (s != null) { diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 031d80bab..0ab36bb63 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -196,7 +196,7 @@ import org.apache.logging.log4j.Logger; public class Mekanism { public static final String MODID = "mekanism"; - public static final String MOD_NAME = "Mekanica"; + public static final String MOD_NAME = "Mekanism"; public static final String LOG_TAG = '[' + MOD_NAME + ']'; public static final PlayerState playerState = new PlayerState(); public static final Set freeRunnerOn = new HashSet<>(); diff --git a/src/main/java/mekanism/common/item/ItemNetworkReader.java b/src/main/java/mekanism/common/item/ItemNetworkReader.java index 93f08a5d0..f8886ca4c 100644 --- a/src/main/java/mekanism/common/item/ItemNetworkReader.java +++ b/src/main/java/mekanism/common/item/ItemNetworkReader.java @@ -151,7 +151,7 @@ public class ItemNetworkReader extends ItemEnergized { if (player.isSneaking() && MekanismAPI.debug) { String[] strings = TransmitterNetworkRegistry.getInstance().toStrings(); player.sendMessage(new TextComponentString( - EnumColor.GREY + "---------- " + EnumColor.DARK_BLUE + "[Mekanica Debug]" + EnumColor.GREY + EnumColor.GREY + "---------- " + EnumColor.DARK_BLUE + "[Mekanism Debug]" + EnumColor.GREY + " ----------")); for (String s : strings) { diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java index eaa818a0d..e265ebf63 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java @@ -344,7 +344,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp // On the off chance that another block got placed there (which seems only likely with corruption, // go ahead and log what we found. Mekanism.logger.warn("getInv() references a position that does not implement IAdvancedBoundingBlock: {}\n" + - "\tFound instead: {}\nPlease report this to the maintainer of Mekanica!", mainPos, tile); + "\tFound instead: {}\nPlease report this to the maintainer of Mekanism!", mainPos, tile); } return null; diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index a78a9a71f..3a862ad7f 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -104,7 +104,7 @@ public class MekanismTools implements IModule { proxy.loadConfiguration(); //Finalization - Mekanism.logger.info("Loaded 'Mekanica: Tools' module."); + Mekanism.logger.info("Loaded 'Mekanism: Tools' module."); } public void addItems() { diff --git a/src/main/java/mekanism/tools/common/ToolsCommonProxy.java b/src/main/java/mekanism/tools/common/ToolsCommonProxy.java index f79d84e1f..d8ca297e3 100644 --- a/src/main/java/mekanism/tools/common/ToolsCommonProxy.java +++ b/src/main/java/mekanism/tools/common/ToolsCommonProxy.java @@ -10,7 +10,7 @@ public class ToolsCommonProxy { */ public void loadConfiguration() { tools.armorSpawnRate = Mekanism.configuration - .get("tools.general", "MobArmorSpawnRate", 0.03, "The chance that Mekanica Armor can spawn on mobs.", + .get("tools.general", "MobArmorSpawnRate", 0.03, "The chance that Mekanism Armor can spawn on mobs.", 0.00, 1.00).getDouble(0.03); if (Mekanism.configuration.hasChanged()) { diff --git a/src/main/resources/assets/mekanism/lang/cs_cz.lang b/src/main/resources/assets/mekanism/lang/cs_cz.lang index 66138935f..01b0039a3 100644 --- a/src/main/resources/assets/mekanism/lang/cs_cz.lang +++ b/src/main/resources/assets/mekanism/lang/cs_cz.lang @@ -930,7 +930,7 @@ reactor.depleted=Nedostatek Paliva reactor.depleted.desc=Reaktor má nedostatek paliva k udržení reakce # Creative tab -itemGroup.tabMekanism=Mekanica +itemGroup.tabMekanism=Mekanism ############# # GENERATORS diff --git a/src/main/resources/assets/mekanism/lang/da_dk.lang b/src/main/resources/assets/mekanism/lang/da_dk.lang index 5ca6520b8..932a8945f 100644 --- a/src/main/resources/assets/mekanism/lang/da_dk.lang +++ b/src/main/resources/assets/mekanism/lang/da_dk.lang @@ -383,18 +383,18 @@ entity.Robit.name=Robit entity.BabySkeleton.name=Baby Skelet # Config Gui -mekanism.configgui.ctgy.general=Mekanica Generelle Indstillinger +mekanism.configgui.ctgy.general=Mekanism Generelle Indstillinger mekanism.configgui.ctgy.machines=Maskinindstillinger mekanism.configgui.ctgy.tier=Tierindstillinger mekanism.configgui.ctgy.usage=Brugsindstillinger mekanism.configgui.ctgy.client=Klientindstillinger # Config Tooltips -mekanism.configgui.ctgy.general.tooltip=Generelle indstillinger vedr. Mekanica og alle dets moduler +mekanism.configgui.ctgy.general.tooltip=Generelle indstillinger vedr. Mekanism og alle dets moduler mekanism.configgui.ctgy.machines.tooltip=Indstillinger vedr. aktivering og deaktivering af specifikke maskiner -mekanism.configgui.ctgy.tier.tooltip=Indstillinger vedr. Mekanica tiers og deres tilsvarende værdier +mekanism.configgui.ctgy.tier.tooltip=Indstillinger vedr. Mekanism tiers og deres tilsvarende værdier mekanism.configgui.ctgy.usage.tooltip=Indstillinger vedr. machinery og deres energiforbrug -mekanism.configgui.ctgy.client.tooltip=Klientspecifikke indstillinger vedr. Mekanica og alle dets moduler +mekanism.configgui.ctgy.client.tooltip=Klientspecifikke indstillinger vedr. Mekanism og alle dets moduler # Gui text gui.condensentrating=Condensentrating @@ -783,7 +783,7 @@ tooltip.Crusher=En maskine brugt til at knuse barrer om til deres støvmodparter tooltip.DigitalMiner=En højtavanceret, filterbaseret, auto-miner der kan mine hvilken som helst blok du beder den om inden for en 32-bloks(maks)radius. tooltip.MetallurgicInfuser=En maskine brugt til at infuse adskillige materialer om til (generelt) metaller til at lave legeringer og andre sammensætninger. tooltip.PurificationChamber=En avanceret maskine i stand til at processere malm om til the klumper: Bruges som det indledende fase i 300%-malmforarbejdning. -tooltip.EnergizedSmelter=En simpel maskine der bruges som en Mekanica-baseret ovn, der kører på energy. +tooltip.EnergizedSmelter=En simpel maskine der bruges som en Mekanism-baseret ovn, der kører på energy. tooltip.Teleporter=En maskine i stand til at teleportere spillere til forskellige steder defineret af en anden teleporter. tooltip.ElectricPump=En avanceret pumpe i stand til at pumpe en hele lavasø op. tooltip.Chargepad=En universal chargepad der kan lade enhver energibaseret ting fra enhver mod. @@ -909,7 +909,7 @@ reactor.depleted=Utilstrækkelig Brændstof reactor.depleted.desc=Reaktoren har utilstrækkelig brændstof til at vedligeholde en reaktion # Creative tab -itemGroup.tabMekanism=Mekanica +itemGroup.tabMekanism=Mekanism ############# # GENERATORS diff --git a/src/main/resources/assets/mekanism/lang/de_de.lang b/src/main/resources/assets/mekanism/lang/de_de.lang index 6365c2f90..811646d74 100644 --- a/src/main/resources/assets/mekanism/lang/de_de.lang +++ b/src/main/resources/assets/mekanism/lang/de_de.lang @@ -388,18 +388,18 @@ entity.Robit.name=Robit entity.BabySkeleton.name=Baby-Skelett # Config Gui -mekanism.configgui.ctgy.general=Mekanica: Generelle Einstellungen +mekanism.configgui.ctgy.general=Mekanism: Generelle Einstellungen mekanism.configgui.ctgy.machines=Maschineneinstellungen mekanism.configgui.ctgy.tier=Stufeneintellungen mekanism.configgui.ctgy.usage=Nutzungseinstellungen mekanism.configgui.ctgy.client=Client-Einstellungen # Config Tooltips -mekanism.configgui.ctgy.general.tooltip=Generelle Einstellungen bezüglich Mekanica und all seinen Modulen +mekanism.configgui.ctgy.general.tooltip=Generelle Einstellungen bezüglich Mekanism und all seinen Modulen mekanism.configgui.ctgy.machines.tooltip=Einstellungen bezüglich dem (De-)Aktivieren bestimmter Maschinerie -mekanism.configgui.ctgy.tier.tooltip=Einstellugen bezüglich der Upgrade-Stufen in Mekanica und ihren Werten +mekanism.configgui.ctgy.tier.tooltip=Einstellugen bezüglich der Upgrade-Stufen in Mekanism und ihren Werten mekanism.configgui.ctgy.usage.tooltip=Einstellungen bezüglich Maschinerie und ihren Energieverbauch -mekanism.configgui.ctgy.client.tooltip=Client-spezifische Einstellungen bezüglich Mekanica und seinen Modulen +mekanism.configgui.ctgy.client.tooltip=Client-spezifische Einstellungen bezüglich Mekanism und seinen Modulen # Gui text gui.condensentrating=Kondensentrieren @@ -795,7 +795,7 @@ tooltip.Crusher=Eine Maschine, genutzt, um Barren in ihre entsprechenden !nStäu tooltip.DigitalMiner=Ein äußerst fortschrittlicher, Filter-basierter !nAuto-Minierer, der alles abbauen kann, was du willst, !ninnerhalb eines Radius von 32 Blöcken (max). tooltip.MetallurgicInfuser=Eine Maschine, genutzt, um verschiedene Materialien !n(generell) in Metalle einzuflößen, um Legierungen !nund andere Komponenten zu kreieren. tooltip.PurificationChamber=Eine fortgeschrittene Maschine, fähig, Erze zu !ndrei Klumpen zu verarbeiten, was im Anfangsstadium !n300% an Erzverarbeitung bietet. -tooltip.EnergizedSmelter=Eine einfache Maschine, die einen Mekanica-basierten !nOfen bietet, der mit Energie läuft. +tooltip.EnergizedSmelter=Eine einfache Maschine, die einen Mekanism-basierten !nOfen bietet, der mit Energie läuft. tooltip.Teleporter=Eine Maschine, fähig, Spieler zu verschiedenen Orten, !ndefiniert durch andere Teleporter, zu teleportieren. tooltip.ElectricPump=Eine fortgeschrittene Pumpe, fähig, !nganze Lavaseen auszupumpen. tooltip.PersonalChest=Eine 54-Slot-Truhe, die von überall aus geöffnet werden kann - sogar von deinem eigenen Inventar aus. @@ -929,7 +929,7 @@ reactor.depleted=Nicht genug Treibstoff reactor.depleted.desc=Der Reaktor hat nicht genügend Treibstoff, um eine Reaktion instandzuhalten # Creative tab -itemGroup.tabMekanism=Mekanica +itemGroup.tabMekanism=Mekanism ############# # GENERATORS diff --git a/src/main/resources/assets/mekanism/lang/en_us.lang b/src/main/resources/assets/mekanism/lang/en_us.lang index 414ffce4b..fd0476ca9 100644 --- a/src/main/resources/assets/mekanism/lang/en_us.lang +++ b/src/main/resources/assets/mekanism/lang/en_us.lang @@ -417,11 +417,11 @@ mekanism.configgui.ctgy.usage=Usage Settings mekanism.configgui.ctgy.client=Client Settings # Config Tooltips -mekanism.configgui.ctgy.general.tooltip=General settings regarding Mekanica and all its modules +mekanism.configgui.ctgy.general.tooltip=General settings regarding Mekanism and all its modules mekanism.configgui.ctgy.machines.tooltip=Settings regarding enabling and disabling of specific machinery -mekanism.configgui.ctgy.tier.tooltip=Settings regarding Mekanica tiers and their corresponding values +mekanism.configgui.ctgy.tier.tooltip=Settings regarding Mekanism tiers and their corresponding values mekanism.configgui.ctgy.usage.tooltip=Settings regarding machinery and their energy usage -mekanism.configgui.ctgy.client.tooltip=Client-specific settings regarding Mekanica and all its modules +mekanism.configgui.ctgy.client.tooltip=Client-specific settings regarding Mekanism and all its modules # Gui text gui.condensentrating=Condensentrating @@ -842,7 +842,7 @@ tooltip.Crusher=A machine used to crush ingots into their dust counterparts, as tooltip.DigitalMiner=A highly-advanced, filter-based, auto-miner that can mine whatever block you tell it to within a 32 block (max) radius. tooltip.MetallurgicInfuser=A machine used to infuse various materials into (generally) metals to create metal alloys and other compounds. tooltip.PurificationChamber=An advanced machine capable of processing ores into three clumps, serving as the initial stage of 300% ore processing. -tooltip.EnergizedSmelter=A simple machine that serves as a Mekanica-based furnace that runs off of energy. +tooltip.EnergizedSmelter=A simple machine that serves as a Mekanism-based furnace that runs off of energy. tooltip.Teleporter=A machine capable of teleporting players to various locations defined by another teleporter. tooltip.ElectricPump=An advanced, upgradeable pump, capable of extracting any type of fluid. tooltip.PersonalChest=A 54-slot chest that can be opened anywhere- even from your own inventory. @@ -978,7 +978,7 @@ reactor.depleted=Insufficient Fuel reactor.depleted.desc=The reactor has insufficient fuel to sustain a reaction # Creative tab -itemGroup.tabMekanism=Mekanica +itemGroup.tabMekanism=Mekanism ############ # GENERATORS @@ -1035,7 +1035,7 @@ mekanism.configgui.ctgy.generators.generators=Generator Settings mekanism.configgui.ctgy.generators.generation=Generation Settings # Config Tooltips -mekanism.configgui.ctgy.generators.general.tooltip=Settings regarding MekanicaGenerators' general configuration +mekanism.configgui.ctgy.generators.general.tooltip=Settings regarding MekanismGenerators' general configuration mekanism.configgui.ctgy.generators.generators.tooltip=Settings regarding enabling and disabling of specific generators mekanism.configgui.ctgy.generators.generation.tooltip=Settings regarding the energy usage of generators @@ -1128,9 +1128,9 @@ mekanism.configgui.ctgy.tools.armor=Armor Balance mekanism.configgui.ctgy.tools.tools=Tools Balance # Config Tooltips -mekanism.configgui.ctgy.tools.general.tooltip=Settings regarding MekanicaTools' general configuration -mekanism.configgui.ctgy.tools.armor.tooltip=Settings regarding the protection values and balance of MekanicaTools armor sets -mekanism.configgui.ctgy.tools.tools.tooltip=Settings regarding the efficiency values and balance of MekanicaTools tool sets +mekanism.configgui.ctgy.tools.general.tooltip=Settings regarding MekanismTools' general configuration +mekanism.configgui.ctgy.tools.armor.tooltip=Settings regarding the protection values and balance of MekanismTools armor sets +mekanism.configgui.ctgy.tools.tools.tooltip=Settings regarding the efficiency values and balance of MekanismTools tool sets # Commands cmd.mek.usage= diff --git a/src/main/resources/assets/mekanism/lang/es_ES.lang b/src/main/resources/assets/mekanism/lang/es_ES.lang index 02c506492..55f0e5b37 100644 --- a/src/main/resources/assets/mekanism/lang/es_ES.lang +++ b/src/main/resources/assets/mekanism/lang/es_ES.lang @@ -836,15 +836,15 @@ mekanism.configgui.ctgy.client=Client Settings # Config Tooltips -mekanism.configgui.ctgy.general.tooltip=General settings regarding Mekanica and all its modules +mekanism.configgui.ctgy.general.tooltip=General settings regarding Mekanism and all its modules mekanism.configgui.ctgy.machines.tooltip=Settings regarding enabling and disabling of specific machinery -mekanism.configgui.ctgy.tier.tooltip=Settings regarding Mekanica tiers and their corresponding values +mekanism.configgui.ctgy.tier.tooltip=Settings regarding Mekanism tiers and their corresponding values mekanism.configgui.ctgy.usage.tooltip=Settings regarding machinery and their energy usage -mekanism.configgui.ctgy.client.tooltip=Client-specific settings regarding Mekanica and all its modules +mekanism.configgui.ctgy.client.tooltip=Client-specific settings regarding Mekanism and all its modules @@ -1686,7 +1686,7 @@ tooltip.MetallurgicInfuser=A machine used to infuse various materials into (gene tooltip.PurificationChamber=An advanced machine capable of processing ores into three clumps, serving as the initial stage of 300% ore processing. -tooltip.EnergizedSmelter=A simple machine that serves as a Mekanica-based furnace that runs off of energy. +tooltip.EnergizedSmelter=A simple machine that serves as a Mekanism-based furnace that runs off of energy. tooltip.Teleporter=A machine capable of teleporting players to various locations defined by another teleporter. @@ -1958,7 +1958,7 @@ reactor.depleted.desc=The reactor has insufficient fuel to sustain a reaction # Creative tab -itemGroup.tabMekanism=Mekanica +itemGroup.tabMekanism=Mekanism @@ -2072,7 +2072,7 @@ mekanism.configgui.ctgy.generators.generation=Generation Settings # Config Tooltips -mekanism.configgui.ctgy.generators.general.tooltip=Settings regarding MekanicaGenerators' general configuration +mekanism.configgui.ctgy.generators.general.tooltip=Settings regarding MekanismGenerators' general configuration mekanism.configgui.ctgy.generators.generators.tooltip=Settings regarding enabling and disabling of specific generators @@ -2258,11 +2258,11 @@ mekanism.configgui.ctgy.tools.tools=Tools Balance # Config Tooltips -mekanism.configgui.ctgy.tools.general.tooltip=Settings regarding MekanicaTools' general configuration +mekanism.configgui.ctgy.tools.general.tooltip=Settings regarding MekanismTools' general configuration -mekanism.configgui.ctgy.tools.armor.tooltip=Settings regarding the protection values and balance of MekanicaTools armor sets +mekanism.configgui.ctgy.tools.armor.tooltip=Settings regarding the protection values and balance of MekanismTools armor sets -mekanism.configgui.ctgy.tools.tools.tooltip=Settings regarding the efficiency values and balance of MekanicaTools tool sets +mekanism.configgui.ctgy.tools.tools.tooltip=Settings regarding the efficiency values and balance of MekanismTools tool sets diff --git a/src/main/resources/assets/mekanism/lang/fr_fr.lang b/src/main/resources/assets/mekanism/lang/fr_fr.lang index 341aa851e..446bed5b4 100644 --- a/src/main/resources/assets/mekanism/lang/fr_fr.lang +++ b/src/main/resources/assets/mekanism/lang/fr_fr.lang @@ -385,18 +385,18 @@ entity.Robit.name=Robit entity.BabySkeleton.name=Bébé squelette # Config Gui -mekanism.configgui.ctgy.general=Paramètres généraux de Mekanica +mekanism.configgui.ctgy.general=Paramètres généraux de Mekanism mekanism.configgui.ctgy.machines=Paramètres des machines mekanism.configgui.ctgy.tier=Paramètres de niveau mekanism.configgui.ctgy.usage=Paramètres d'utilisation mekanism.configgui.ctgy.client=Paramètres client # Config Tooltips -mekanism.configgui.ctgy.general.tooltip=Paramètres générales de Mekanica et de tous ses modules +mekanism.configgui.ctgy.general.tooltip=Paramètres générales de Mekanism et de tous ses modules mekanism.configgui.ctgy.machines.tooltip=paramètres d'activation ou de désactivation de machinerie spécifique -mekanism.configgui.ctgy.tier.tooltip=Paramètres de niveau Mekanica et de leur valeur correspondantes +mekanism.configgui.ctgy.tier.tooltip=Paramètres de niveau Mekanism et de leur valeur correspondantes mekanism.configgui.ctgy.usage.tooltip=Paramètres de la machinerie et de leur utilisation énergétique -mekanism.configgui.ctgy.client.tooltip=Paramètres spécifiques au client de Mekanica et de tous ses modules +mekanism.configgui.ctgy.client.tooltip=Paramètres spécifiques au client de Mekanism et de tous ses modules # Gui text gui.condensentrating=Condensation @@ -878,7 +878,7 @@ reactor.depleted=Carburant insuffisant reactor.depleted.desc=Le réacteur manque de carburant pour maintenir la réaction # Creative tab -itemGroup.tabMekanism=Mekanica +itemGroup.tabMekanism=Mekanism ############## # GENERATORS diff --git a/src/main/resources/assets/mekanism/lang/it_it.lang b/src/main/resources/assets/mekanism/lang/it_it.lang index b30118f76..2b51a5e9d 100644 --- a/src/main/resources/assets/mekanism/lang/it_it.lang +++ b/src/main/resources/assets/mekanism/lang/it_it.lang @@ -356,18 +356,18 @@ entity.Robit.name=Robit entity.BabySkeleton.name=Scheletro baby # Config Gui -mekanism.configgui.ctgy.general=Impostazioni generali di Mekanica +mekanism.configgui.ctgy.general=Impostazioni generali di Mekanism mekanism.configgui.ctgy.machines=Impostazioni dei macchinario mekanism.configgui.ctgy.tier=Impostazioni dei livelli mekanism.configgui.ctgy.usage=Impostazioni dell'uso mekanism.configgui.ctgy.client=Impostazioni del client # Config Tooltips -mekanism.configgui.ctgy.general.tooltip=Impostazioni generali riguardo a Mekanica e ai suoi moduli +mekanism.configgui.ctgy.general.tooltip=Impostazioni generali riguardo a Mekanism e ai suoi moduli mekanism.configgui.ctgy.machines.tooltip=Impostazioni riguardo all'attivare e disattivare di macchinari specifici -mekanism.configgui.ctgy.tier.tooltip=Impostazioni riguardo ai livelli di Mekanica e i loro valori corrispondenti +mekanism.configgui.ctgy.tier.tooltip=Impostazioni riguardo ai livelli di Mekanism e i loro valori corrispondenti mekanism.configgui.ctgy.usage.tooltip=Impostazioni riguardo ai macchinari e al loro uso di energia -mekanism.configgui.ctgy.client.tooltip=Impostazioni specifici del Client riguardo a Mekanica e ai suoi moduli +mekanism.configgui.ctgy.client.tooltip=Impostazioni specifici del Client riguardo a Mekanism e ai suoi moduli # Gui text gui.remove=Rimuovi @@ -792,7 +792,7 @@ reactor.depleted=Carburante insufficiente reactor.depleted.desc=Il reattore non ha carburante sufficiente per sostenere una reazione # Creative tab -itemGroup.tabMekanism=Mekanica +itemGroup.tabMekanism=Mekanism ############# # GENERATORS diff --git a/src/main/resources/assets/mekanism/lang/ja_jp.lang b/src/main/resources/assets/mekanism/lang/ja_jp.lang index 3da3efce8..d5dce3f0a 100644 --- a/src/main/resources/assets/mekanism/lang/ja_jp.lang +++ b/src/main/resources/assets/mekanism/lang/ja_jp.lang @@ -409,7 +409,7 @@ entity.Robit.name=ロビット entity.BabySkeleton.name=ベビースケルトン # Config Gui -mekanism.configgui.ctgy.general=Mekanica 基本設定 +mekanism.configgui.ctgy.general=Mekanism 基本設定 mekanism.configgui.ctgy.machines=マシンの設定 mekanism.configgui.ctgy.tier=ランクの設定 mekanism.configgui.ctgy.usage=エネルギー使用率の設定 diff --git a/src/main/resources/assets/mekanism/lang/ko_kr.lang b/src/main/resources/assets/mekanism/lang/ko_kr.lang index 7427c0b1a..33d8e80c6 100644 --- a/src/main/resources/assets/mekanism/lang/ko_kr.lang +++ b/src/main/resources/assets/mekanism/lang/ko_kr.lang @@ -308,7 +308,7 @@ dye.yellow=노랑색 dye.white=하양색 # Creative tab -itemGroup.tabMekanism=Mekanica [메카니즘] +itemGroup.tabMekanism=Mekanism [메카니즘] ############# # GENERATORS diff --git a/src/main/resources/assets/mekanism/lang/no_no.lang b/src/main/resources/assets/mekanism/lang/no_no.lang index 232ac4ced..c92847da0 100644 --- a/src/main/resources/assets/mekanism/lang/no_no.lang +++ b/src/main/resources/assets/mekanism/lang/no_no.lang @@ -292,7 +292,7 @@ key.mode=Endre modus key.voice=Stemme # Config Gui -mekanism.configgui.ctgy.general=Mekanica Generelle Innstillinger +mekanism.configgui.ctgy.general=Mekanism Generelle Innstillinger mekanism.configgui.ctgy.machines=Maskin Innstillinger mekanism.configgui.ctgy.usage=Bruk Innstillinger mekanism.configgui.ctgy.client=Klient Innstillinger @@ -548,7 +548,7 @@ tooltip.Crusher=En maskin bruk til å knuse barrer til støv, !nog utføre mange tooltip.DigitalMiner=En meget avansert, filer-basert, auto-graver !nsom kan grave hvilken som helst blokk du ber den om !ninnenfor en 32 blokkers (maks) radius. tooltip.MetallurgicInfuser=En maskin brukt til å sette materialer !nmot (generellt) metaller for å lage metall legeringer !nog andre forbindelser. tooltip.PurificationChamber=En avansert maskin i stand til å prosessere en !nmalm til tree klumper, fungerer som den første !nsteget i 300% malm prosessering. -tooltip.EnergizedSmelter=En enkel maskin som fungerer som en Mekanica-basert !novn som kjører på energi. +tooltip.EnergizedSmelter=En enkel maskin som fungerer som en Mekanism-basert !novn som kjører på energi. tooltip.Teleporter=En maskin som er i stand til å teleportere spillere til forskjellige !nsteder definert av en annen teleportør. tooltip.ElectricPump=En avansert pumpe som er i stand til å pumpe !nopp en hel lava sjø. tooltip.Chargepad=En universal ladepad som kan lade !nalle energi baserte ting fra alle modder. @@ -652,7 +652,7 @@ dye.yellow=Gul dye.white=Hvit # Creative tab -itemGroup.tabMekanism=Mekanica +itemGroup.tabMekanism=Mekanism ############# # GENERATORS diff --git a/src/main/resources/assets/mekanism/lang/pl_pl.lang b/src/main/resources/assets/mekanism/lang/pl_pl.lang index 6bf210cb4..f3ff462c4 100644 --- a/src/main/resources/assets/mekanism/lang/pl_pl.lang +++ b/src/main/resources/assets/mekanism/lang/pl_pl.lang @@ -965,7 +965,7 @@ reactor.depleted=Zbyt mało paliwa reactor.depleted.desc=Reaktor ma niewystarczającą ilość paliwa w celu utrzymania reakcji # Creative tab -itemGroup.tabMekanism=Mekanica +itemGroup.tabMekanism=Mekanism ############## # GENERATORS diff --git a/src/main/resources/assets/mekanism/lang/pt_br.lang b/src/main/resources/assets/mekanism/lang/pt_br.lang index 1db8316d7..28324528c 100644 --- a/src/main/resources/assets/mekanism/lang/pt_br.lang +++ b/src/main/resources/assets/mekanism/lang/pt_br.lang @@ -388,18 +388,18 @@ entity.Robit.name=Robit entity.BabySkeleton.name=Esqueleto Bebê # Config Gui -mekanism.configgui.ctgy.general=Configurações Gerais do Mekanica +mekanism.configgui.ctgy.general=Configurações Gerais do Mekanism mekanism.configgui.ctgy.machines=Configurações das Máquinas mekanism.configgui.ctgy.tier=Configurações dos Níveis mekanism.configgui.ctgy.usage=Configurações de Uso mekanism.configgui.ctgy.client=Configurações do Cliente # Config Tooltips -mekanism.configgui.ctgy.general.tooltip=Configurações gerais relativas a Mekanica e todos os seus módulos +mekanism.configgui.ctgy.general.tooltip=Configurações gerais relativas a Mekanism e todos os seus módulos mekanism.configgui.ctgy.machines.tooltip=Configurações relativas a habilitar e desabilitar maquinário especifico -mekanism.configgui.ctgy.tier.tooltip=Configurações relativas a níveis do Mekanica e seus valores correspondentes +mekanism.configgui.ctgy.tier.tooltip=Configurações relativas a níveis do Mekanism e seus valores correspondentes mekanism.configgui.ctgy.usage.tooltip=Configurações relativas a máquinas e seu consumo de energia -mekanism.configgui.ctgy.client.tooltip=Configurações específicas do cliente sobre Mekanica e todos os seus módulos +mekanism.configgui.ctgy.client.tooltip=Configurações específicas do cliente sobre Mekanism e todos os seus módulos # Gui text gui.condensentrating=Condensentrando @@ -795,7 +795,7 @@ tooltip.Crusher=Uma máquina usada para triturar barras em pó, como também faz tooltip.DigitalMiner=Uma automineradora altamente avançada com filtros que pode minerar qualquer bloco que ordenar num raio de 32 blocos (máx.). tooltip.MetallurgicInfuser=Uma máquina usada para infundir vários materiais em (geralmente) materiais para criar ligas metálicas e outros compostos tooltip.PurificationChamber=Uma máquina avançada capaz de processar minérios em aglomerados, servindo como o estágio inicial do processamento de minérios 300%. -tooltip.EnergizedSmelter=Uma máquina simples que serve como uma fornalha baseada no Mekanica que usa energia. +tooltip.EnergizedSmelter=Uma máquina simples que serve como uma fornalha baseada no Mekanism que usa energia. tooltip.Teleporter=Uma máquina capaz de teletransportar jogadores pra vários lugares definidos por outros Teletransportadores. tooltip.ElectricPump=Uma bomba capaz de bombear um lago de lava inteiro. tooltip.PersonalChest=Um baú de 54 lugares que pode ser aberto em qualquer lugar - mesmo a partir de seu próprio inventário. @@ -930,7 +930,7 @@ reactor.depleted=Pouco Combustível reactor.depleted.desc=O reator tem combustível insuficiente para manter uma reação # Creative tab -itemGroup.tabMekanism=Mekanica +itemGroup.tabMekanism=Mekanism ############# # GENERATORS diff --git a/src/main/resources/assets/mekanism/lang/pt_pt.lang b/src/main/resources/assets/mekanism/lang/pt_pt.lang index 6d73ae248..1bbf36adb 100644 --- a/src/main/resources/assets/mekanism/lang/pt_pt.lang +++ b/src/main/resources/assets/mekanism/lang/pt_pt.lang @@ -388,18 +388,18 @@ entity.Robit.name=Robit entity.BabySkeleton.name=Esqueleto Bebé # Config Gui -mekanism.configgui.ctgy.general=Configurações Gerais do Mekanica +mekanism.configgui.ctgy.general=Configurações Gerais do Mekanism mekanism.configgui.ctgy.machines=Configurações das Máquinas mekanism.configgui.ctgy.tier=Configurações dos Níveis mekanism.configgui.ctgy.usage=Configurações de Uso mekanism.configgui.ctgy.client=Configurações do Cliente # Config Tooltips -mekanism.configgui.ctgy.general.tooltip=Configurações gerais relativas a Mekanica e todos os seus módulos +mekanism.configgui.ctgy.general.tooltip=Configurações gerais relativas a Mekanism e todos os seus módulos mekanism.configgui.ctgy.machines.tooltip=Configurações relativas a habilitar e desabilitar maquinário especifico -mekanism.configgui.ctgy.tier.tooltip=Configurações relativas a níveis do Mekanica e seus valores correspondentes +mekanism.configgui.ctgy.tier.tooltip=Configurações relativas a níveis do Mekanism e seus valores correspondentes mekanism.configgui.ctgy.usage.tooltip=Configurações relativas a máquinas e seu consumo de energia -mekanism.configgui.ctgy.client.tooltip=Configurações específicas do cliente sobre Mekanica e todos os seus módulos +mekanism.configgui.ctgy.client.tooltip=Configurações específicas do cliente sobre Mekanism e todos os seus módulos # Gui text gui.condensentrating=Condensentrando @@ -795,7 +795,7 @@ tooltip.Crusher=Uma máquina usada para triturar barras em pó, como também faz tooltip.DigitalMiner=Uma automineradora altamente avançada com filtros que pode minerar qualquer bloco que ordenar num raio de 32 blocos (máx.). tooltip.MetallurgicInfuser=Uma máquina usada para infundir vários materiais em (geralmente) materiais para criar ligas metálicas e outros compostos tooltip.PurificationChamber=Uma máquina avançada capaz de processar minérios em aglomerados, servindo como o estágio inicial do processamento de minérios 300%. -tooltip.EnergizedSmelter=Uma máquina simples que serve como uma fornalha baseada no Mekanica que usa energia. +tooltip.EnergizedSmelter=Uma máquina simples que serve como uma fornalha baseada no Mekanism que usa energia. tooltip.Teleporter=Uma máquina capaz de teletransportar jogadores pra vários lugares definidos por outros Teletransportadores. tooltip.ElectricPump=Uma bomba capaz de bombear um lago de lava inteiro. tooltip.PersonalChest=Um baú de 54 lugares que pode ser aberto em qualquer lugar - mesmo a partir de seu próprio inventário. @@ -930,7 +930,7 @@ reactor.depleted=Pouco Combustível reactor.depleted.desc=O reator tem combustível insuficiente para manter uma reação # Creative tab -itemGroup.tabMekanism=Mekanica +itemGroup.tabMekanism=Mekanism ############## # GENERATORS diff --git a/src/main/resources/assets/mekanism/lang/ru_ru.lang b/src/main/resources/assets/mekanism/lang/ru_ru.lang index a3a9b33c8..827f69e41 100644 --- a/src/main/resources/assets/mekanism/lang/ru_ru.lang +++ b/src/main/resources/assets/mekanism/lang/ru_ru.lang @@ -417,11 +417,11 @@ mekanism.configgui.ctgy.usage=Настройки потребления mekanism.configgui.ctgy.client=Настройки клиента # Config Tooltips -mekanism.configgui.ctgy.general.tooltip=Общие настройки, касающиеся Mekanica и всех его модулей +mekanism.configgui.ctgy.general.tooltip=Общие настройки, касающиеся Mekanism и всех его модулей mekanism.configgui.ctgy.machines.tooltip=Настройки, касающиеся включения и отключения определённых механизмов -mekanism.configgui.ctgy.tier.tooltip=Настройки, касающиеся уровней Mekanica и их соответствующих значений +mekanism.configgui.ctgy.tier.tooltip=Настройки, касающиеся уровней Mekanism и их соответствующих значений mekanism.configgui.ctgy.usage.tooltip=Настройки, касающиеся механизмов, и использования ими же энергии -mekanism.configgui.ctgy.client.tooltip=Настройки клиента относительно Mekanica и всех его модулей +mekanism.configgui.ctgy.client.tooltip=Настройки клиента относительно Mekanism и всех его модулей # Gui text gui.condensentrating=Конденсация @@ -840,7 +840,7 @@ tooltip.Crusher=Механизм, используемый для дроблен tooltip.DigitalMiner=Высоко продвинутый, основанный на фильтре, авто-шахтёр, который может добывать любые блоки, на которые Вы укажите в пределах 32 блоков (макс). tooltip.MetallurgicInfuser=Механизм, используемый для "наполнения" металлов (как правило) различными материалами, для создания металлических сплавов и других соединений. tooltip.PurificationChamber=Продвинутый механизм, способный перерабатывать руды в три глыбы, выступающий в качестве начальной стадии 300% переработки руды. -tooltip.EnergizedSmelter=Простой механизм, который служит в качестве базовой Mekanica-печи, работающей от энергии. +tooltip.EnergizedSmelter=Простой механизм, который служит в качестве базовой Mekanism-печи, работающей от энергии. tooltip.Teleporter=Механизм, способный телепортировать игроков в различные места, определённые другим телепортом. tooltip.ElectricPump=Продвинутая помпа, способная выкачать целое озеро лавы. tooltip.PersonalChest=54-слотовый сундук, который можно открыть везде, даже из инвентаря игрока. @@ -976,7 +976,7 @@ reactor.depleted=Недостаточно топлива reactor.depleted.desc=Реактору не хватает топлива для поддержания реакции # Creative tab -itemGroup.tabMekanism=Mekanica +itemGroup.tabMekanism=Mekanism ############# # GENERATORS diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 9830cc812..abf4242d5 100755 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,7 +1,7 @@ [ { "modid": "mekanism", - "name": "Mekanica", + "name": "Mekanism", "description": "Tools and Machines; an active fork of Mekanism", "version": "${version}", "mcversion": "${mc_version}", @@ -30,8 +30,8 @@ }, { "modid": "mekanismgenerators", - "name": "Mekanica: Generators", - "description": "Generators module for Mekanica", + "name": "Mekanism: Generators", + "description": "Generators module for Mekanism", "version": "${version}", "mcversion": "${mc_version}", "authorList": [ @@ -49,8 +49,8 @@ }, { "modid": "mekanismtools", - "name": "Mekanica: Tools", - "description": "Tools module for Mekanica", + "name": "Mekanism: Tools", + "description": "Tools module for Mekanism", "version": "${version}", "mcversion": "${mc_version}", "authorList": [