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 Nov 5, 2021
2 parents 846b05f + 5994e3f commit 9fc6ed0
Show file tree
Hide file tree
Showing 28 changed files with 1,505 additions and 397 deletions.
17 changes: 16 additions & 1 deletion assets/minecraft/lang/de_de.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"block.nova.lightning_exchanger": "Blitzgenerator",
"block.nova.tree_factory": "Baumfabrik",
"block.nova.trash_can": "Mülleimer",
"block.nova.star_collector": "Sternsammler",
"item.nova.iron_plate": "Eisenplatte",
"item.nova.gold_plate": "Goldplatte",
"item.nova.diamond_plate": "Diamantplatte",
Expand Down Expand Up @@ -178,7 +179,11 @@
"menu.nova.lightning_exchanger": "Blitzgenerator",
"menu.nova.tree_factory": "Baumfabrik",
"menu.nova.trash_can": "Mülleimer",
"command.nova.give.success": "Das Item %s wurde zu deinem Inventar hinzugefügt.",
"menu.nova.star_collector": "Sternsammler",
"menu.nova.star_collector.idle": "Suche nach Sternenstaub...",
"menu.nova.star_collector.collection": "Sammle Sternenstaub...",
"command.nova.no-players": "Es konnten keine Spieler gefunden werden.",
"command.nova.give.success": "%s %s an %s gegeben",
"command.nova.list_nearby.success": "Von den %s Rüstungsständern in deinem Chunk sind %s Teil einer TileEntity.",
"command.nova.get_nearest_data.failed": "Es konnte keine TileEntity in deiner Nähe gefunden werden.",
"command.nova.remove_obsolete_models.success": "%s Rüstungsständer wurden entfernt.",
Expand Down Expand Up @@ -262,6 +267,16 @@
"advancement.nova.auto_fisher.description": "Stelle einen Auto-Fischer her",
"advancement.nova.lightning_exchanger.title": "Strom von Zeus",
"advancement.nova.lightning_exchanger.description": "Stelle einen Blitzgenerator her. (Benötigt einen Blitzableiter drüber!)",
"advancement.nova.wind_turbine.title": "Windkraft",
"advancement.nova.wind_turbine.description": "Stelle ein Windrad her",
"advancement.nova.tree_factory.title": "Massenproduzierte... Bäume?",
"advancement.nova.tree_factory.description": "Stelle eine Baumfabrik her",
"advancement.nova.star_shards.title": "Wo kommen die denn her?",
"advancement.nova.star_shards.description": "Finde Sternsplitter in einer Truhe",
"advancement.nova.star_collector.title": "Aus der Luft gegriffen",
"advancement.nova.star_collector.description": "Stellen einen Sternsammler her",
"advancement.nova.trash_can.title": "Das brauche ich nicht mehr!",
"advancement.nova.trash_can.description": "Stelle einen Mülleimer her",
"nova.tile_entity_limits.deny_blacklist": "In dieser Welt sind keine Blöcke von Nova erlaubt.",
"nova.tile_entity_limits.deny_blacklist_type": "Dieser Block darf nicht in dieser Welt platziert werden.",
"nova.tile_entity_limits.deny_limit": "Du hast das Limit für diesen Block-Typ erreicht.",
Expand Down
17 changes: 16 additions & 1 deletion assets/minecraft/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"block.nova.lightning_exchanger": "Lightning Exchanger",
"block.nova.tree_factory": "Tree Factory",
"block.nova.trash_can": "Trash Can",
"block.nova.star_collector": "Star Collector",

"item.nova.iron_plate": "Iron Plate",
"item.nova.gold_plate": "Gold Plate",
Expand Down Expand Up @@ -181,8 +182,12 @@
"menu.nova.lightning_exchanger": "Lightning Exchanger",
"menu.nova.tree_factory": "Tree Factory",
"menu.nova.trash_can": "Trash Can",
"menu.nova.star_collector": "Star Collector",
"menu.nova.star_collector.idle": "Searching for Star Dust...",
"menu.nova.star_collector.collection": "Collecting Star Dust...",

