diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..05895497 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "githubPullRequests.ignoredPullRequestBranches": [ + "master" + ] +} \ No newline at end of file diff --git a/assets/base/lang/nb_no/base_blocks.json b/assets/base/lang/nb_no/base_blocks.json index 94317195..9976ac99 100644 --- a/assets/base/lang/nb_no/base_blocks.json +++ b/assets/base/lang/nb_no/base_blocks.json @@ -57,7 +57,15 @@ "base:tree_log::bark": "Trebark", "base:tree_log::coconut_bark": "Kokosbark", "base:tree_log_lux": "Lux-tømmer", - "base:tree_log_lux::glow": "Glødende Lux-tømmer", + "base:tree_log_lux::glow": "Glødende lux-tømmer", + "base:luxshroom_small": "Liten lux-sopp", + "base:luxshroom_small::blue": "Liten blå lux-sopp", + "base:luxshroom_small::purple": "Liten lilla lux-sopp", + "base:luxshroom_small::brown": "Liten brun lux-sopp", + "base:luxshroom_big::stem": "Lux-soppstilk", + "base:luxshroom_big::canopy_blue": "Blå lux-sopphatt", + "base:luxshroom_big::canopy_purple": "Lilla lux-sopphatt", + "base:luxshroom_big::canopy_brown": "Brun lux-sopphatt", "base:stone_gravel": "Grus", "base:boombox": "Boombox", "base:water": "Vann", @@ -106,6 +114,10 @@ "base:pixel_display": "Pikselrute", "base:grass_blades": "Gresstrå", "base:grass_blades_lux": "Lux-gresstrå", + "base:flower_cosmos": "Kosmosblomst", + "base:flower_cosmos::lux": "Lux-kosmosblomst", + "base:flower_lavender": "Lavendelblomst", + "base:flower_lavender::lux": "Lux-lavendelblomst", "base:plastic_block::gray": "Grå plast", "base:plastic_block::white": "Hvit plast", "base:plastic_block::black": "Svart plast", @@ -184,4 +196,4 @@ "base:table_pedestal_iron": "Jernhøybord", "base:table_pedestal_aluminium": "Aluminiumshøybord", "base:table_pedestal_steel": "Stålhøybord" -} +} \ No newline at end of file diff --git a/assets/base/lang/nb_no/base_items.json b/assets/base/lang/nb_no/base_items.json index c6949726..a3ba82ca 100644 --- a/assets/base/lang/nb_no/base_items.json +++ b/assets/base/lang/nb_no/base_items.json @@ -59,4 +59,4 @@ "base:cell_planteater": "Blomstersnabeldyr-celle", "base:cell_tundramel": "Tundramedarcelle", "base:syringe": "Sprøyte" -} +} \ No newline at end of file diff --git a/assets/base/lang/nb_no/game.json b/assets/base/lang/nb_no/game.json index fc5e541b..76de9ded 100644 --- a/assets/base/lang/nb_no/game.json +++ b/assets/base/lang/nb_no/game.json @@ -11,6 +11,7 @@ "optionsButton": "Innstillinger", "quitButton": "Avslutt", "vSyncButton": "Vsync: ", + "cloudsButton": "Skyer: ", "creditsButton": "Medvirkende", "renderDistSlider": "Erindringsavstand: ", "invertedMouseButton": "Inverter musen: ", @@ -136,11 +137,11 @@ "zone_base:earth": "Jorden", "zone_base:flat": "Flat verden", "zone_base:moon": "Månen", - "zone_base:lux": "Lux", "zone_base:nostalgic_island": "Nostalgiske øyer", "zone_base:void": "Tom verden", "mobUnnamed": "Navnløs skapning", "zone_base:earth_legacy": "Jorden (Tidligere versjon)", + "zone_base:lux": "Lux", "comingSoon": "Kommer snart…", "langSelectionSearch": "Søk etter språk…", "worldDescriptionName": "Verdensnavn:", @@ -163,4 +164,4 @@ "fullscreenModeButton": "Fullskjermsmodus: ", "fullscreenExclusive": "Eksklusiv", "fullscreenBorderless": "Kantløs" -} +} \ No newline at end of file diff --git a/assets/base/lang/nn_no/base_blocks.json b/assets/base/lang/nn_no/base_blocks.json index 87b5a304..bc5515bb 100644 --- a/assets/base/lang/nn_no/base_blocks.json +++ b/assets/base/lang/nn_no/base_blocks.json @@ -46,7 +46,9 @@ "base:furnace": "Omn", "base:metal_panel": "Jarnblokk", "base:leaves_poplar": "Poppellauv", + "base:leaves_lux": "Lux-lauv", "base:sapling_poplar": "Poppelrenning", + "base:sapling_lux": "Lux-renning", "base:magma": "Magma", "base:coconut": "Kokosnøtt", "base:ore_iron": "Jarnmalm", @@ -54,17 +56,29 @@ "base:tree_log": "Trestamme", "base:tree_log::bark": "Trebark", "base:tree_log::coconut_bark": "Kokosbark", + "base:tree_log_lux": "Lux-stamme", + "base:tree_log_lux::glow": "Glødande Lux-stamme", + "base:luxshroom_small": "Liten lux-sopp", + "base:luxshroom_small::blue": "Liten blå lux-sopp", + "base:luxshroom_small::purple": "Liten lilla lux-sopp", + "base:luxshroom_small::brown": "Liten brun lux-sopp", + "base:luxshroom_big::stem": "Lux-soppstilk", + "base:luxshroom_big::canopy_blue": "Blå lux-sopphatt", + "base:luxshroom_big::canopy_purple": "Lilla lux-sopphatt", + "base:luxshroom_big::canopy_brown": "Brun lux-sopphatt", "base:stone_gravel": "Grus", "base:boombox": "Boombox", "base:water": "Vatn", "base:snow": "Snø", "base:grass": "Gras", + "base:grass_lux": "Lux-gras", "base:sand": "Sand", "base:hazard": "Farestripar", "base:dirt": "Mold", "base:bricks": "Mur", "base:ice": "Is", "base:text_display": "Tekstrute", + "base:item_hologram": "Gjenstandshologram", "base:rubber_block": "Gummiblokk", "base:gold_block": "Gullblokk", "base:wood_door": "Tredør", @@ -99,6 +113,11 @@ "base:workbench": "Emningsbord", "base:pixel_display": "Pikselrute", "base:grass_blades": "Grasstrå", + "base:grass_blades_lux": "Lux-grasstrå", + "base:flower_cosmos": "Kosmosblome", + "base:flower_cosmos::lux": "Lux-kosmosblome", + "base:flower_lavender": "Lavendelblome", + "base:flower_lavender::lux": "Lux-lavendelblome", "base:plastic_block::gray": "Grå plast", "base:plastic_block::white": "Kvit plast", "base:plastic_block::black": "Svart plast", @@ -143,6 +162,7 @@ "base:cardboard_box": "Pappeske", "base:planteater_flower": "Snabeldyrblome", "base:conveyor_belt": "Transportbelte", + "base:chute": "Sjakt", "base:hazard::caution": "Åtvaringsstriper", "base:hazard::defective": "Defektstriper", "base:hazard::operational": "Operativstriper", @@ -176,4 +196,4 @@ "base:table_pedestal_iron": "Jarnhøgbord", "base:table_pedestal_aluminium": "Aluminiumshøgbord", "base:table_pedestal_steel": "Stålhøgbord" -} +} \ No newline at end of file diff --git a/assets/base/lang/nn_no/base_items.json b/assets/base/lang/nn_no/base_items.json index 00be3019..578fbb15 100644 --- a/assets/base/lang/nn_no/base_items.json +++ b/assets/base/lang/nn_no/base_items.json @@ -16,6 +16,7 @@ "base:stick": "Pinne", "base:fluid_vacuum": "Væskesugar", "base:latex": "Latex", + "base:lux_sap": "Lux-sevje", "base:rubber_ball": "Gummiball", "base:laser_gun": "Laserpistol", "base:jetpack": "Flyvesekk", diff --git a/assets/base/lang/nn_no/game.json b/assets/base/lang/nn_no/game.json index b3803a40..0b00720e 100644 --- a/assets/base/lang/nn_no/game.json +++ b/assets/base/lang/nn_no/game.json @@ -11,6 +11,7 @@ "optionsButton": "Innstillingar", "quitButton": "Avslutt", "vSyncButton": "Vsync: ", + "cloudsButton": "Skya: ", "creditsButton": "Medverkande", "renderDistSlider": "Synsvidde: ", "invertedMouseButton": "Inverter musa: ", @@ -42,6 +43,7 @@ "Return_To_Menu": "Gå til meny", "Saving": "Lagrar...", "Dynamic_Sky": "Dynamisk himmel", + "Lux_Sky": "Lux-himmel", "Space_Day": "Romdag", "Space_Sky": "Romhimmel", "Dark_Night": "Mørk natt", @@ -74,6 +76,7 @@ "Microphone": "Mikrofon", "Disabled": "Deaktivert", "voiceVolume": "Andres talevolum", + "micVolume": "Mikrofonvolum", "No_Clip": "Spøkjelsesmodus", "Change_Perspective": "Skift perspektiv", "Reload_Shaders": "Last inn Shaders på nytt", @@ -138,6 +141,7 @@ "zone_base:void": "Tom verd", "mobUnnamed": "Namnlaus skapning", "zone_base:earth_legacy": "Jorda (Tidlegare versjon)", + "zone_base:lux": "Lux", "comingSoon": "Kjem snart…", "langSelectionSearch": "Søk etter mål…", "worldDescriptionName": "Verdsnamn:",