Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	core/assets/bundles/bundle_cs.properties
#	core/assets/bundles/bundle_fr.properties
#	core/assets/bundles/bundle_it.properties
#	core/assets/bundles/bundle_nl.properties
#	core/assets/bundles/bundle_pt.properties
#	core/assets/bundles/bundle_ru.properties
#	core/assets/bundles/bundle_zh_TW.properties
This commit is contained in:
Anuken
2020-01-08 11:00:19 -05:00
parent 5ad09d6d80 4a94a6c059
commit c04c825cec
24 changed files with 1584 additions and 1536 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/bundles/bundle_fr_BE.properties
+2 -2
View File
@@ -789,7 +789,7 @@ item.coal.name = Charbon
item.graphite.name = Graphite
item.titanium.name = Titane
item.thorium.name = Thorium
item.silicon.name = Silicone
item.silicon.name = Silicium
item.plastanium.name = Plastanium
item.phase-fabric.name = Phase Fabric
item.surge-alloy.name = Alliage superchargé
@@ -942,7 +942,7 @@ block.message.name = Message
block.illuminator.name = Illuminator
block.illuminator.description = A small, compact, configurable light source. Requires power to function.
block.overflow-gate.name = Barrière de Débordement
block.silicon-smelter.name = Fonderie de silicone
block.silicon-smelter.name = Fonderie de silicium
block.phase-weaver.name = Tisseur à phase
block.pulverizer.name = Pulvérisateur
block.cryofluidmixer.name = Refroidisseur