"command.nova.give.success": "The item %s has been added to your inventory.",
"command.nova.no-players": "No players could be found.",
"command.nova.give.success": "Gave %s %s to %s",
"command.nova.list_nearby.success": "Out of the %s armor stands in your chunk, %s are part of a tile entity.",
"command.nova.get_nearest_data.failed": "Could not find a tile entity nearby.",
"command.nova.remove_obsolete_models.success": "Removed %s armor stands.",
Expand Down Expand Up @@ -267,6 +272,16 @@
"advancement.nova.auto_fisher.description": "Craft an Auto Fisher",
"advancement.nova.lightning_exchanger.title": "Power from Zeus",
"advancement.nova.lightning_exchanger.description": "Craft a lightning exchanger. (Make sure to put a lightning rod on top of it!)",
"advancement.nova.wind_turbine.title": "Wind power",
"advancement.nova.wind_turbine.description": "Craft a Wind Turbine",
"advancement.nova.tree_factory.title": "Mass produced... trees?",
"advancement.nova.tree_factory.description": "Craft a Tree Factory.",
"advancement.nova.star_shards.title": "How did they end up here?",
"advancement.nova.star_shards.description": "Find Star Shards in a dungeon chest",
"advancement.nova.star_collector.title": "Out of thin air",
"advancement.nova.star_collector.description": "Craft a Star Collector",
"advancement.nova.trash_can.title": "I don't need that anymore!",
"advancement.nova.trash_can.description": "Craft a Trash Can",

