Merge remote-tracking branch 'pellinor0/develop'

MagicSmokeIndustries · Mar 26, 2015 · 68a392f · 68a392f
2 parents 236dc03 + 6f45e1c
commit 68a392f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Resources/GameData/MagicSmokeIndustries/IR_TweakScale.cfg b/Resources/GameData/MagicSmokeIndustries/IR_TweakScale.cfg
@@ -16,14 +16,6 @@ SCALETYPE
     suffix = m
     TWEAKSCALEEXPONENTS { mass = 1 }
 }
-SCALETYPE
-{
-    name = IR_Telescopic
-    freeScale = true
-    scaleFactors = 0.16777216,0.2097152,0.262144,0.32768,0.4096,0.512,0.64,0.8,1
-    defaultScale = 1.0
-    TWEAKSCALEEXPONENTS { mass = 1 }
-}
 TWEAKSCALEEXPONENTS
 {
     name = MuMechToggle

diff --git a/Resources/GameData/MagicSmokeIndustries/Parts/Legacy/IR_TweakScale.cfg b/Resources/GameData/MagicSmokeIndustries/Parts/Legacy/IR_TweakScale.cfg
@@ -72,6 +72,14 @@ SCALETYPE
     scaleNames = Small, Medium, Large
     defaultScale = 1.25
 }
+SCALETYPE
+{
+    name = IR_Telescopic
+    freeScale = true
+    scaleFactors = 0.16777216,0.2097152,0.262144,0.32768,0.4096,0.512,0.64,0.8,1
+    defaultScale = 1.0
+    TWEAKSCALEEXPONENTS { mass = 1 }
+}
 
 SCALETYPE
 {