Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp

2026-05-14 19:12:38 -07:00 · 2018-05-23 15:33:25 +02:00
parent 90c50b281a a4261b11d4
commit 486180c422
15 changed files with 7984 additions and 4804 deletions
--- a/resources/localization/de_DE/Slic3rPE.mo
+++ b/resources/localization/de_DE/Slic3rPE.mo
--- a/resources/localization/de_DE/Slic3rPE_de.po
+++ b/resources/localization/de_DE/Slic3rPE_de.po
--- a/resources/localization/es/Slic3rPE.mo
+++ b/resources/localization/es/Slic3rPE.mo
--- a/resources/localization/es/Slic3rPE_es.po
+++ b/resources/localization/es/Slic3rPE_es.po
--- a/resources/localization/fr_FR/Slic3rPE.mo
+++ b/resources/localization/fr_FR/Slic3rPE.mo
--- a/resources/localization/fr_FR/Slic3rPE_fr.po
+++ b/resources/localization/fr_FR/Slic3rPE_fr.po
--- a/resources/localization/it/Slic3rPE.mo
+++ b/resources/localization/it/Slic3rPE.mo
--- a/resources/localization/it/Slic3rPE_it.po
+++ b/resources/localization/it/Slic3rPE_it.po
--- a/resources/localization/pl/Slic3rPE.mo
+++ b/resources/localization/pl/Slic3rPE.mo
--- a/resources/localization/pl/Slic3rPE_pl.po
+++ b/resources/localization/pl/Slic3rPE_pl.po
--- a/resources/profiles/PrusaResearch.ini
+++ b/resources/profiles/PrusaResearch.ini
@@ -546,7 +546,7 @@ filament_cost = 0
 filament_density = 0
 filament_diameter = 1.75
 filament_notes = ""
-filament_settings_id = 
+filament_settings_id = ""
 filament_soluble = 0
 min_print_speed = 15
 slowdown_below_layer_time = 20