Skip to content
This repository has been archived by the owner on Jun 19, 2022. It is now read-only.

Commit

Permalink
Merge branch 'main' into complete
Browse files Browse the repository at this point in the history
  • Loading branch information
NichtStudioCode committed Dec 20, 2021
2 parents 4a8936a + d8b3feb commit 1d7ab04
Show file tree
Hide file tree
Showing 16 changed files with 154 additions and 107 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/zip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
branches:
- main
- complete
release:
types: [ created ]

jobs:
build:
Expand Down
3 changes: 3 additions & 0 deletions assets/minecraft/lang/de_de.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"block.nova.lava_generator": "Lava Generator",
"block.nova.infinite_water_source": "Unendliche Wasserquelle",
"block.nova.cobblestone_generator": "Bruchsteingenerator",
"block.nova.pump": "Pumpe",
"item.nova.iron_plate": "Eisenplatte",
"item.nova.gold_plate": "Goldplatte",
"item.nova.diamond_plate": "Diamantplatte",
Expand Down Expand Up @@ -178,6 +179,8 @@
"menu.nova.cobblestone_generator.mode.cobblestone": "Modus: Bruchstein",
"menu.nova.cobblestone_generator.mode.stone": "Modus: Stein",
"menu.nova.cobblestone_generator.mode.obsidian": "Modus: Obsidian",
"menu.nova.pump.replace_mode": "Modus: Flüssigkeiten mit Blöcken ersetzen",
"menu.nova.pump.pump_mode": "Modus: Flüssigkeiten abpumpen",
"command.nova.no-players": "Es konnten keine Spieler gefunden werden.",
"command.nova.no-item-in-hand": "Halte ein Item in deiner Hand und versuche es erneut.",
"command.nova.give.success": "%s %s an %s gegeben",
Expand Down
7 changes: 5 additions & 2 deletions assets/minecraft/lang/es_es.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"block.nova.lava_generator": "Generador de Lava",
"block.nova.infinite_water_source": "Infinite Water Source",
"block.nova.cobblestone_generator": "Cobblestone Generator",
"block.nova.pump": "Pump",
"item.nova.iron_plate": "Placa de Hierro",
"item.nova.gold_plate": "Placa de oro",
"item.nova.diamond_plate": "Placa de Diamante",
Expand Down Expand Up @@ -178,6 +179,8 @@
"menu.nova.cobblestone_generator.mode.cobblestone": "Mode: Cobblestone",
"menu.nova.cobblestone_generator.mode.stone": "Mode: Stone",
"menu.nova.cobblestone_generator.mode.obsidian": "Mode: Obsidian",
"menu.nova.pump.replace_mode": "Mode: Replace Liquids",
"menu.nova.pump.pump_mode": "Mode: Pump Liquids",
"command.nova.no-players": "No se ha encontrado ningún jugador.",
"command.nova.no-item-in-hand": "Mantén un item en tu mano e inténtalo de nuevo.",
"command.nova.give.success": "Otorgó %s %s a %s",
Expand Down Expand Up @@ -288,13 +291,13 @@
"advancement.nova.ultimate_fluid_tank.title": "The Ultimate Fluid Tank",
"advancement.nova.ultimate_fluid_tank.description": "Craft an Ultimate Fluid Tank",
"advancement.nova.infinite_water_source.title": "An ancient source of water",
"advancement.nova.infinite_water_source.description": "The legend says, that these water sources where used by the ancient egyptians to provide water for the people. They are said to be hidden away in the depths of the desert.",
"advancement.nova.infinite_water_source.description": "The legend says, that these water sources were used by the ancient egyptians to provide water for the people. They are said to be hidden away in the depths of the desert.",
"advancement.nova.pump.title": "Draining the ocean",
"advancement.nova.pump.description": "Craft a Pump",
"advancement.nova.cobblestone_generator.title": "Poseidon and Hephaestus",
"advancement.nova.cobblestone_generator.description": "Craft a Cobblestone Generator",
"advancement.nova.lava_generator.title": "You can cook an egg on that",
"advancement.nova.lava_generator.description": "Craft a Lava Generator",
"advancement.nova.lava_generator.description": "Fabrica un Generador de Lava",
"nova.tile_entity_limits.deny_blacklist": "No puedes colocar ningún bloque de Nova en este mundo.",
"nova.tile_entity_limits.deny_blacklist_type": "No puedes colocar este bloque en este mundo.",
"nova.tile_entity_limits.deny_limit": "No puedes colocar más bloques de este tipo.",
Expand Down
97 changes: 50 additions & 47 deletions assets/minecraft/lang/fr_fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,15 @@
"block.nova.tree_factory": "Usine d'arbres",
"block.nova.trash_can": "Poubelle",
"block.nova.star_collector": "Collecteur d'étoile",
"block.nova.basic_fluid_tank": "Basic Fluid Tank",
"block.nova.advanced_fluid_tank": "Advanced Fluid Tank",
"block.nova.elite_fluid_tank": "Elite Fluid Tank",
"block.nova.ultimate_fluid_tank": "Ultimate Fluid Tank",
"block.nova.creative_fluid_tank": "Creative Fluid Tank",
"block.nova.lava_generator": "Lava Generator",
"block.nova.infinite_water_source": "Infinite Water Source",
"block.nova.cobblestone_generator": "Cobblestone Generator",
"block.nova.basic_fluid_tank": "Réservoir de liquide basique",
"block.nova.advanced_fluid_tank": "Réservoir de fluide avancé",
"block.nova.elite_fluid_tank": "Réservoir de fluide élite",
"block.nova.ultimate_fluid_tank": "Réservoir de fluide ultime",
"block.nova.creative_fluid_tank": "Réservoir de fluide créatif",
"block.nova.lava_generator": "Générateur à lave",
"block.nova.infinite_water_source": "Source d'eau infinie",
"block.nova.cobblestone_generator": "Générateur de Cobblestone",
"block.nova.pump": "Pompe",
"item.nova.iron_plate": "Plaque de fer",
"item.nova.gold_plate": "Plaque d'or",
"item.nova.diamond_plate": "Plaque de diamant",
Expand Down Expand Up @@ -69,7 +70,7 @@
"item.nova.star_dust": "Poudre d'étoile",
"item.nova.netherite_drill": "Foreuse en netherite",
"item.nova.solar_cell": "Panneau solaire",
"item.nova.mob_catcher": "Mob Catcher",
"item.nova.mob_catcher": "Chasseur de créatures",
"item.nova.mob_catcher.type": "Type: %s",
"item.nova.wrench": "Clé à molette",
"item.nova.item_filter": "Filtre d'objet",
Expand All @@ -80,7 +81,7 @@
"item.nova.efficiency_upgrade": "Amélioration d'efficacité",
"item.nova.energy_upgrade": "Amélioration du stockage d'énergie",
"item.nova.range_upgrade": "Amélioration de la portée",
"item.nova.fluid_upgrade": "Fluid Upgrade",
"item.nova.fluid_upgrade": "Amélioration du Fluide",
"item.nova.basic_machine_frame": "Cadre de Machine Basique",
"item.nova.advanced_machine_frame": "Cadre de Machine Avancé",
"item.nova.elite_machine_frame": "Cadre de Machine élite",
Expand All @@ -96,9 +97,9 @@
"inventory.nova.axes": "Inventaire d'haches",
"inventory.nova.fertilizer": "Inventaire d'engrais",
"inventory.nova.fishing_rod": "Inventaire de canne à pêche",
"container.nova.fluid_tank": "Fluid Tank",
"container.nova.lava_tank": "Lava Tank",
"container.nova.water_tank": "Water Tank",
"container.nova.fluid_tank": "Réservoir de fluide",
"container.nova.lava_tank": "Réservoir de lave",
"container.nova.water_tank": "Réservoir d'eau",
"menu.nova.energy_per_tick": "%s / tick",
"menu.nova.items": "Objets",
"menu.nova.items.search": "Chercher un objet",
Expand All @@ -114,9 +115,9 @@
"menu.nova.recipe.gear": "Pressage d'engrenages",
"menu.nova.recipe.time": "Temps: %ss",
"menu.nova.side_config": "Configuration des faces",
"menu.nova.side_config.energy": "Energy",
"menu.nova.side_config.items": "Items",
"menu.nova.side_config.fluids": "Fluids",
"menu.nova.side_config.energy": "Énergie",
"menu.nova.side_config.items": "Objets",
"menu.nova.side_config.fluids": "Liquides",
"menu.nova.side_config.front": "§7Avant",
"menu.nova.side_config.left": "§7Gauche",
"menu.nova.side_config.back": "§7Arrière",
Expand Down Expand Up @@ -150,9 +151,9 @@
"menu.nova.mob_duplicator.nbt": "Utilise les données NBT",
"menu.nova.mob_killer.idle": "Prochaine attaque dans %s ticks",
"menu.nova.quarry.size": "Taille de la carrière: %s x %s blocs",
"menu.nova.quarry.size_tip": "A bigger size makes the Quarry less efficient.",
"menu.nova.quarry.depth": "Quarry Depth: %s Blocks",
"menu.nova.quarry.depth_tip": "The depth does not affect power consumption.",
"menu.nova.quarry.size_tip": "Plus la Quarry est grande moins elle est efficace.",
"menu.nova.quarry.depth": "Profondeur de la quarry: %s Blocs",
"menu.nova.quarry.depth_tip": "La profondeur n'affecte pas la consommation d'énergie.",
"menu.nova.item_filter": "Filtre d'objet",
"menu.nova.item_filter.whitelist": "Actuellement: Liste blanche",
"menu.nova.item_filter.blacklist": "Actuellement: Liste noire",
Expand All @@ -165,21 +166,23 @@
"menu.nova.upgrades.type.efficiency": "Améliorations d'efficacité : %s/%s",
"menu.nova.upgrades.type.energy": "Améliorations d'Énergie : %s/%s",
"menu.nova.upgrades.type.range": "Améliorations de la portée : %s/%s",
"menu.nova.upgrades.type.fluid": "Fluid Upgrades: %s/%s",
"menu.nova.upgrades.type.fluid": "Améliorations du stockage de fluide: %s/%s",
"menu.nova.upgrades.type.speed.off": "Cette machine n'accepte pas les améliorations de vitesse.",
"menu.nova.upgrades.type.efficiency.off": "Cette machine n'accepte pas les améliorations d'efficacité.",
"menu.nova.upgrades.type.energy.off": "Cette machine n'accepte pas les améliorations d'énergie.",
"menu.nova.upgrades.type.range.off": "Cette machine n'accepte pas les améliorations de portée.",
"menu.nova.upgrades.type.fluid.off": "This machine does not accept fluid upgrades.",
"menu.nova.upgrades.type.fluid.off": "Cette machine n'accepte pas les améliorations du fluide.",
"menu.nova.auto_fisher.idle": "Prochain poisson dans %s ticks",
"menu.nova.lightning_exchanger": "Convertisseur de foudre",
"menu.nova.star_collector.idle": "Recherche de poussière d'étoile...",
"menu.nova.star_collector.collection": "Collecte de Poussière d'étoile, en cour...",
"menu.nova.cobblestone_generator.mode.cobblestone": "Mode: Cobblestone",
"menu.nova.cobblestone_generator.mode.stone": "Mode: Stone",
"menu.nova.cobblestone_generator.mode.obsidian": "Mode: Obsidian",
"command.nova.no-players": "No players could be found.",
"command.nova.no-item-in-hand": "Hold an item in your hand and try again.",
"menu.nova.cobblestone_generator.mode.stone": "Mode : Pierre",
"menu.nova.cobblestone_generator.mode.obsidian": "Mode : Obsidienne",
"menu.nova.pump.replace_mode": "Mode : Remplacer les liquides",
"menu.nova.pump.pump_mode": "Mode : Pompe des liquides",
"command.nova.no-players": "Aucun joueur trouvé.",
"command.nova.no-item-in-hand": "Tenez un objet dans votre main et réessayez.",
"command.nova.give.success": "A donné %s %s à %s",
"command.nova.list_nearby.success": "Sur les %s porte armures dans ce tronçon, %s sont des tile entity.",
"command.nova.get_nearest_data.failed": "Impossible de trouver une tile entity à proximité.",
Expand All @@ -190,11 +193,11 @@
"command.nova.render_distance": "Votre distance de rendu a bien été définie à %s.",
"command.nova.show_tile_entity_data.success": "Ça %s a la data suivante %s",
"command.nova.show_tile_entity_data.failure": "Veuillez regarder sur la tile entity et réessayer après.",
"command.nova.modeldata.item": "The item %s uses %s and has the following custom model data: %s.",
"command.nova.modeldata.block": "The block %s uses %s and has the following custom model data: %s.",
"command.nova.modeldata.no-nova-item": "Hold an item from Nova in your hand and try again.",
"command.nova.recipe.no-recipe": "This item does not have a recipe.",
"command.nova.usage.no-usage": "This item has no usages.",
"command.nova.modeldata.item": "L'élément %s utilise %s et a les données personnalisées suivantes : %s.",
"command.nova.modeldata.block": "Le bloc %s utilise %s et a les données personnalisées suivantes : %s.",
"command.nova.modeldata.no-nova-item": "Tenez un objet de Nova dans votre main et réessayez.",
"command.nova.recipe.no-recipe": "Cet objet n'a pas de recette.",
"command.nova.usage.no-usage": "Cet objet n'a aucune utilisation.",
"advancement.nova.root.title": "Nova",
"advancement.nova.root.description": "",
"advancement.nova.block_breaker.title": "Destruction de bloc automatisé",
Expand Down Expand Up @@ -226,7 +229,7 @@
"advancement.nova.ultimate_cable.title": "Le câble ultime",
"advancement.nova.ultimate_cable.description": "Fabrique un câble ultime",
"advancement.nova.mob_catcher.title": "Comment ça peut tenir là dedans ?",
"advancement.nova.mob_catcher.description": "Catch a mob using a Mob Catcher",
"advancement.nova.mob_catcher.description": "Attrape un monstre en utilisant un Attrapeur de créatures",
"advancement.nova.breeder.title": "Élevage industriel",
"advancement.nova.breeder.description": "Fabrique un éleveur",
"advancement.nova.mob_duplicator.title": "Clonage",
Expand Down Expand Up @@ -279,22 +282,22 @@
"advancement.nova.star_collector.description": "Fabriquer un collecteur d'étoile",
"advancement.nova.trash_can.title": "Je n'ai pas besoin de sa !",
"advancement.nova.trash_can.description": "Fabriquer une poubelle",
"advancement.nova.basic_fluid_tank.title": "Basic fluid storage",
"advancement.nova.basic_fluid_tank.description": "Craft a Basic Fluid Tank",
"advancement.nova.advanced_fluid_tank.title": "More fluids",
"advancement.nova.advanced_fluid_tank.description": "Craft an Advanced Fluid Tank",
"advancement.nova.elite_fluid_tank.title": "Lots of fluids",
"advancement.nova.elite_fluid_tank.description": "Craft an Elite Fluid Tank",
"advancement.nova.ultimate_fluid_tank.title": "The Ultimate Fluid Tank",
"advancement.nova.ultimate_fluid_tank.description": "Craft an Ultimate Fluid Tank",
"advancement.nova.infinite_water_source.title": "An ancient source of water",
"advancement.nova.infinite_water_source.description": "The legend says, that these water sources where used by the ancient egyptians to provide water for the people. They are said to be hidden away in the depths of the desert.",
"advancement.nova.pump.title": "Draining the ocean",
"advancement.nova.pump.description": "Craft a Pump",
"advancement.nova.cobblestone_generator.title": "Poseidon and Hephaestus",
"advancement.nova.cobblestone_generator.description": "Craft a Cobblestone Generator",
"advancement.nova.lava_generator.title": "You can cook an egg on that",
"advancement.nova.lava_generator.description": "Craft a Lava Generator",
"advancement.nova.basic_fluid_tank.title": "Stockage basique de fluide",
"advancement.nova.basic_fluid_tank.description": "Fabriquez un réservoir à liquide basique",
"advancement.nova.advanced_fluid_tank.title": "Plus de liquides",
"advancement.nova.advanced_fluid_tank.description": "Fabriquez un réservoir de liquide avancé",
"advancement.nova.elite_fluid_tank.title": "Beaucoup de fluides",
"advancement.nova.elite_fluid_tank.description": "Fabriquez un réservoir de liquide d'élite",
"advancement.nova.ultimate_fluid_tank.title": "Réservoir de fluide ultime",
"advancement.nova.ultimate_fluid_tank.description": "Fabriquez un réservoir de liquide Ultime",
"advancement.nova.infinite_water_source.title": "Une ancienne source d'eau",
"advancement.nova.infinite_water_source.description": "La légende dit que ces sources d'eau où les anciens égyptiens utilisent l'eau pour fournir de l'eau à la population. On dit qu'ils sont cachés dans les profondeurs du désert.",
"advancement.nova.pump.title": "Drainer l'océan",
"advancement.nova.pump.description": "Fabriquer une pompe",
"advancement.nova.cobblestone_generator.title": "Poséidon et Héphaïstus",
"advancement.nova.cobblestone_generator.description": "Fabriquez un générateur de pierre taillée",
"advancement.nova.lava_generator.title": "Vous pouvez cuire un oeuf sur cela",
"advancement.nova.lava_generator.description": "Fabriquez un Générateur de Lave",
"nova.tile_entity_limits.deny_blacklist": "Tu n’es pas autorisé à placer aucun des blocs de Nova dans ce monde.",
"nova.tile_entity_limits.deny_blacklist_type": "Tu n’es pas autorisé à placer ce bloc dans ce monde.",
"nova.tile_entity_limits.deny_limit": "Vous ne pouvez pas placer plus de blocs de ce type.",
Expand Down
5 changes: 4 additions & 1 deletion assets/minecraft/lang/hu_hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"block.nova.lava_generator": "Lava Generator",
"block.nova.infinite_water_source": "Infinite Water Source",
"block.nova.cobblestone_generator": "Cobblestone Generator",
"block.nova.pump": "Pump",
"item.nova.iron_plate": "Iron Plate",
"item.nova.gold_plate": "Gold Plate",
"item.nova.diamond_plate": "Diamond Plate",
Expand Down Expand Up @@ -178,6 +179,8 @@
"menu.nova.cobblestone_generator.mode.cobblestone": "Mode: Cobblestone",
"menu.nova.cobblestone_generator.mode.stone": "Mode: Stone",
"menu.nova.cobblestone_generator.mode.obsidian": "Mode: Obsidian",
"menu.nova.pump.replace_mode": "Mode: Replace Liquids",
"menu.nova.pump.pump_mode": "Mode: Pump Liquids",
"command.nova.no-players": "No players could be found.",
"command.nova.no-item-in-hand": "Hold an item in your hand and try again.",
"command.nova.give.success": "Gave %s %s to %s",
Expand Down Expand Up @@ -288,7 +291,7 @@
"advancement.nova.ultimate_fluid_tank.title": "The Ultimate Fluid Tank",
"advancement.nova.ultimate_fluid_tank.description": "Craft an Ultimate Fluid Tank",
"advancement.nova.infinite_water_source.title": "An ancient source of water",
"advancement.nova.infinite_water_source.description": "The legend says, that these water sources where used by the ancient egyptians to provide water for the people. They are said to be hidden away in the depths of the desert.",
"advancement.nova.infinite_water_source.description": "The legend says, that these water sources were used by the ancient egyptians to provide water for the people. They are said to be hidden away in the depths of the desert.",
"advancement.nova.pump.title": "Draining the ocean",
"advancement.nova.pump.description": "Craft a Pump",
"advancement.nova.cobblestone_generator.title": "Poseidon and Hephaestus",
Expand Down
5 changes: 4 additions & 1 deletion assets/minecraft/lang/id_id.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"block.nova.lava_generator": "Lava Generator",
"block.nova.infinite_water_source": "Infinite Water Source",
"block.nova.cobblestone_generator": "Cobblestone Generator",
"block.nova.pump": "Pump",
"item.nova.iron_plate": "Iron Plate",
"item.nova.gold_plate": "Gold Plate",
"item.nova.diamond_plate": "Diamond Plate",
Expand Down Expand Up @@ -178,6 +179,8 @@
"menu.nova.cobblestone_generator.mode.cobblestone": "Mode: Cobblestone",
"menu.nova.cobblestone_generator.mode.stone": "Mode: Stone",
"menu.nova.cobblestone_generator.mode.obsidian": "Mode: Obsidian",
"menu.nova.pump.replace_mode": "Mode: Replace Liquids",
"menu.nova.pump.pump_mode": "Mode: Pump Liquids",
"command.nova.no-players": "No players could be found.",
"command.nova.no-item-in-hand": "Hold an item in your hand and try again.",
"command.nova.give.success": "Gave %s %s to %s",
Expand Down Expand Up @@ -288,7 +291,7 @@
"advancement.nova.ultimate_fluid_tank.title": "The Ultimate Fluid Tank",
"advancement.nova.ultimate_fluid_tank.description": "Craft an Ultimate Fluid Tank",
"advancement.nova.infinite_water_source.title": "An ancient source of water",
"advancement.nova.infinite_water_source.description": "The legend says, that these water sources where used by the ancient egyptians to provide water for the people. They are said to be hidden away in the depths of the desert.",
"advancement.nova.infinite_water_source.description": "The legend says, that these water sources were used by the ancient egyptians to provide water for the people. They are said to be hidden away in the depths of the desert.",
"advancement.nova.pump.title": "Draining the ocean",
"advancement.nova.pump.description": "Craft a Pump",
"advancement.nova.cobblestone_generator.title": "Poseidon and Hephaestus",
Expand Down
Loading

0 comments on commit 1d7ab04

Please sign in to comment.