Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/LCT_recipe_visualization' into L…
Browse files Browse the repository at this point in the history
…CT_recipe_visualization

# Conflicts:
#	src/main/resources/assets/minelabs/lang/nl_be.json
#	src/main/resources/assets/minelabs/lang/nl_nl.json
  • Loading branch information
IneMEGAmaxi committed Nov 23, 2022
2 parents 026223a + d1e3a48 commit a225ee1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/main/resources/assets/minelabs/lang/nl_be.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"itemGroup.minelabs.atoms": "Atomen",
"text.minelabs.valid": "Correcte Molecule",
"text.minelabs.invalid": "Onvolledige Molecule",
"text.minelabs.not_implemented": "Molecule niet geïmplementeerd",
"text.minelabs.not_implemented": "Molecule zit niet in het spel",
"text.minelabs.multiple_molecules": "Te veel moleculen",

"block.minelabs.salt_ore": "Zouterts",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/minelabs/lang/nl_nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"itemGroup.minelabs.atoms": "Atomen",
"text.minelabs.valid": "Correcte Molecule",
"text.minelabs.invalid": "Onvolledige Molecule",
"text.minelabs.not_implemented": "Molecule niet geïmplementeerd",
"text.minelabs.not_implemented": "Molecule zit niet in het spel",
"text.minelabs.multiple_molecules": "Te veel moleculen",

"block.minelabs.salt_ore": "Zouterts",
Expand Down

0 comments on commit a225ee1

Please sign in to comment.