Ellpeck 2aefe84ff2 Merge remote-tracking branch 'origin/master'		2017-02-13 14:17:03 +01:00
..
java	Fix an exception due to broken furnace recipes in the booklet	2017-02-13 14:16:57 +01:00
resources	fixed a lot of typos in fr_FR.lang (#636)	2017-02-13 07:42:22 +01:00