Merge 7e4512e20e into 1e25b36f44

Tabs can go burn in hell
Merge branch 'master' of https://github.com/PorktoberRevolution/ReStocked
2024-09-01 17:34:42 +00:00 · 2024-08-28 19:43:41 +01:00 · 2024-08-28 19:43:38 +01:00 · 2024-08-28 19:40:39 +01:00 · 2024-08-28 19:40:36 +01:00 · 2024-08-28 10:55:36 -07:00
5 changed files with 8 additions and 9 deletions
--- a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg
+++ b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg
@ -42,10 +42,9 @@ Localization
    #LOC_Restock_variant-engine_boattail_size1p5_white = Boattail (1.875m, White)
    #LOC_Restock_variant-engine_boattail_size1_grey-orange = Boattail (1.25m, Orange/Grey)
    #LOC_Restock_variant-engine_boattail_size1p5_grey-orange = Boattail (1.875m, Orange/Grey)
-	#LOC_Restock_variant-engine_tankbutt = Tankbutt
-	#LOC_Restock_variant-engine_tankbutt_white = Tankbutt (White)
-    #LOC_Restock_variant-engine_tankbutt_size2_white = Tankbutt (2.5m, White)
-    #LOC_Restock_variant-engine_tankbutt_size2_grey-orange = Tankbutt (2.5m, Orange/Grey)
+    #LOC_Restock_variant-engine_tankbutt_white = Tank Butt (White)
+    #LOC_Restock_variant-engine_tankbutt_size2_white = Tank Butt (2.5m, White)
+    #LOC_Restock_variant-engine_tankbutt_size2_grey-orange = Tank Butt (2.5m, Orange/Grey)
    #LOC_Restock_variant-engine_singlebell_compact = Single Compact
    #LOC_Restock_variant-engine_singlebell_compact_white = Single Compact (White Shroud)
    #LOC_Restock_variant-engine_singlebell_compact_grey-orange = Single Compact (Orange/Grey Shroud)
@ -66,7 +65,7 @@ Localization

    #LOC_Restock_variant-engine_shroud_white = White Shroud
    #LOC_Restock_variant-engine_shroud_grey-orange = Metallic Shroud
-	#LOC_Restock_variant-engine_shroud_grey-orange-alt = Orange/Grey Shroud
+    #LOC_Restock_variant-engine_shroud_grey-orange-alt = Orange/Grey Shroud

    #LOC_Restock_variant-engine_shroud = Shrouded
    #LOC_Restock_variant-engine_shroud_wide = Wide Shrouded
--- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg
@ -245,7 +245,7 @@
  {
    model = ReStock/Assets/Engine/restock-engine-vector-1
  }
-  @bulkheadProfiles = srf, size1, size2
+  @bulkheadProfiles = srf, size1
  node_attach = 0.0,0,0.0 , 0.0, 1.0, 0.0, 1
  !DRAG_CUBE {}
  DRAG_CUBE
--- a/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-1875.cfg
+++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-1875.cfg
@ -1836,7 +1836,7 @@
    VARIANT
    {
      name = TankButt
-      displayName = #LOC_Restock_variant-engine_tankbutt
+      displayName = #autoLOC_8007112
      primaryColor = #ffffff
      secondaryColor = #000000
      sizeGroup = GroupA
--- a/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-25.cfg
+++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-25.cfg
@ -494,7 +494,7 @@
  !sound_explosion_low = DELETE
  !MODULE[ModulePartVariants] {}
  !MODULE[FXModuleLookAtConstraint] {}
-  @bulkheadProfiles = size1, size1p5, size2, size3, srf
+  @bulkheadProfiles = size1, size1p5, size2, srf
  EFFECTS
  {
    engage
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/1875/restock-engine-galleon.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/1875/restock-engine-galleon.cfg
@ -27,7 +27,7 @@ PART
  breakingTorque = 150
  maxTemp = 2000
  fuelCrossFeed = True
-  bulkheadProfiles = size1, size1p5, size2, size3, srf
+  bulkheadProfiles = size1, size1p5, size2, srf
  tags = #LOC_RestockPlus_restock-engine-galleon_tags
  /// Flag to disable this part if MH is installed
  MHReplacement = True
Author	SHA1	Message	Date
Poodmund	98553f8deb	Merge `7e4512e20e` into `1e25b36f44`	2024-08-28 19:43:41 +01:00
Poodmund	7e4512e20e	Tabs can go burn in hell	2024-08-28 19:43:38 +01:00
Poodmund	8ef0a516f0	Merge branch 'master' of https://github.com/PorktoberRevolution/ReStocked	2024-08-28 19:40:39 +01:00
Poodmund	ba9aa2c16a	Update localisation for tank butts	2024-08-28 19:40:36 +01:00
ChrisAdderley	4bbd76d3b0	Tweak some bulkhead profiles	2024-08-28 10:55:36 -07:00
Poodmund	1e25b36f44	Merge pull request #1014 from PorktoberRevolution/master Actual v1.4.5 push	2024-05-27 20:36:23 +01:00
Poodmund	d2744a2ef0	Merge pull request #1013 from PorktoberRevolution/master v1.4.5 Release PR	2024-05-27 20:26:32 +01:00
Poodmund	4ca42161c1	Merge pull request #998 from PorktoberRevolution/master v1.4.4 Release PR	2024-05-18 20:23:13 +01:00
Chris Adderley	4183f2046f	Merge pull request #986 from PorktoberRevolution/master Release 1.4.3	2022-02-25 08:37:24 -08:00
Chris Adderley	1152c83f7f	Merge pull request #972 from PorktoberRevolution/master Release	2021-08-12 12:06:43 -07:00
Chris Adderley	abab0d1c5f	Merge pull request #963 from PorktoberRevolution/master Prepare 1.4.1	2021-07-21 13:30:09 -07:00