32,250 Commits over 4,048 Days - 0.33cph!
Merge from launcher reload bug
Merge from modding_prefabs
radiation_cube_support -> main
Update: change indent_style to 4 spaces
Tests: regenerated projects and tabbed a couple times - it's spaces
merge ice_sculpture -> main
▅▌▋▌▇ ▅█▍▍ ▌▆▌▆▊▌▆▇_▋▋▆▍_▋▋▍▌▊▍_▍▅▌▅▅▇▅▋▋
merge from creativemode_io_text
merge from teslacoil_tweaks
▋▌▅▅▌ ▆▅▇▌ ▋▄▌▄▇▅_▊▅▆▊▇█▊▌▊_▌▇▊▉▌▌_▍▇▌▄_█▍▍▅
▄▋▆▊▊ ▅▍▌▄ ▅▌▇▆_▊▆▆▅▍█▊▉_▍▊▅▅▌▊▆_▌▆▇█▄
▉█▉█▆ ▆▉▇▌ ▌▅▉▉▅▉▊▋▇▇▆_▇▋█▌▄▅▌▊_▉█▄▆▊▌▊▉▇▋
▄▅▌▆▋ █▄▌▋ ██▌▌▊▌▄▇▋▇▌▆_█▆█▍▉▍▍_▇▉▊▍▆_▌▆▉
merge from wolf-sound-tweaks
Merge from io_infinite_power
Merge from io_infinite_power
Merge from launcher reload bug
Merge from shred_helicopters (also includes the changed ignore.conf file that seems to keep changing)
Merge from hab_hominglauncher
Merge from ai_wolf_iteration
merge from fix_teleport2grid_foundations -> main
Try fixing compile error from junkpile despawn
merge from qol_junkpile_despawn -> main
Merge: from VendingMachinePooling
Fixes a minor bug that caused Vending Machine's protobuf pool to inflate
Tests: spawned a vending machine on craggy, saved, loaded craggy again - marker was present. Monitored pooling stats - seemed normal.
Merge from admin_invis_command
merge from wire_slack_fix
Merge from ai_wolf_iteration
Restored monument marker font
▊▄▆▋▉ ▍█▄▊ ▇█▇▇▊▅▆█▊▋_▊▉▉▇▋▆▉▍▄▄_▌▉▍▉▉▉▅
▅▋▉▉▅ ▅▄▉█ ▄▊▉▊▅█_▉▄▄▋▆█▆▆▇_▅▌▄█▌▄▅▊▅▉▆
removed old dev dpvold prefab (unused)
Merge from shred_helicopters
Merge from cinematic_gestures
Include System reference, fixes compile error
merge from queue_improvements
merge from analytics_rcon_improvements
merge from analytics_identity_mgmt
Mere from peacekeeper_turret_hostile_warning_ui
merge from qol_variable_zoom_scope -> main
merge from qol_variable_zoom_scope -> main
merge from qol_dropbox_new_slots -> main
Merge from discofloor_rotation
merge from ocean-edges-issue
Fixed item radioactivity NRE when loading a save with item that doesn't exist (happen a lot when switching in between aux2 and main using the same save)
Merge from ai_wolf_iteration
Safer TrainCar OnChildAdded behaviour
Manifest
