6,087 Commits over 1,614 Days - 0.16cph!
Switch ItemManager.Items from a static class to a instance
- fixes it not being reset by ResetStaticFields (and this being the easier way to do so)
- add master key item too
merge from main -> masterkey
merge from editor_cfg_parallel_import -> main
Set standby import worker count to 0 and set shutdown delay to 10s
- prevents out of process import processes from sticking around and eating RAM
merge from waterwell_stock_decrease -> main
Create tests to confirm waterwell stock is correct
Cleanup method that returns max stock
Fix the maxStock for NPC vending orders being confusing
- it used to only change the initial stock and then refill to the maximum of the vendor
- now it just sets a different max stock for that individual vending order
▉ ▍▉█ ▇▇▌▅▆ ▌█▆ ▇▅█▊▌▆ ▍▆▉▄▊▇▄ ▌▄▉▊▌▊▇ ▋▆▊▇▆▋▅▌▅▄▊█▍ ▄▄▋▋▅▌ ▉▆ ▄▌▉ ▇▆▇█▆▆██▅ ▄█▅█▅▇▅ ▄▄▄ ▉█▅▇▄▌▇▌▉ ▍▄▄ ▊▇▄▄▄▇▋▊▌ ▊▅▇▌▉▌ ▆▉▌▊▉ ▅▍▇▅▅ ▌▇▉▍█ ▌█ ▄▄▌
Add "spawnvendor" command to spawn vendors in the editor (they are two different prefabs glued together)
merge from main -> waterwell_stock_decrease
▉ ▅▄▊▊ ██▍▇▇▉█▌▇ ▌▊▌▊▉ ▅▌█ ▋▉█▆▇▄▇ ▍▅▅▇▄ ▍▉ ▇▋▅▍▉ ▊▆▉▉▉▅ ▇▅▉▊▍▆▅▆ ▅▇ █▆▇▄▇▉ █▅█ ▅▌█▇▆▅▉▊ ▉▆▅ ▆▄▍▅▄▌▌ ▇▆▌▅▋▋▅▍
▄ ▌▇█▅▉▍█▆▍▌ ▋▆▌▅▄█▄▉▋▋▅▉▆▇▊▉▇▅▅▌▌▍▍▉█▉
▄ ▊▅▄ ▍▉█▅▋▅▆█▉▇▋ █▅▇▉▋▆▋▄▊▊▌▊▌ ▋▇▌█▊ █▄ ▌▊ ▋▍▇▇▊▊▆ ▍▅▆▌ ▇▄▊▇▆ ▋▉ ▇▊██▄▌ ▊▇ █▆▌▋ ▅▆▍▋▇█▆█ ▉▄▋▊█▊▋ ▉▋▊█▅ ▍▌▊▆▆ ▇▌█▋ ▇▆ ▄▅█▄▉█ ▇▇ ▍▍▆ ▍▇▌▋ ▄█ ▄▅▉▋ ▌▋▋▇ ▊▊▉▄ ▉▌▋▆ ▋▋▉ ▍▉▆▄█
▄ ▄▋▊▄▌ ▉▄▉▇▌▌▆▆▇▅▇▅ █▄ ▍▆▋▍█▉▍▉▆▋▅▌ ▌▇▇▋▄█ ▉▅▌▄▉▄▍█▉ ▌▅ ▋██▋▇▅▌ ▇▋▆█▌▍▌ ▋▆ ▍▍▌▍▊▅▌▉ ▇▅▌ ▊▊▄▍▄ ▅██ ▆▊▅▉▅ ▉█ ▆▅▅▇ ▌▆ ▋▋▍█▋ ▍▉▊ ▉▍█▅ ▆▅▋▋ ▆█▋ ▉▇▉▊▌ █▊█▆▌▋█▄▇▊▍▌▄▉ ▇▆▍▌▊▊ ▊█▌▇▊▉▍ ▋▉▇▌▆ ▅▅▍▄█▇▋▌▉█ ▋▊ ▅▌▊▊▄▉▉ ▉▌▍▅ ▄▌▄▉▇ ▋▊ █▄▌▊▋▌▉ ▇▋▊▄ ▌ ▅▅▊▆▆▌▌▆ ▊▄▋▆ █▅▍ ▍▆█▋█▅▌▍▋▌█▄▋▅▋▌▍█▍▌▍▇▉▌▊█▉ ▄█▇▉ ▆ ▊▍▉ ▄▆▌▊ ▋▇▆▍█ ▋▋▄▅ ▌▅ ▋▋█▆▍ ▊▊▊▅▍ ▊▋▉▇ ▆▆ █▌▉▊ ▊▅▌▆█▋ ▇▅▄▍ ▇▇▅▆▊▋▌ ▇▍▍█▉▊▋▅ ▉▊▊ ▅█ ▇▆▊▅▉▉ ▍▅▌▅▆█▊ ▆▉ ▆▉▆
▍ ▇▉▇▇▉ ▍▄▋▅ █▅▄▅▅█▋█▇▊▅▋▋▌▌▋▋ ▌▉ ▍▌▇█
▌ ▋▅▍█▌▄ ▄▉█ ▍▉▋▅▋▅ ▍▅▆▍▍▆▇ ▅▊ █▄▊▄▆▅ ▋▊▅▉█▇▍
▇ ▌▄▇▄▅ ▊▉▅▇ ▋▆▊▉▊▆▊▇▅▋▉▉▌▅▇▉█▋ ▅▌ ▄▍█▄
▋ ▍▍▊ ▋▉▇▄▋ ▆▉▍ ▉▍▉███▅ ▉▅▋▇▄ ▄▉▍▍▇ █▍▅▆▄█ ▅█ ▌▅▆▄▆ ▉█ ▉▄▋▊▋▍ ▌▅▊█▇▍▊▌ ▊▅▊▇▋▇▆▇ ▊▉ ▉█▍▉▆▌ ▉▍ ▆▌▉▍▋ ▆▅█▊▋▉▋▊ ▉▉▉▆ ▄▉▊▉▅▅ ▆█▆▄▇▍
▊ ▆▋▇ ▍▇▊ ▄▄▄▄▆█▌▇ ▊▍▋ ▍▆▇▇▇▍█▋ ▋ ▆▋▊▋▊▌▌ ▇▍█ ▌▅▌█▉▄▌▇ ▌▋ ▉▅▅ ▅█▆▆▅▆ ▌▋▍ ▆ ▉█▇█▆█ █▊▉█▆▅▉▅▋▋▆ ▉▊▊▍▆▄▉█ ▆▇▉▊ ▄▄▊ ▌▌▆▄▅▊▉▍▇ ▅▄▋▍▄ ▌▅█▇ ▄▇▅▆▇ ▇█▋▍▄▄▌ ▍██▉▆ ▋▌▋▊▉▄▊▆ ▌▆ ▇▊█▇▆▅▆▄▊▉▉▉ ▌▊█▋█▌ ▉▆▉▆▇▋ ▅▆▊▋█▇█ ▄█ ▅▄▄█▋ ▌▊▊▇▋▄▊ ▅▄▅▅▌▉▌▊
Switch Newtonsoft test to use Unity's test framework
▆ ▉▉▍▋▇█▄ ▄▅▇▋█▉▅▊▅▌▉▄▅▇▊ █▌█▍ ▆▆▋▌█▇█▋▆▆▌ █▋▅ ▄▍▍ ▍▋▇▆▊▄▆▆ ▊▍▍▌▌▅▄▇▇▅▋ ▇▆▍ ▇▄▋▍█▆█▋ ▌▅█▊█▅▅ ▋▊▆█ ▉▋ ██ ▍▇▄▌▄▇▄▇▊▊ ▄▇▆█▊▉▍▌ ▌▄▌▇ ▆▋▍ ▆▊██▌▋ ▅▍▉▌▊██▇
▊ ▍██▄▊▌ ▍▌▉▅█▉▄▍█▆▋ ▌▄▋▄ ▆▇▇▋▊ ▅▅▌ ▆▉▍▌▊▄▊▅▍▍▆▌ ▄▄▆▌ █▌ ▄▉▆▉▋▊ ▋▊ ▊▄▄▇▍▊▌ ▄▇▉ ▉▋▇▍▋ ▄▋▌▋▌▍▅▄▉▆▋▅▉▉▊▌▆▄▄█▉▄ ▊▍▊ ▍▄▋▊▇▊ ▉▅ ▌▅▌▌▌ ▌▊█▄▉▄▆▉▇█▊ ▋▆▋▆ █▅ ▍▅▌▅▌▍
▍ ▊▋▄▄▄ ▌███▄▌▄▆▆▉▊▌▉▋▆▇▇█▆▊ ▅▇▄▍▅▊█ ▉▌ ▊▉▊▄▋▋▌▋▌█▅▋▊▄▅▍▉ ▋█▉▉▆▆ ▌█▌▉█▉▇ ▇▇▉█▊▄
Rewrite Newtonsoft JSON converts to not use JSON.LINQ (which is what they did in Newtonsoft 8.0.0)
- tests pass
▄ ▊▇▉▄▇ ▅▇▇▆ ▊▌▊▊▌▇▅ ▄▆ ▍▇▆▉
▉ ▉▅▋▇▆ ▅▄▉▅ ▌█▅▅▆▋▋▊▍▌▅▋▉▆▅▄▉▇▌█▊▋▄▅▋ ▋▍ ▅▍▇▌
▍ ▄▊▋ ▅▌▍ ▉▍▇▆▉▊ ▉▋▉▊▉ ▌▍█ ▉▋▉▊▌ ▆▆██▋█▄ ▄▄ ▉▋▋ ▄▉▄▆▄▇ ▋▅▄▊▉▋▌ ▄▊▊▌█ ▇▅ ▄▆▊▊▄▉ ▉▌▉▊▉ ▅▌▌█ ▇▌▆█▇ ▌█▋▉▊▊▊▊▋▇ ▆▉▅▊ ▊▌▌ ▇▅ ▉▌▌ ▉█▄▇▌ ▍▊▇▋▉▍▄ ▆▊█▄▍ ▇▍▌▄▅█ ▍▍▆▆▉█
▇ ▊▆▊ ▌▉▊▍▇ █▉▊ ▆▍▆█▉█▋▄▌ ▆▌▌▅▊ ▍▅▄█▍ ▄▄▍▆▇▊▇▆ ▊▆▌▆ ▌▄▋ ▇▉▄▄▆▌ ▄▊▌▄▋▇▉▅ ▉▉▍▍ ▉█▊ ▇▋▌▌▅▅ ▄▋▍▄▄▋█ ▆▇▄▍ ▅▄ ▄▇ ▄▆▉▆▌▄ ▄▊ ▌▆▆▊▄▄▌▅ ▆▄▊▍ ▌▌▍▋▊▅▍▆
▇ █▆▉ ▌▋▄▇▇▌▆ █▉ ▅▅▍ ▄▇▊▆▌▉▋▇▄▍▋▅▌█▆▇▊ ▄▌█▄▇▌▉█
▋ ▅▉▇▇▍▉▌ ▆█▉▊▌▊█ ▆▊▋▊ ▌▊▇▉▍▍▇▍█▉▊▌ ▄▆ ▄██▅▊▋▍▊▅▍▍▍▇▉ ▋▍▄▄█▅█▄ █▉▉▇▄ ▍▄▆▊▊█ █▌▅ ▄▄▍▄ ▊▅▉▇▊▄ ▊▋▅ ▉▉ ▊▇ ▌▋▄▄▌▊▇ ▊▍▊▍▇▇█ ▌▋▉▍▍▄ ██▆▉▅▍▉ ▋▆▌█ ▊▄▆▉ ▊▋▅▅█▊▇▋ ▉▉ ▄▇ ▉▋▍▉▊▊ ▉▍▇▉ ▉▌▍▅▉▇▅ ▅▆▆▄▌▅▍ ▇▋ █▇▄▋ ▋▍▅▉▍
▅ ▅▊▌▆▋ █▆▇▌ ▇▆▄▄▉▍▊██▅▋▊█▉▆▌▍▅▊▍▆▆█▌▄ ▄▇ ▍▉▍▇
▉ ▊▅▋ ▍█▆▋▋▄ ▊▇▊█▄▋▉ ▇▇▆▄▇▉▋▋ ▊▊ ▄▆▍█▌ ▇▋ ▆▌▆█ ▊▅█▌▅▉ ▊▋ ▉▉▋█▊ ▄█▍▊ ▅▄▇ ▍▇▌▅▉▌ ▊▌▍▌
█ █▇▌▅▍█▋ ▆▉▋▅▌▇▆ ▆▍▌▆ ▊▉ ▇▌▇▇ ▄▅▉ ▅▋▍▌▋ ▊▌▋ ▍▋▍▌█▋▌ ▅▉▆▅▉▇ ▌▅▆▉▅ ▌▄▉▍▉▅▋▌▊ ▉▊ ▍█▆ ██▇▅ ▌▇▆▌▉▋▌▅▌ ▊▆▆▉ ▊▇▊▌▌ ▅▍▆▌▅▉ ▄▆▉▊▌▍▄ ▌▉▄ ▇▆▍▍█▌▄▇▆▅▉▇▍▍▊▌▇▊ ▇▇▌▍▆▊▋▆ ▆▆▇ ▍▉▇▋▉ ▆▄▊ ▌▇▇▍▌▊▄▍▊▇ ▉▄▄▉ ██▅▅█▄▆▆
▇ ▌▍█▆▅▉▋▄▌▆ ▊▉▇▌▄▄▉▅▌▆▍▉▊▅▋█▇▉▅▅▇▍▊▅▊▆█▊▋▌▅▊▌
merge from fix_second_hotbar -> main
Fix not being able to drag icons into the bottom row of the main inventory (second hotbar) due to the main inventory being rendered on top of the hotbar
Fix swaphotbar only working if ran from a bind, switch it to only running if the second hotbar is enabled / rendered
Fix keybinds showing under the second hotbar
merge from fix_highwall_decay_delay -> main
Fix high walls having a 5hr delay decay: should start decaying right away now that it uses upkeep
▊ ▆▅▊█▊ ██▄▇ ▉▊▅▄▌▌▋▇█▉▇▇▄▇▊▊▌▆▉▍▊▄▉▇▌ ▉▇ ▆▊█▊
merge from editor_hotbar_swap -> main
Cleanup redundant UIBeltSecondRowPreview.cs
Fix hideInvalidIcons not set in the second hotbar so it wasn't going away when convar was disabled
Shift up the second hotbar so it matches inventory placement
merge from main -> editor_hotbar_swap
