34,747 Commits over 4,262 Days - 0.34cph!
Merge from attackheli_fixcar_changes
Merge from krieg_boulder_outline
Merge from egghunt_invis_fix
Merge from hackweek_boxsorting
Merge from elevator_power_qol
vehicle_ui_sidecar -> main
vendor_drone_accessibility -> main
merge from puzzle_reset_changes -> main
Merge from hackweek_boxsorting
merge from laserdetector_tests
merge from helicopter_flare_balance_pass -> main
merge from sorted_protobuf_gen
Merge: from spectate_dontfloodsnapshots
- reduce potential delay when starting to spectate a far-away player
Tests: flew around 2k procgen map, got to the other side of it then spectated player on the opposite end.
merge from untranslated_strings_fix
vendor_ui_drone_accesibility -> main
merge from fix_colourpicker_gradient -> main
Merge from horse_medsyringe_healing
merge from hackweek_automatedtesting
removed scrap costs from softcore workbenchs
restore WB tax reductions
codegen
Cherrypick RendererBatch changes from
134527, prevents monument prefabs reimport when switching in between CLIENT and SERVER
merge from garage_door_2k
merge from computerstation_cap_fix
▊▌▇▄▄ ▋▋▌▌ ▅▍_▄▇▇▋▌█▄▋▇_▌▄█▍▇█▄▄▆▆▊▉
merge from marker_teleport_from_server
██▋▇█ ▋▅▌▌ ▅▅▌▌▅_▅▌▄_▄▉▆_▋▅▅▅▉▆
Allow mummy mask in conveyor filters
Disabled GPU instancing on CollectableCandy particle system as it breaks the positions of the particles when a Rust/Standard shader material is used with it
Merge from puzzle_reset_changes
Merge from eye_wearable_fix_2
Allow all the frankenstein parts to be added to conveyor filters
Allow frankenstein mask in conveyor filters
vendor_ui_drone_accessibility -> main
Merge from junkpile_jump_improvements_2
Merge from horse_medsyringe_healing
Subtract
135187 (revert water jump out height to 13)
merge from puzzle_reset_changes -> main
merge from puzzle_reset_changes -> main
merge from cargoship_cameras
Merge: from networkpositiontick_reduce
- Optim: buoys, containers, water-junkpiles and vines no longer always replicate their position. Reduces number of NetworkPositionTick invokes from 2309 down to 522 on 4.5k map
Tests: interacted with each prefab type, observed up close and from afar
▊▊▅▊▌ ▋▇▉▇ ▆█▋▋▌▇▅▅▇▋▇▇▊_▍▇▉
merge from halloween_2025_disable
merge from guide_materials_tweaks
Merge from hackweek_boxsorting
Include all prefabs under Assets/Scenes/Prefabs in the props asset scene for custom maps to use
Merge from puzzle_reset_changes
