search

BrettRyland / BDArmory

Gun turrets and other weapon systems for KSP
34 stars 23 forks source link

S6R9 #651

Closed SuicidalInsanity closed 1 month ago

SuicidalInsanity commented 2 months ago

Fixes for infinite fuel till first gate issues

BrettRyland commented 2 months ago

I'm seeing a lot of merge conflicts with the dev branch. It looks like these changes are based off of the master branch instead with the kinetic-missile-refactor PR added in. I guess this is in order to minimise the changes from the original DLL for this round, but since the DLL is already being distributed, I think it's fine to merge in the rest of the changes from dev.

I think the kinetic-missile-refactor PR should be good to merge — yes/no? So I think the best way to get this merged is to first merge that PR, then fix the conflicts between this branch and dev.

SuicidalInsanity commented 2 months ago

Was sort of in a rush to get the S6R9 changes done, so didn't realize I was building off the wrong branch; was intending to just use Master to keep things as similar to the 1.1.6.12.0 release. So yes, merging the kinetic missile PR first would be the way to go

BrettRyland commented 1 month ago

Was sort of in a rush to get the S6R9 changes done, so didn't realize I was building off the wrong branch; was intending to just use Master to keep things as similar to the 1.1.6.12.0 release. So yes, merging the kinetic missile PR first would be the way to go

OK, the kinetic-missile-refactor branch is merged in now, so resolving the conflicts between this and dev can happen when you have some spare time.