Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'integratedFileEditor' into develop

Browse Source 
# Conflicts:
#	Libs/CMS_CORE_Library.dll
#	Step.Utils/languages/IT.xml
#	Step.Utils/languages/de.xml
#	Step.Utils/languages/en.xml
#	Step.Utils/languages/fr.xml
#	Step.Utils/languages/hr.xml
#	Step.Utils/languages/ro.xml
This commit is contained in:
Lucio Maranta
2019-08-28 14:29:51 +02:00
parent 5ad1f127cd 2b6ca98913
commit b379270a09
28 changed files with 1139 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.Config/Config/toolManagerConfig.xml
+4 -4
View File
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?>
<root>
<toolManagerConfig>
<toolMetricType>RADIUS</toolMetricType> <!-- RADIUS/DIAMETER -->
<toolMetricType>DIAMETER</toolMetricType> <!-- RADIUS/DIAMETER -->
<familyOpt>true</familyOpt>
<shankOpt>false</shankOpt>
<magPositionOpt>true</magPositionOpt>
<offsetOpt>false</offsetOpt>
<offsetOpt>true</offsetOpt>
<reviveOpt>true</reviveOpt>
<gammaOpt>true</gammaOpt>
<lifeOpt>true</lifeOpt>
@@ -61,7 +61,7 @@
</magazine>
<magazine>
<id>2</id>
<assistedTooling>true</assistedTooling>
<assistedTooling>false</assistedTooling>
<localizedNames>
<lang langKey="en">Magazine 2</lang>
<lang langKey="it">Magazzino 2</lang>
@@ -69,7 +69,7 @@
</magazine>
<magazine>
<id>3</id>
<assistedTooling>true</assistedTooling>
<assistedTooling>false</assistedTooling>
<localizedNames>
<lang langKey="en">Magazine 3</lang>
<lang langKey="it">Magazzino 3</lang>