741 Commits over 611 Days - 0.05cph!
merge from ping_estimate -> aux2
merge from ping_estimation -> aux2
merge oilrig_sat_tube -> aux2
Revert back to harmony 1.2 to fix aux2
merge from harmony_2 -> aux2
Merge from tutorial_island
Merge from tutorial_island
Merge from tutorial_island
Merge from tutorial_island
Merge from tutorial_island
merge from tutorial_island
Merge from tutorial_island
Merge from tutorial_island
Merge from tutorial_island
Merge from tutorial_island
Merge from map_entity_load_fix
Merge from tutorial_island
Merge from tutorial_island
Merge from tutorial_island
Merge from tutorial_island
Merge from tutorial_island
Merge from main/map_entity_load_fix
Merge from main/map_entity_load_fix
Merge from metal_detector
Merge from tutorial_island
Merge from tutorial_island
Merge from tutorial_island (merged all shader changes keeping changes from tutorial_island, since they should be the most up to date)
Merge from metal_detector
Merge from reduce_held_entity_item_counts
Merge from metal_detector
Merge from tutorial_island
merge from backpacks -> aux2
Merge from backpacks -> aux2
merge from tutorial_island
Merge from backpacks -> aux2
Merge from tutorial_island
Merge from tutorial_island
Merge from backpacks -> aux2