Skip to content

Emergency weld time fix #1920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ari-steas merged 3 commits into from
Mar 15, 2025
Merged

Emergency weld time fix #1920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4950a9
GREAT WELDING
BadM0dder Mar 6, 2025
c9a6e2d
Update Aristeas NewUniversalUpload.yml
ari-steas Mar 15, 2025
25bc3ef
Update Aristeas_BuildScripts.yml
ari-steas Mar 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .github/workflows/Aristeas NewUniversalUpload.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ jobs:
- uses: actions/checkout@v4.1.4
with:
fetch-depth: 0

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v44
with:
separator: ','

#- name: List all changed files
# env:
Expand All @@ -30,6 +24,6 @@ jobs:
# done
- id: test_SEWT
run: |
& "C:\Program Files\SCUniversalUpload\SC_NewUniversalUpload.exe" --repo "${{ github.workspace }}" --changes "${{ steps.changed-files.outputs.all_changed_and_modified_files }}" --changelog "${{ github.event.head_commit.message }}"
& "C:\Program Files\SCUniversalUpload\SC_NewUniversalUpload.exe" --repo "${{ github.workspace }}" --changelog "${{ github.event.head_commit.message }}"

- uses: EndBug/add-and-commit@v9
6 changes: 0 additions & 6 deletions .github/workflows/Aristeas_BuildScripts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ jobs:
- uses: actions/checkout@v4.1.4
with:
fetch-depth: 0

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v44
with:
separator: ','

#- name: List all changed files
# env:
Expand Down
12 changes: 6 additions & 6 deletions Weapon Mods/40k-Weapons-Mod/Data/Cubeblocks_IMP.sbc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
</BuildProgressModels>
<BlockPairName>Macro</BlockPairName>
<EdgeType>Light</EdgeType>
<BuildTimeSeconds>120</BuildTimeSeconds>
<BuildTimeSeconds>150</BuildTimeSeconds>
<WeaponDefinitionId Subtype="HeavyBolterLargeSponson" />
<MountPoints>
<MountPoint Side="Back" StartX="0.0" StartY="0.0" EndX="3.0" EndY="3.0" PropertiesMask="2" />
Expand Down Expand Up @@ -216,7 +216,7 @@
</BuildProgressModels>
<BlockPairName>HeavyMacro</BlockPairName>
<EdgeType>Light</EdgeType>
<BuildTimeSeconds>180</BuildTimeSeconds>
<BuildTimeSeconds>240</BuildTimeSeconds>
<WeaponDefinitionId Subtype="HeavyBolterLargeSponson" />
<MountPoints>
<MountPoint Side="Back" StartX="0.0" StartY="0.0" EndX="5.0" EndY="5.0" PropertiesMask="2" />
Expand Down Expand Up @@ -331,7 +331,7 @@
</BuildProgressModels>
<BlockPairName>Lance</BlockPairName>
<EdgeType>Light</EdgeType>
<BuildTimeSeconds>120</BuildTimeSeconds>
<BuildTimeSeconds>210</BuildTimeSeconds>
<WeaponDefinitionId Subtype="HeavyBolterLargeSponson" />
<MountPoints>
<MountPoint Side="Back" StartX="0.0" StartY="0.0" EndX="5.0" EndY="1.0" PropertiesMask="2" />
Expand Down Expand Up @@ -387,7 +387,7 @@
</BuildProgressModels>
<BlockPairName>LightLance</BlockPairName>
<EdgeType>Light</EdgeType>
<BuildTimeSeconds>100</BuildTimeSeconds>
<BuildTimeSeconds>180</BuildTimeSeconds>
<WeaponDefinitionId Subtype="HeavyBolterLargeSponson" />
<MountPoints>
<MountPoint Side="Back" StartX="0.0" StartY="0.0" EndX="3.0" EndY="1.0" PropertiesMask="2" />
Expand Down Expand Up @@ -443,7 +443,7 @@
</BuildProgressModels>
<BlockPairName>HeavyLance</BlockPairName>
<EdgeType>Light</EdgeType>
<BuildTimeSeconds>140</BuildTimeSeconds>
<BuildTimeSeconds>300</BuildTimeSeconds>
<WeaponDefinitionId Subtype="HeavyBolterLargeSponson" />
<MountPoints>
<MountPoint Side="Back" StartX="0.0" StartY="0.0" EndX="7.0" EndY="1.0" PropertiesMask="2" />
Expand Down Expand Up @@ -669,7 +669,7 @@
</BuildProgressModels>
<BlockPairName>Aegis</BlockPairName>
<EdgeType>Light</EdgeType>
<BuildTimeSeconds>30</BuildTimeSeconds>
<BuildTimeSeconds>40</BuildTimeSeconds>
<WeaponDefinitionId Subtype="HeavyBolterLargeSponson" />
<MountPoints>
<MountPoint Side="Back" StartX="0.0" StartY="0.0" EndX="1.0" EndY="1.0" PropertiesMask="2" />
Expand Down
8 changes: 4 additions & 4 deletions Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/203Triple.sbc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
[Shell Speed: 1000m/s | 1100m/s]
[Damage Types: Energy | Kinetic]