"nova.tile_entity_limits.deny_blacklist": "You're not allowed to place any blocks from Nova in this world.",
"nova.tile_entity_limits.deny_blacklist_type": "You're not allowed to place this block in this world.",
Expand Down
17 changes: 16 additions & 1 deletion assets/minecraft/lang/es_es.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"block.nova.lightning_exchanger": "Intercambiador De Rayos",
"block.nova.tree_factory": "Fábrica de árboles",
"block.nova.trash_can": "Bote de Basura",
"block.nova.star_collector": "Colector de Estrellas",
"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,7 +179,11 @@
"menu.nova.lightning_exchanger": "Conversor de Relámpagos",
"menu.nova.tree_factory": "Fábrica de árboles",
"menu.nova.trash_can": "Bote de Basura",
"command.nova.give.success": "Se han añadido %s items a tu inventario.",
"menu.nova.star_collector": "Colector de Estrellas",
"menu.nova.star_collector.idle": "Buscando Polvo Estrella...",
"menu.nova.star_collector.collection": "Recolectando polvo de estrella...",
"command.nova.no-players": "No players could be found.",
"command.nova.give.success": "Gave %s %s to %s",
"command.nova.list_nearby.success": "Entre los soportes de armadura %s en el bloque en el que te encuentras, %s son entidades de bloque.",
"command.nova.get_nearest_data.failed": "No se pudo encontrar una entidad cercana.",
"command.nova.remove_obsolete_models.success": "Se han eliminado %s soportes de armadura.",
Expand Down Expand Up @@ -262,6 +267,16 @@
"advancement.nova.auto_fisher.description": "Crea un pescador automático",
"advancement.nova.lightning_exchanger.title": "El Poder de Zeus",
"advancement.nova.lightning_exchanger.description": "Fabrica un Conversor de Rayos. (¡Asegúrate de poner una barra de iluminación encima de ella!)",
"advancement.nova.wind_turbine.title": "Fuerza del viento",
"advancement.nova.wind_turbine.description": "Fabrica una turbina eólica",
"advancement.nova.tree_factory.title": "Producción en masa... ¿Árboles?",
"advancement.nova.tree_factory.description": "Fabrica una Fábrica de Árboles.",
"advancement.nova.star_shards.title": "¿Cómo terminaron aquí?",
"advancement.nova.star_shards.description": "Encuentra fragmentos de estrellas en un cofre de mazmorra",
"advancement.nova.star_collector.title": "Fuera del aire",
"advancement.nova.star_collector.description": "Fabrica un Colector de Estrellas",
"advancement.nova.trash_can.title": "¡No lo necesito más!",
"advancement.nova.trash_can.description": "Fabrica un bote de basura",
"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
85 changes: 50 additions & 35 deletions assets/minecraft/lang/fr_fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@
"block.nova.wireless_charger": "Chargeur sans fil",
"block.nova.auto_fisher": "Pêcheur automatique",
"block.nova.lightning_exchanger": "Convertisseur de foudre",
"block.nova.tree_factory": "Tree Factory",
"block.nova.trash_can": "Trash Can",
"block.nova.tree_factory": "Usine d'arbres",
"block.nova.trash_can": "Poubelle",
"block.nova.star_collector": "Collecteur d'étoile",
"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 @@ -67,15 +68,15 @@
"item.nova.jetpack": "Jetpack",
"item.nova.scaffolding": "Échafaudage de carrière",
"item.nova.star_shards": "Éclats d'étoile",
"item.nova.speed_upgrade": "Speed Upgrade",
"item.nova.efficiency_upgrade": "Efficiency Upgrade",
"item.nova.energy_upgrade": "Energy Upgrade",
"item.nova.range_upgrade": "Range Upgrade",
"item.nova.basic_machine_frame": "Basic Machine Frame",
"item.nova.advanced_machine_frame": "Advanced Machine Frame",
"item.nova.elite_machine_frame": "Elite Machine Frame",
"item.nova.ultimate_machine_frame": "Ultimate Machine Frame",
"item.nova.creative_machine_frame": "Creative Machine Frame",
"item.nova.speed_upgrade": "Amélioration de vitesse",
"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.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",
"item.nova.ultimate_machine_frame": "Cadre de Machine ultra",
"item.nova.creative_machine_frame": "Cadre de machine créatif",
"inventory.nova.default": "Inventaire",
"inventory.nova.fuel": "Inventaire de carburant",
"inventory.nova.input": "Inventaire d'entrée",
Expand All @@ -86,12 +87,12 @@
"inventory.nova.fertilizer": "Inventaire d'engrais",
"inventory.nova.fishing_rod": "Inventaire de canne à pêche",
"menu.nova.energy_per_tick": "%s / tick",
"menu.nova.items": "Items",
"menu.nova.items.search": "Search for an Item",
"menu.nova.items.search.back": "Back to the main inventory",
"menu.nova.items.search.clear": "Clear search",
"menu.nova.items": "Objets",
"menu.nova.items.search": "Chercher un objet",
"menu.nova.items.search.back": "Retour au menu principal",
"menu.nova.items.search.clear": "Nettoyer la recherche",
"menu.nova.items.searched": "Items §8(%s§7...§8)",
"menu.nova.items.search-item": "Search...",
"menu.nova.items.search-item": "Recherche...",
"menu.nova.creative": "Objets",
"menu.nova.recipe": "Guide de recettes",
"menu.nova.recipe.back": "Précédent",
Expand All @@ -114,9 +115,9 @@
"menu.nova.side_config.input_output": "§aEntrée & Sortie",
"menu.nova.cable_config.insert": "Insérer",
"menu.nova.cable_config.extract": "Extraire",
"menu.nova.cable_config.insert_priority": "Insert Priority: %s",
"menu.nova.cable_config.extract_priority": "Extract Priority: %s",
"menu.nova.cable_config.channel": "Channel: %s",
"menu.nova.cable_config.insert_priority": "Insérer une Priorité : %s",
"menu.nova.cable_config.extract_priority": "Priorité d'extraction : %s",
"menu.nova.cable_config.channel": "Canal : %s",
"menu.nova.paged.back": "§7Revenir en arrière",
"menu.nova.paged.forward": "§7Page suivante",
"menu.nova.paged.go_infinite": "§8Aller à la page %s",
Expand Down Expand Up @@ -155,8 +156,8 @@
"menu.nova.item_filter": "Filtre d'objet",
"menu.nova.item_filter.whitelist": "Actuellement: Liste blanche",
"menu.nova.item_filter.blacklist": "Actuellement: Liste noire",
"menu.nova.item_filter.nbt.on": "NBT Data: Not Ignored",
"menu.nova.item_filter.nbt.off": "NBT Data: Ignored",
"menu.nova.item_filter.nbt.on": "Données NBT : Non ignorées",
"menu.nova.item_filter.nbt.off": "Données NBT : Ignorées",
"menu.nova.wind_turbine": "Éolienne",
"menu.nova.planter": "Planteur",
"menu.nova.planter.autotill": "Labourer automatiquement la terre",
Expand All @@ -165,29 +166,33 @@
"menu.nova.wireless_charger": "Chargeur sans fil",
"menu.nova.upgrades": "Améliorations",
"menu.nova.upgrades.coming-soon": "Bientôt disponible !",
"menu.nova.upgrades.type.speed": "Speed Upgrades: %s/%s",
"menu.nova.upgrades.type.efficiency": "Efficiency Upgrades: %s/%s",
"menu.nova.upgrades.type.energy": "Energy Upgrades: %s/%s",
"menu.nova.upgrades.type.range": "Range Upgrades: %s/%s",
"menu.nova.upgrades.type.speed.off": "This machine does not accept speed upgrades.",
"menu.nova.upgrades.type.efficiency.off": "This machine does not accept efficiency upgrades.",
"menu.nova.upgrades.type.energy.off": "This machine does not accept energy upgrades.",
"menu.nova.upgrades.type.range.off": "This machine does not accept range upgrades.",
"menu.nova.upgrades.type.speed": "Améliorations de vitesse : %s/%s",
"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.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.auto_fisher": "Pêcheur automatique",
"menu.nova.auto_fisher.idle": "Prochain poisson dans %s ticks",
"menu.nova.lightning_exchanger": "Convertisseur de foudre",
"menu.nova.tree_factory": "Tree Factory",
"menu.nova.trash_can": "Trash Can",
"command.nova.give.success": "L'objet %s a été ajouté à votre inventaire.",
"menu.nova.tree_factory": "Usine d'arbres",
"menu.nova.trash_can": "Poubelle",
"menu.nova.star_collector": "Collecteur d'étoile",
"menu.nova.star_collector.idle": "Recherche de poussière d'étoile...",
"menu.nova.star_collector.collection": "Collecte de Poussière d'étoile, en cour...",
"command.nova.no-players": "No players could be found.",
"command.nova.give.success": "Gave %s %s to %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é.",
"command.nova.remove_obsolete_models.success": "%s porte armures supprimés.",
"command.nova.remove_tile_entities.success": "%s tile entities supprimées.",
"command.nova.network_debug.energy": "Vue de débugage basculée pour les réseaux d'énergie",
"command.nova.network_debug.items": "Vue de débugage basculée pour les réseaux d'objets",
"command.nova.render_distance": "Your render distance has been set to %s.",
"command.nova.show_tile_entity_data.success": "This %s has the following data:\n%s",
"command.nova.show_tile_entity_data.failure": "Please look at a tile entity and try again.",
"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.",
"advancement.nova.root.title": "Nova",
"advancement.nova.root.description": "",
"advancement.nova.block_breaker.title": "Destruction de bloc automatisé",
Expand Down Expand Up @@ -262,6 +267,16 @@
"advancement.nova.auto_fisher.description": "Fabrique un pêcheur automatique",
"advancement.nova.lightning_exchanger.title": "Énergie de Zeus",
"advancement.nova.lightning_exchanger.description": "Fabriquez un Échangeur de foudre. (N'oubliez pas de mettre un paratonnerre au-dessus !)",
"advancement.nova.wind_turbine.title": "Énergie éolienne",
"advancement.nova.wind_turbine.description": "Fabriquer une Éolienne",
"advancement.nova.tree_factory.title": "Beaucoup... d'arbre produit ?",
"advancement.nova.tree_factory.description": "Fabriquer une Machine a Arbre.",
"advancement.nova.star_shards.title": "Comment se sont-ils retrouvés ici ?",
"advancement.nova.star_shards.description": "Trouver des éclats d'étoiles dans un coffre de donjon",
"advancement.nova.star_collector.title": "À court d'air",
"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",
"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
17 changes: 16 additions & 1 deletion assets/minecraft/lang/hu_hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"block.nova.lightning_exchanger": "Lightning Exchanger",
"block.nova.tree_factory": "Tree Factory",
"block.nova.trash_can": "Trash Can",
"block.nova.star_collector": "Star Collector",
"item.nova.iron_plate": "Iron Plate",
"item.nova.gold_plate": "Gold Plate",
"item.nova.diamond_plate": "Diamond Plate",
Expand Down Expand Up @@ -178,7 +179,11 @@
"menu.nova.lightning_exchanger": "Lightning Exchanger",
"menu.nova.tree_factory": "Tree Factory",
"menu.nova.trash_can": "Trash Can",
"command.nova.give.success": "The item %s has been added to your inventory.",
"menu.nova.star_collector": "Star Collector",
"menu.nova.star_collector.idle": "Searching for Star Dust...",
"menu.nova.star_collector.collection": "Collecting Star Dust...",
"command.nova.no-players": "No players could be found.",
"command.nova.give.success": "Gave %s %s to %s",
"command.nova.list_nearby.success": "Out of the %s armor stands in your chunk, %s are part of a tile entity.",
"command.nova.get_nearest_data.failed": "Could not find a tile entity nearby.",
"command.nova.remove_obsolete_models.success": "Removed %s armor stands.",
Expand Down Expand Up @@ -262,6 +267,16 @@
"advancement.nova.auto_fisher.description": "Craft an Auto Fisher",
"advancement.nova.lightning_exchanger.title": "Power from Zeus",
"advancement.nova.lightning_exchanger.description": "Craft a lightning exchanger. (Make sure to put a lightning rod on top of it!)",
"advancement.nova.wind_turbine.title": "Wind power",
"advancement.nova.wind_turbine.description": "Craft a Wind Turbine",
"advancement.nova.tree_factory.title": "Mass produced... trees?",
"advancement.nova.tree_factory.description": "Craft a Tree Factory.",
"advancement.nova.star_shards.title": "How did they end up here?",
"advancement.nova.star_shards.description": "Find Star Shards in a dungeon chest",
"advancement.nova.star_collector.title": "Out of thin air",
"advancement.nova.star_collector.description": "Craft a Star Collector",
"advancement.nova.trash_can.title": "I don't need that anymore!",
"advancement.nova.trash_can.description": "Craft a Trash Can",
"nova.tile_entity_limits.deny_blacklist": "You're not allowed to place any blocks from Nova in this world.",
"nova.tile_entity_limits.deny_blacklist_type": "You're not allowed to place this block in this world.",
"nova.tile_entity_limits.deny_limit": "You cannot place more blocks of this type.",
Expand Down
Loading

0 comments on commit 9fc6ed0

Please sign in to comment.