mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-11 11:17:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	core/assets/bundles/bundle_fr.properties
This commit is contained in:
Anuken 2018-10-13 08:59:15 -04:00
commit 8bda5e16cd
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/assets/bundles/bundle_fr.properties
View File

@ -36,6 +36,8 @@ text.sector.deploy=Se déployer
text.sector.resume=Reprendre
text.sector.locked=[scarlet][[Incomplet]
text.sector.unexplored=[accent][[Inexploré]
text.missions=Missions:[LIGHT_GRAY] {0}
text.mission=Mission:[LIGHT_GRAY] {0}
text.mission.info=Infos sur la Mission
text.mission.complete=Mission terminée!
@ -314,7 +316,7 @@ text.unit.pixelssecond=Pixels/seconde
text.unit.liquidunits=Unité de liquide
text.unit.powerunits=Unité d'énergie
text.unit.degrees=degrés
text.unit.seconds=secondes
text.unit.seconds=secondes
text.unit.none=
text.unit.items=Objets
text.category.general=Général
@ -464,6 +466,8 @@ text.mech.itemcapacity=[LIGHT_GRAY]Capacité de stockage: {0}
text.mech.minespeed=[LIGHT_GRAY]Vitesse de minage: {0}
text.mech.minepower=[LIGHT_GRAY]Puissance du minage: {0}
text.mech.ability=[LIGHT_GRAY]Compétence: {0}
block.spawn.name=Générateur d'ennemi
block.core.name=Base
block.metalfloor.name=Sol en métal
block.copper-wall.name=Mur de cuivre
@ -631,7 +635,6 @@ text.sector.retry=Retry
text.wave.lasted=You lasted until wave [accent]{0}[].
text.map.delete=Are you sure you want to delete the map "[orange]{0}[]"?
text.deconstruction.title=Block Deconstruction Guide
text.missions=Missions:[LIGHT_GRAY] {0}
text.server.kicked.serverClose=Server closed.
text.blocks.inputitem=Input Item
text.blocks.inputcapacity=Input capacity
@ -644,7 +647,6 @@ keybind.press.axis=Press an axis or key...
keybind.deselect.name=Deselect
item.silcion.description=An extremely useful semiconductor, with applications in solar panels and many complex electronics.
item.biomatter.description=A clump of organic mush; used for conversion into oil or as a basic fuel.
block.spawn.name=Enemy Spawn
block.sorter.name=Sorter
block.smelter.name=Smelter
block.fortress-factory.name=Fortress Mech Factory

7
tools/src/io/anuke/mindustry/BundleLauncher.java
View File

@ -10,6 +10,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@ -29,7 +30,7 @@ public class BundleLauncher {
Log.info("Parsing bundle: {0}", child);
OrderedMap<String, String> other = new OrderedMap<>();
PropertiesUtils.load(other, Files.newBufferedReader(child));
PropertiesUtils.load(other, Files.newBufferedReader(child, Charset.forName("UTF-8")));
removals.clear();
for(String key : other.orderedKeys()){
@ -62,7 +63,7 @@ public class BundleLauncher {
result.append(e.toString().replace("\\", "\\\\").replace("\n", "\\n"));
result.append("\n");
}
Files.write(child, result.toString().getBytes());
Files.write(child, result.toString().getBytes("UTF-8"));
}catch (IOException e){
throw new RuntimeException(e);
@ -70,4 +71,4 @@ public class BundleLauncher {
});
}
}
}