Triple barreled 203mm/8 Inch used commonly by the Us navy during ww2 and into the cold war period
Medium to long range artillery turret, used heavily on heavy cruisers likt eh Des Moines.
Triple barreled 203mm/8 Inch used commonly by the USN during WW2 and into the cold war period.
Medium to long range artillery turret, used heavily on heavy cruisers like Des Moines.
</Description>
<Icon>Textures\GUI\Icons\8Inch55RF.dds</Icon>
<Icon>Textures\GUI\Icons\8Inch55Main.dds</Icon>
<CubeSize>Large</CubeSize>
<BlockTopology>TriangleMesh</BlockTopology>
<Size x="3" y="2" z="3"/>
Expand All @@ -42,7 +42,7 @@
</MountPoints>
<MirroringY>Z</MirroringY>
<MirroringZ>Y</MirroringZ>
<BuildTimeSeconds>30</BuildTimeSeconds>
<BuildTimeSeconds>180</BuildTimeSeconds>
<BlockPairName>203mmQuad</BlockPairName>
</Definition>
</CubeBlocks>
Expand Down
1 change: 1 addition & 0 deletions Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/203Twin.sbc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
</MountPoints>
<MirroringY>Z</MirroringY>
<MirroringZ>Y</MirroringZ>
<BuildTimeSeconds>180</BuildTimeSeconds>
<BlockPairName>203mmTwin</BlockPairName>
</Definition>
</CubeBlocks>
Expand Down
2 changes: 1 addition & 1 deletion Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/508mm twin.sbc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<MountPoints>
<MountPoint Side="Bottom" StartX="0" StartY="0" EndX="7" EndY="7" />
</MountPoints>
<BuildTimeSeconds>120</BuildTimeSeconds>
<BuildTimeSeconds>360</BuildTimeSeconds>
<BlockPairName>20InchTwin</BlockPairName>
<MirroringY>Z</MirroringY>
<MirroringZ>Y</MirroringZ>
Expand Down
1 change: 1 addition & 0 deletions Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/5InchQF.sbc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<Component Subtype="SteelPlate" Count="1600" />
</Components>
<CriticalComponent Subtype="Motor" Index="0" />
<BuildTimeSeconds>150</BuildTimeSeconds>
<MirroringY>Z</MirroringY>
<MirroringZ>Y</MirroringZ>
<MountPoints>
Expand Down
6 changes: 3 additions & 3 deletions Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/BarbetteSet.sbc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</BuildProgressModels>
<BlockPairName>Barbette5x5</BlockPairName>
<EdgeType>Light</EdgeType>
<BuildTimeSeconds>15</BuildTimeSeconds>
<BuildTimeSeconds>420</BuildTimeSeconds>
<EmissiveColorPreset>Default</EmissiveColorPreset>
<DamageEffectName>Damage_HeavyMech_Damaged</DamageEffectName>
<DamagedSound>ParticleHeavyMech</DamagedSound>
Expand Down Expand Up @@ -80,7 +80,7 @@
<BlockPairName>Barbette3x3</BlockPairName>
<MirroringY>X</MirroringY>
<EdgeType>Light</EdgeType>
<BuildTimeSeconds>10</BuildTimeSeconds>
<BuildTimeSeconds>270</BuildTimeSeconds>
<EmissiveColorPreset>Default</EmissiveColorPreset>
<DamageEffectName>Damage_HeavyMech_Damaged</DamageEffectName>
<DamagedSound>ParticleHeavyMech</DamagedSound>
Expand Down Expand Up @@ -125,7 +125,7 @@
<BlockPairName>Barbette1x1</BlockPairName>
<MirroringY>X</MirroringY>
<EdgeType>Light</EdgeType>
<BuildTimeSeconds>5</BuildTimeSeconds>
<BuildTimeSeconds>30</BuildTimeSeconds>
<EmissiveColorPreset>Default</EmissiveColorPreset>
<DamageEffectName>Damage_HeavyMech_Damaged</DamageEffectName>
<DamagedSound>ParticleHeavyMech</DamagedSound>
Expand Down
1 change: 1 addition & 0 deletions Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/BoforTwinMain.sbc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<Component Subtype="SteelPlate" Count="15" />
</Components>
<CriticalComponent Subtype="SteelPlate" Index="0"/>
<BuildTimeSeconds>15</BuildTimeSeconds>
<MountPoints>
<MountPoint Side="Front" StartX="0.00" StartY="0.00" EndX="1.00" EndY="1.00" Enabled="false"/>
<MountPoint Side="Back" StartX="0.00" StartY="0.00" EndX="1.00" EndY="1.00" Enabled="false"/>
Expand Down
1 change: 1 addition & 0 deletions Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/Mk25 Rangefinder.sbc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<ModelOffset x="0" y="0" z="0"/>
<Model>Models\Rangefinder\Mk25 Rangefinder.mwm</Model>
<UseModelIntersection>true</UseModelIntersection>
<BuildTimeSeconds>15</BuildTimeSeconds>
<Components>
<Component Subtype="SteelPlate" Count="25" />
<Component Subtype="Construction" Count="20" />
Expand Down
1 change: 1 addition & 0 deletions Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/OerlikonDual.sbc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<Component Subtype="SteelPlate" Count="200" />
</Components>
<CriticalComponent Subtype="SteelPlate" Index="0"/>
<BuildTimeSeconds>15</BuildTimeSeconds>
<BlockPairName>OerlikonDual</BlockPairName>
<MirroringY>Z</MirroringY>
<MirroringZ>Y</MirroringZ>
Expand Down
1 change: 1 addition & 0 deletions Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/OerlikonMain.sbc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<Component Subtype="SteelPlate" Count="200" />
</Components>
<CriticalComponent Subtype="SteelPlate" Index="0"/>
<BuildTimeSeconds>15</BuildTimeSeconds>
<MountPoints>
<MountPoint Side="Bottom" StartX="0.00" StartY="0.00" EndX="1.00" EndY="1.00"/>
</MountPoints>
Expand Down
1 change: 1 addition & 0 deletions Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/PomPomMain.sbc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<MountPoints>
<MountPoint Side="Bottom" StartX="0.00" StartY="0.00" EndX="1.00" EndY="1.00" Default="true"/>
</MountPoints>
<BuildTimeSeconds>15</BuildTimeSeconds>
<BlockPairName>PomPomMain</BlockPairName>
<MirroringY>Z</MirroringY>
<MirroringZ>Y</MirroringZ>
Expand Down
1 change: 1 addition & 0 deletions Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/QuadBofor.sbc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
<MountPoint Side="Bottom" StartX="0.00" StartY="0.00" EndX="1.00" EndY="1.00" Default="true"/>
</MountPoints>
<BlockPairName>QuadBofor</BlockPairName>
<BuildTimeSeconds>15</BuildTimeSeconds>
<MirroringY>Z</MirroringY>
<MirroringZ>Y</MirroringZ>
<BuildProgressModels>
Expand Down
1 change: 1 addition & 0 deletions Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/TorpBarbette.sbc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<Component Subtype="SteelPlate" Count="3200" />
</Components>
<CriticalComponent Subtype="Motor" Index="0" />
<BuildTimeSeconds>540</BuildTimeSeconds>
<MountPoints>
<MountPoint Side="Bottom" StartX="1" StartY="1" EndX="2" EndY="2" />
</MountPoints>
Expand Down
18 changes: 9 additions & 9 deletions Weapon Mods/TaitMod_Fletcher/Data/Cubeblocks.sbc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@
<MirroringY>Z</MirroringY>
<MirroringZ>Y</MirroringZ>
<EdgeType>Light</EdgeType>
<BuildTimeSeconds>40</BuildTimeSeconds>
<BuildTimeSeconds>150</BuildTimeSeconds>
<OverlayTexture>Textures\GUI\HUD\USAASight.dds</OverlayTexture>
<WeaponDefinitionId Subtype="127mmMk32" />
<InventoryMaxVolume>300</InventoryMaxVolume>
Expand Down Expand Up @@ -827,7 +827,7 @@
<Component Subtype="Motor" Count="100" />
<Component Subtype="Computer" Count="100" />
<Component Subtype="Construction" Count="200" />
<Component Subtype="MetalGrid" Count="200" />
<Component Subtype="MetalGrid" Count="200" />
<Component Subtype="SteelPlate" Count="1600" />
</Components>
<CriticalComponent Subtype="Motor" Index="0" />
Expand All @@ -850,7 +850,7 @@
<MirroringY>Z</MirroringY>
<MirroringZ>Y</MirroringZ>
<EdgeType>Light</EdgeType>
<BuildTimeSeconds>40</BuildTimeSeconds>
<BuildTimeSeconds>150</BuildTimeSeconds>
<OverlayTexture>Textures\GUI\HUD\USAASight.dds</OverlayTexture>
<WeaponDefinitionId Subtype="127mmMk12" />
<InventoryMaxVolume>200</InventoryMaxVolume>
Expand Down Expand Up @@ -931,7 +931,7 @@
<MirroringY>Z</MirroringY>
<MirroringZ>Y</MirroringZ>
<EdgeType>Light</EdgeType>
<BuildTimeSeconds>30</BuildTimeSeconds>
<BuildTimeSeconds>150</BuildTimeSeconds>
<OverlayTexture>Textures\GUI\HUD\USAASight.dds</OverlayTexture>
<WeaponDefinitionId Subtype="127mmMk24" />
<InventoryMaxVolume>120</InventoryMaxVolume>
Expand Down Expand Up @@ -1008,7 +1008,7 @@
<MirroringY>Z</MirroringY>
<MirroringZ>Y</MirroringZ>
<EdgeType>Light</EdgeType>
<BuildTimeSeconds>40</BuildTimeSeconds>
<BuildTimeSeconds>150</BuildTimeSeconds>
<OverlayTexture>Textures\GUI\HUD\USGunsight.dds</OverlayTexture>
<WeaponDefinitionId Subtype="6InchTriple" />
<InventoryMaxVolume>100</InventoryMaxVolume>
Expand Down Expand Up @@ -1084,7 +1084,7 @@
<MirroringY>Z</MirroringY>
<MirroringZ>Y</MirroringZ>
<EdgeType>Light</EdgeType>
<BuildTimeSeconds>120</BuildTimeSeconds>
<BuildTimeSeconds>250</BuildTimeSeconds>
<OverlayTexture>Textures\GUI\HUD\USGunsight.dds</OverlayTexture>
<WeaponDefinitionId Subtype="16InchTriple" />
<InventoryMaxVolume>100</InventoryMaxVolume>
Expand Down Expand Up @@ -1168,7 +1168,7 @@
<MirroringY>Z</MirroringY>
<MirroringZ>Y</MirroringZ>
<EdgeType>Light</EdgeType>
<BuildTimeSeconds>120</BuildTimeSeconds>
<BuildTimeSeconds>250</BuildTimeSeconds>
<OverlayTexture>Textures\GUI\HUD\GermanTankSight.dds</OverlayTexture>
<WeaponDefinitionId Subtype="381mmDualR" />
<InventoryMaxVolume>100</InventoryMaxVolume>
Expand Down Expand Up @@ -1244,7 +1244,7 @@
<MirroringY>Z</MirroringY>
<MirroringZ>Y</MirroringZ>
<EdgeType>Light</EdgeType>
<BuildTimeSeconds>120</BuildTimeSeconds>
<BuildTimeSeconds>250</BuildTimeSeconds>
<OverlayTexture>Textures\GUI\HUD\GermanTankSight.dds</OverlayTexture>
<WeaponDefinitionId Subtype="381mmDualNR" />
<InventoryMaxVolume>100</InventoryMaxVolume>
Expand Down Expand Up @@ -1466,7 +1466,7 @@
<MirroringY>Z</MirroringY>
<MirroringZ>Y</MirroringZ>
<EdgeType>Light</EdgeType>
<BuildTimeSeconds>120</BuildTimeSeconds>
<BuildTimeSeconds>250</BuildTimeSeconds>
<OverlayTexture>Textures\GUI\HUD\GermanTankSight.dds</OverlayTexture>
<WeaponDefinitionId Subtype="380mmMLE1935" />
<InventoryMaxVolume>100</InventoryMaxVolume>
Expand Down