34,469 Commits over 4,201 Days - 0.34cph!
    
    
    
        
            
            
            
                
                 Fixed protobuf/generate.sh DOS line endings (breaking unix shell scripts)
                
                
                
                
             
         
        
            
            
            
                
                merge from trainyard_path_fix
                
                
                
                
             
         
        
            
            
            
                
                Fix doors checking for blockages when opening if checkPhysBoxesOnOpen is false (fixes garage door getting stuck closed if a vehicle is stuck in it)
                
                
                
                
             
         
        
            
            
            
                
                Merge ScreenshotChanges -> Main
                
                
                
                
             
         
        
        
            
            
            
                
                Fix modular car conditional object NRE that could occur when adding a new module to a chassis, if the following out-of-order scenario occurred:
- Server creates the module entity and saves it to client with socket index -1 (no socket)
- Server adds the module to the car with socket index now set
- Server saves new socket index to client
- Client creates the module entity and calculates socket index correctly
- Client loads new entity, socket index incorrectly reverts to -1
- Client refreshes module conditionals, bad socket index causes NRE
                
                
                
                
             
         
        
            
            
            
                
                Merge from flare_optimizations
                
                
                
                
             
         
        
        
            
            
            
                
                Merge from flare_optimizations
                
                
                
                
             
         
        
        
            
            
            
                
                Merge from TMP_Text update optimisation
                
                
                
                
             
         
        
            
            
            
                
                Revert ProjectSettings changes
                
                
                
                
             
         
        
        
            
            
            
                
                merge from flare_optimisations
                
                
                
                
             
         
        
            
            
            
                
                merge from /FixCarConditionalNRE
                
                
                
                
             
         
        
            
            
            
                
                ▋▉▅ ▆▅▅▌▆█▊▋█▆█▇▌▍.█▌▇▄▍▋▋▆▆▋▍▊█▌▍▌▆▇▊▌ ▍▊█ ▄▇▍▄█▉▆▍ ▍▆▋▇ █▌▅ ▋▋▇▍▌█▌▊ ▍▌▌▊▍▅▋▍▄ ▋▇▇▊▍▋▇▋ ▄▌▍▇▋██ ▍▄ ▉▌█ ▍▋▄▅▊▄
                
                
                
                
             
         
        
            
            
            
                
                ▌▌▅ ▊▅▆ ▌▆█▍▇▅▋▊▇ ▌▅▊ ▋▌▊▅ ▄▌▇▉▇▅ ▉▆▄▇ ▋▆▇▌▊▊▋ ▋▇▆▄
                
                
                
                
             
         
        
            
            
            
                
                ▆▍▄▄▋ ▊▉▋▄▋▅▌▊▄▆ ▍▌▋▊ ▋▆ ▇█▋▄▊ ▌▆▋▌▍ ▉▉ ▆▇▋▅▊▆▄▄ █▇▅▌▊ ▉▆▋▊ ▋▍▆▄ ▉▌█▇ ▍▅ ▋▆▍▆▌▉▇█▋▉ ▋▆█▊▊ ▌▄▇▍ █▄ ▉█▅▄▍ ▇█▊█▆▌ ▊▅ ▆▌█ ▅▇ ▆▇▅▉▆ ▌▉█▊ ▇▋▌▅ ▇▉▄▆ ▋▌▅ ▌▆▌▌▆▆▍ (▊▇▇▌ █▍ ▍▊▅▍▄▆▆▉)
                
                
                
                
             
         
        
            
            
            
                
                Fixed two cases where roof eaves conditional models would not show even though they should, resulting in gaps (server side fix)
                
                
                
                
             
         
        
            
            
            
                
                merge from ddraw_init_optimization
                
                
                
                
             
         
        
        
        
            
            
            
                
                Updated scrap tea item descriptions, changed bonus scrap spawn pos.
                
                
                
                
             
         
        
        
            
            
            
                
                ▊▍█▅▋▄▊▅▋▍▉▄▊▉▉▄█▅▆_▍▉▌▌▍▄ ▌▍▊
                
                
                
                
             
         
        
            
            
            
                
                merge from summer_dlc, noticed 
53256 was forgotten upon review
                
                
                
                
             
         
        
            
            
            
                
                Disable ingredient tooltip when there's no ingredient in a slot, to prevent blank tooltips
                
                
                
                
             
         
        
            
            
            
                
                merge new mixing table UI to main
                
                
                
                
             
         
        
            
            
            
                
                ▆▉█▄▇▊▇ ▅▄▊█▄ ▅▊▉▅ ▊█▍▍▄▊▊▆ (▌▋█▌▇█▍▄█ ▋▅▍▊▉▊ ▄█▊▆ ▆▋▉)
                
                
                
                
             
         
        
            
            
            
                
                Final phrases and codegen checks
                
                
                
                
             
         
        
            
            
            
                
                 Produce Exchange sell order changes (cloth and corn)
Network++
                
                
                
                
             
         
        
        
            
            
            
                
                ▇▍▅▄▋▄▌▊▊▊.█▆▄▋▆▇▊ ▋█ ▉▉ ▍▇▉▍▉▅ ▄▅▅▌▍▌ ▆▉ ▅▌▉█▆ ▍▇▇▄ ▋▌ ▊▅ ▇▇▆ ▊▊▊█▇ ▉▉▄▅▍ ▋▉▉▋█▇▌▆ ▄█▄▆▅▊▅▉ ▇ ▌▅▌▍▊▋ (▌▆▇▆ ▋▅ ▊▇▉ ▆▇▅▌▌▇ ▇█ ▌▍ ▇▌▆▇█)
▍▇▋▆▋ ▌ ▇▍▄▋▊ █▄▅ ▅▅█▅█ ▄▌█▇▋▄ █▊▄ ▄▇▌▊▌▍▆█ ▇▇▊▊▍▇ ▅▄▅ ▌▇ ▇▋▋▍▋▋▆ ▊█▍▄▆▆▆ ▆▍▊ ▍▄▊▄▌ ▋▋▄█▋▅ █▇▇▉▅▅▇ ▇▆█ ▄▌▉▇, ▌█ ▆▅ ██▊██▅ ▄▆▆█▄ ▍▌▆ ▍▅ ▅▄▊█▄▄▍▍▊▆ ▌▆▄ ▋▄▆-█▌▄▇▉▍
                
                
                
                
             
         
        
        
            
            
            
                
                Barricade cover deployable purchasable at Compound
                
                
                
                
             
         
        
            
            
            
                
                Fixed mixing table costing 500scrap to research
                
                
                
                
             
         
        
        
        
        
            
            
            
                
                Fixed two modular car presets not having an engine!
                
                
                
                
             
         
        
        
            
            
            
                
                Cherry pick Mac IL2CPP build fixes
                
                
                
                
             
         
        
        
            
            
            
                
                Fixed Holmzy's barrel problem
                
                
                
                
             
         
        
        
            
            
            
                
                Above ground pool now has more health
                
                
                
                
             
         
        
            
            
            
                
                Barricade cover spawn changes
                
                
                
                
             
         
        
            
            
            
                
                moved Easter menu video back into archive
                
                
                
                
             
         
        
            
            
            
                
                Merge fix for server-side projectiles (autoturrets, NPCs) being able to shoot through armoured module walls in some cases. Allows mountables to set a custom size for the player's capsule collider.
                
                
                
                
             
         
        
            
            
            
                
                merge new tea icons to main