1,596 Commits over 579 Days - 0.11cph!
merge from main
auto-resolve VendingMachine.cs and proto
▇ ▆▋▋▊▊▋ ▌▌▊ ▄▍▄▍▍▋▌▊▆▆ ▉▌ ▍▄▍█
▇ ▊▇▇ ▋▍▌▌ ▉▍▉▇▊▌▉▉▍▇▅█▆▇ ▉▇▋▅▋▋▌▌▅▋ ▋▇▋▄ ▍▄▋▊█▆▆▉▆▇ ▅▄ ▍█▊▄▊ ▊▇▍▅▍▉▉ ▅▅▄▋▌▋▊▆▅▉ ▉▍▊▉▄▄▅▄▅▇ ▍▋ ▋▇▅▄▄▄▄▋▍ ▍█▅▉
▋ ▇▊▅ ▆▄█ ▇█▉▋▊▍▇▌▌▉▋▅▅▅▅ █▄▊ ▉▌▅▉▄▋█ ▇▇▇▍▄▇▉▄▊ ▍▊█ ▊▉▌▄▌▇▉▊▍█▅▊▍▉ █▋▅▇▋█▌▇▆▉▄▌▋▆▅▄█
▌ ▆▍▊ ▋▊▄ ▋▌▌ ▇▆▉█▅▋▋▋▉▍▇ ▍▌▊▉▄▌▅▋▅▍▍▌▌▄▄▊▄▍ ▅▉▅▊▄▊▄▋▊ ▌▉▅▅▋▅▍▌▇▆▄▋▌▍ ▄▋▌ ▇▇▊█▅▄▋▋ ██▆▆▋▄
▌ ▄▆▅▇▇ ▊▆▆▄ ▌▌▄▉█▊▍▋▄▌▉▌▇▇▉▉▋▅▍▆▆
▇ ▋▉▍▌█ ▅▋▅▋▅▄ ▇▍▋▄█▄▍█ █▉▅ ▄█▌▍█▊█▌▅ ▄▆▇▅█▄▅
Replace tabs in spawn.report output (they confuse the new console)
▊ █▆█ ▇▋▆▍▆█▌ ▊▆▋ ▆█▋▇▍▌ ▌▅ ▌▇▇▌▌▌▉█▉█▊ ▊▋ ▅▆▍▉▊▊▊▆ ▊█▋▆█ ▊▆▄▌ ▆ ▄██▊▌▅█ ▍█▇▌▍▇▍ ▉▍▅▆ ▋▌ ▇▆▆▍▆▍▉ ▊█ ▆ ▇▇▋▅▊ ▅▆█▇ ▌▄▋▅ ▆█▋▄ ▋▋██▍▇ ▍▍▋▆▉█▍ ▉▌ █▅
merge from weapon_refresh_salvaged_cleaver
merge from radtown_gate_pink_fix
Remove now empty entry in KillAllAnimals mission objective asset
Fix another reference to the old wolf in the trophy data
Add null check to fix a NPCShopKeeper.Greeting NRE
merge from custom_item_fixes
Dropped item combining now runs the same checks as CanStack
Fixes it combining different custom item names & icons and c4 frequencies
merge from lightfixture_refresh_recovery
merge from custom_item_fixes
Fix custom item icons / names not getting preserved when splitting a stack of items
Prevent items with different custom icons / names from stacking together
Fix regular icon being used instead of custom when dragging item from the splitter UI
Fix cooking tests failing
Improve the existing ones, add a note to expand in the future
Update wolf population asset with new convar
Add worldmodel component to binoculars worldmodel
Add tree and default to workbenches deploy volume
Exclude hidden redirects so the new barrels / shelves which now use dummy redirect base items don't fail all the tests
merge from weapon_refresh_binoculars
merge from DefWorkbenchupgrade_desc
merge from ziggurat_materials_fix
merge from roadsign_spawner_fix
merge from bag_corpse_health_fix
merge from deepsea_harvest_fix
Fix not being able to harvest / clone plants on a boat while in the deep sea
Fix health info showing up for sleeping bag / towel corpses
Stronger override for all container corpses instead of relying on ShowHealthInfo
Reenable all roadsign spawners - they were mistakenly saved as disabled in recent months (127266 / 140558), causing no roadsigns to spawn in monuments after they were S2Ped
S2P outpost, junkyard, powerplant, satellite dish, sewer branch, military tunnels, fishing village a, water well b & c
Merge from main
Keep source on directory conflicts, viewmodel.prefab auto-merged
merge from /mfm (merge from main)
Codegen, proto gen
Manifest
Merge from main
Keep source on generated stuff
Keep main version of ParticleTestMap
Merge automatically: Sceneloader.Monuments.cs, engine.json, InvisibleVendingMachine.cs
Bump ApartmentRoom proto to 227 to avoid id collision with Workbench
merge from fix_manifest_errors
Remove extra model component on pistol_semiauto.a.m15.entity
merge from sceneloader_improvements
Order fix so its more like before
▄ ▄▇▅▆ ▊▉▌▇▍▋█▄▌▅▉ ▇ ▆█▋▇▅▆▊▆▅ ▌ ▆▅▋█▇▉▊▅▌▆▇▍▅▄ ▄▅▆▋ ▄▅█▍▉▌▋▍▄▍▍▌▋▌▄ ▌▇▊ ▉██▌▇▋▇ ▇▍▆▇▋▆ ▍▍▍▆▄▇▆▉ ▍▋▇ █▊▆▍▉▉ ▍▆▋█▉▋▆▅ ▋▋▊ ▆▌█▊▇▋▍▍ ▌▊▄▉▄▄ ▊▋▄█▊█ ▇▌█ ▇▄▄▋▇▅ ▊▄▆▊▊▇▄▆▋▅ ▍▆▄▋▌▍ ▋▊▇▍▄ ▆ ▋▄▇ ▆▇ ▇ ▅▉▇▍▊▋▅ ▉▋▍█▋▉█▆▆▋▅▇▅ ▉▇▇▇██▅ ▇▇▅▆▇ ▍▊▄▆ ▌▍▊▇▉▇ ▆▋▆ ▉▇▉▍█
merge from fix_forceaddtoteam
Fix another edge case with forceaddtoteam causing errors
merge from weapon_refresh_salvaged_cleaver
